diff --git a/include/wx/msw/statbmp.h b/include/wx/msw/statbmp.h
index fe255032bb..85308a7d13 100644
--- a/include/wx/msw/statbmp.h
+++ b/include/wx/msw/statbmp.h
@@ -18,6 +18,7 @@
 
 #include "wx/control.h"
 #include "wx/icon.h"
+#include "wx/bitmap.h"
 
 WXDLLEXPORT_DATA(extern const wxChar*) wxStaticBitmapNameStr;
 
diff --git a/include/wx/ownerdrw.h b/include/wx/ownerdrw.h
index 3008d453a8..ae9cde808a 100644
--- a/include/wx/ownerdrw.h
+++ b/include/wx/ownerdrw.h
@@ -12,14 +12,16 @@
 #ifndef   _OWNERDRW_H
 #define   _OWNERDRW_H
 
-#include "wx/setup.h"
-
 #if wxUSE_OWNER_DRAWN
 
 #ifdef    __GNUG__
     #pragma interface "ownerdrw.h"
 #endif
 
+#include "wx/bitmap.h"
+#include "wx/colour.h"
+#include "wx/font.h"
+
 // ----------------------------------------------------------------------------
 // wxOwnerDrawn - a mix-in base class, derive from it to implement owner-drawn
 //                behaviour