diff --git a/include/wx/aui/dockart.h b/include/wx/aui/dockart.h
index 8bafde4ffc..679b3229ee 100644
--- a/include/wx/aui/dockart.h
+++ b/include/wx/aui/dockart.h
@@ -20,6 +20,10 @@
 
 #if wxUSE_AUI
 
+#include "wx/pen.h"
+#include "wx/brush.h"
+#include "wx/bitmap.h"
+#include "wx/colour.h"
 
 // dock art provider code - a dock provider provides all drawing
 // functionality to the wxAui dock manager.  This allows the dock
diff --git a/include/wx/aui/floatpane.h b/include/wx/aui/floatpane.h
index afe170be5a..51c238598c 100644
--- a/include/wx/aui/floatpane.h
+++ b/include/wx/aui/floatpane.h
@@ -20,6 +20,8 @@
 
 #if wxUSE_AUI
 
+#include "wx/frame.h"
+
 #if defined( __WXMSW__ ) || defined( __WXMAC__ )
 #include "wx/minifram.h"
 #define wxFloatingPaneBaseClass wxMiniFrame
diff --git a/include/wx/aui/framemanager.h b/include/wx/aui/framemanager.h
index f1f5016377..9336d79aca 100644
--- a/include/wx/aui/framemanager.h
+++ b/include/wx/aui/framemanager.h
@@ -20,6 +20,12 @@
 
 #if wxUSE_AUI
 
+#include "wx/dynarray.h"
+#include "wx/gdicmn.h"
+#include "wx/window.h"
+#include "wx/timer.h"
+#include "wx/sizer.h"
+
 enum WXDLLIMPEXP_AUI wxFrameManagerDock
 {
     wxAUI_DOCK_NONE = 0,
diff --git a/src/aui/dockart.cpp b/src/aui/dockart.cpp
index 2890dbd432..68c5bb373b 100644
--- a/src/aui/dockart.cpp
+++ b/src/aui/dockart.cpp
@@ -26,6 +26,8 @@
 #if wxUSE_AUI
 
 #include "wx/image.h"
+#include "wx/dcclient.h"
+#include "wx/settings.h"
 #include "wx/aui/framemanager.h"
 #include "wx/aui/dockart.h"
 
diff --git a/src/aui/framemanager.cpp b/src/aui/framemanager.cpp
index 609be6a75b..a4c055b1d2 100644
--- a/src/aui/framemanager.cpp
+++ b/src/aui/framemanager.cpp
@@ -35,8 +35,16 @@
 
 //#include "wx/dcbuffer.h"
 
+#include "wx/dcclient.h"
+#include "wx/dcscreen.h"
 #include "wx/app.h"
 #include "wx/image.h"
+#include "wx/settings.h"
+
+#if wxUSE_MDI
+#include "wx/mdi.h"
+#endif
+
 WX_CHECK_BUILD_OPTIONS("wxAUI")
 
 #include "wx/arrimpl.cpp"