diff --git a/include/wx/imaglist.h b/include/wx/imaglist.h
index 2e928484fa..8c4bec7bcc 100644
--- a/include/wx/imaglist.h
+++ b/include/wx/imaglist.h
@@ -39,12 +39,13 @@ enum {
 #define wxIMAGELIST_DRAW_SELECTED       0x0004
 #define wxIMAGELIST_DRAW_FOCUSED        0x0008
 
-#include "wx/generic/imaglist.h"
 
 #if defined(__WIN32__) && !defined(__WXUNIVERSAL__)
     #include "wx/msw/imaglist.h"
 #elif defined(__WXMAC_CARBON__)
     #include "wx/mac/imaglist.h"
+#else
+    #include "wx/generic/imaglist.h"
 #endif
 
 #endif
diff --git a/include/wx/listctrl.h b/include/wx/listctrl.h
index 56deddfebf..56be31e332 100644
--- a/include/wx/listctrl.h
+++ b/include/wx/listctrl.h
@@ -27,12 +27,13 @@ extern WXDLLEXPORT_DATA(const wxChar) wxListCtrlNameStr[];
 // ----------------------------------------------------------------------------
 // include the wxListCtrl class declaration
 // ----------------------------------------------------------------------------
-#include "wx/generic/listctrl.h"    
 
 #if defined(__WIN32__) && !defined(__WXUNIVERSAL__)
     #include "wx/msw/listctrl.h"
 #elif defined(__WXMAC__)
     #include "wx/mac/carbon/listctrl.h"
+#else
+    #include "wx/generic/listctrl.h"
 #endif
 
 // ----------------------------------------------------------------------------