diff --git a/include/wx/bmpbuttn.h b/include/wx/bmpbuttn.h
index f0e8f7782b..abe3cb7632 100644
--- a/include/wx/bmpbuttn.h
+++ b/include/wx/bmpbuttn.h
@@ -12,6 +12,8 @@
 #ifndef _WX_BMPBUTTON_H_BASE_
 #define _WX_BMPBUTTON_H_BASE_
 
+#include "wx/defs.h"
+
 #if wxUSE_BMPBUTTON
 
 #include "wx/bitmap.h"
diff --git a/include/wx/button.h b/include/wx/button.h
index 93ba18b250..443402f23a 100644
--- a/include/wx/button.h
+++ b/include/wx/button.h
@@ -12,6 +12,8 @@
 #ifndef _WX_BUTTON_H_BASE_
 #define _WX_BUTTON_H_BASE_
 
+#include "wx/defs.h"
+
 #if wxUSE_BUTTON
 
 // ----------------------------------------------------------------------------
diff --git a/include/wx/checkbox.h b/include/wx/checkbox.h
index c8a126923e..8ccb6539e3 100644
--- a/include/wx/checkbox.h
+++ b/include/wx/checkbox.h
@@ -12,6 +12,8 @@
 #ifndef _WX_CHECKBOX_H_BASE_
 #define _WX_CHECKBOX_H_BASE_
 
+#include "wx/defs.h"
+
 #if wxUSE_CHECKBOX
 
 #include "wx/control.h"
diff --git a/include/wx/control.h b/include/wx/control.h
index 578d526224..e4bd239801 100644
--- a/include/wx/control.h
+++ b/include/wx/control.h
@@ -20,6 +20,8 @@
     #pragma interface "controlbase.h"
 #endif
 
+#include "wx/defs.h"
+
 #if wxUSE_CONTROLS
 
 #include "wx/window.h"      // base class
diff --git a/include/wx/gtk/wave.h b/include/wx/gtk/wave.h
index 89ce444943..92d678dab4 100644
--- a/include/wx/gtk/wave.h
+++ b/include/wx/gtk/wave.h
@@ -12,6 +12,8 @@
 #ifndef _WX_WAVE_H_
 #define _WX_WAVE_H_
 
+#include "wx/defs.h"
+
 #if wxUSE_WAVE
 
 #if defined(__GNUG__) && !defined(__APPLE__)
diff --git a/include/wx/gtk1/wave.h b/include/wx/gtk1/wave.h
index 89ce444943..92d678dab4 100644
--- a/include/wx/gtk1/wave.h
+++ b/include/wx/gtk1/wave.h
@@ -12,6 +12,8 @@
 #ifndef _WX_WAVE_H_
 #define _WX_WAVE_H_
 
+#include "wx/defs.h"
+
 #if wxUSE_WAVE
 
 #if defined(__GNUG__) && !defined(__APPLE__)
diff --git a/include/wx/menu.h b/include/wx/menu.h
index 2323551859..5fe2232e8f 100644
--- a/include/wx/menu.h
+++ b/include/wx/menu.h
@@ -16,6 +16,8 @@
     #pragma interface "menubase.h"
 #endif
 
+#include "wx/defs.h"
+
 #if wxUSE_MENUS
 
 // ----------------------------------------------------------------------------
diff --git a/include/wx/statbmp.h b/include/wx/statbmp.h
index e78a347b7e..7481a381af 100644
--- a/include/wx/statbmp.h
+++ b/include/wx/statbmp.h
@@ -16,6 +16,8 @@
     #pragma interface "statbmpbase.h"
 #endif
 
+#include "wx/defs.h"
+
 #if wxUSE_STATBMP
 
 #include "wx/control.h"