diff --git a/include/wx/dfb/private/overlay.h b/include/wx/dfb/private/overlay.h
index 96b2d4476c..2484f3387f 100644
--- a/include/wx/dfb/private/overlay.h
+++ b/include/wx/dfb/private/overlay.h
@@ -11,6 +11,7 @@
 #ifndef _WX_DFB_PRIVATE_OVERLAY_H_
 #define _WX_DFB_PRIVATE_OVERLAY_H_
 
+#include "wx/gdicmn.h"
 #include "wx/dfb/dfbptr.h"
 
 wxDFB_DECLARE_INTERFACE(IDirectFBSurface);
diff --git a/include/wx/dfb/wrapdfb.h b/include/wx/dfb/wrapdfb.h
index 34a7ed1851..33112a0ed9 100644
--- a/include/wx/dfb/wrapdfb.h
+++ b/include/wx/dfb/wrapdfb.h
@@ -11,6 +11,8 @@
 #ifndef _WX_DFB_WRAPDFB_H_
 #define _WX_DFB_WRAPDFB_H_
 
+#include "wx/gdicmn.h"
+#include "wx/vidmode.h"
 #include "wx/dfb/dfbptr.h"
 
 #include <directfb.h>
diff --git a/src/dfb/dc.cpp b/src/dfb/dc.cpp
index 8853fe0878..8093bec3d2 100644
--- a/src/dfb/dc.cpp
+++ b/src/dfb/dc.cpp
@@ -25,6 +25,7 @@
 
 #ifndef WX_PRECOMP
     #include "wx/dc.h"
+    #include "wx/dcmemory.h"
     #include "wx/log.h"
 #endif
 
diff --git a/src/dfb/dcclient.cpp b/src/dfb/dcclient.cpp
index 1045b6305e..d098fe0408 100644
--- a/src/dfb/dcclient.cpp
+++ b/src/dfb/dcclient.cpp
@@ -26,6 +26,7 @@
 #include "wx/dcclient.h"
 
 #ifndef WX_PRECOMP
+    #include "wx/toplevel.h"
     #include "wx/window.h"
 #endif
 
diff --git a/src/dfb/evtloop.cpp b/src/dfb/evtloop.cpp
index 3cc18ac290..a5f8925c90 100644
--- a/src/dfb/evtloop.cpp
+++ b/src/dfb/evtloop.cpp
@@ -27,6 +27,7 @@
 
 #include "wx/thread.h"
 #include "wx/timer.h"
+#include "wx/toplevel.h"
 #include "wx/private/socketevtdispatch.h"
 #include "wx/dfb/private.h"
 
diff --git a/src/dfb/fontmgr.cpp b/src/dfb/fontmgr.cpp
index 76b09cf1b3..1555b92228 100644
--- a/src/dfb/fontmgr.cpp
+++ b/src/dfb/fontmgr.cpp
@@ -20,6 +20,8 @@
 #include "wx/filename.h"
 #include "wx/tokenzr.h"
 #include "wx/dir.h"
+#include "wx/log.h"
+#include "wx/utils.h"
 
 #include "wx/private/fontmgr.h"
 #include "wx/dfb/wrapdfb.h"
diff --git a/src/dfb/overlay.cpp b/src/dfb/overlay.cpp
index 56f3dfb5f1..434ca47735 100644
--- a/src/dfb/overlay.cpp
+++ b/src/dfb/overlay.cpp
@@ -23,6 +23,8 @@
     #pragma hdrstop
 #endif
 
+#include "wx/dcclient.h"
+#include "wx/window.h"
 #include "wx/private/overlay.h"
 #include "wx/dfb/private.h"
 
diff --git a/src/dfb/window.cpp b/src/dfb/window.cpp
index e4439b3798..809a899a0a 100644
--- a/src/dfb/window.cpp
+++ b/src/dfb/window.cpp
@@ -28,6 +28,7 @@
 
 #ifndef WX_PRECOMP
     #include "wx/dcclient.h"
+    #include "wx/toplevel.h"
 #endif
 
 #include "wx/caret.h"
diff --git a/src/dfb/wrapdfb.cpp b/src/dfb/wrapdfb.cpp
index eac0024b2a..927d5cae67 100644
--- a/src/dfb/wrapdfb.cpp
+++ b/src/dfb/wrapdfb.cpp
@@ -15,6 +15,8 @@
     #pragma hdrstop
 #endif
 
+#include "wx/intl.h"
+#include "wx/log.h"
 #include "wx/dfb/wrapdfb.h"
 
 //-----------------------------------------------------------------------------