diff --git a/include/wx/msw/listctrl.h b/include/wx/msw/listctrl.h
index 81378145cb..b918bb063a 100644
--- a/include/wx/msw/listctrl.h
+++ b/include/wx/msw/listctrl.h
@@ -18,9 +18,11 @@
 
 #include "wx/control.h"
 #include "wx/event.h"
-#include "wx/imaglist.h"
 #include "wx/hash.h"
 
+class WXDLLEXPORT wxTextCtrl;
+class WXDLLEXPORT wxImageList;
+
 /*
     The wxListCtrl can show lists of items in four different modes:
     wxLC_LIST:   multicolumn list view, with optional small icons (icons could be
diff --git a/src/msw/listctrl.cpp b/src/msw/listctrl.cpp
index 7904f4b673..f6deb429eb 100644
--- a/src/msw/listctrl.cpp
+++ b/src/msw/listctrl.cpp
@@ -29,14 +29,18 @@
     #pragma hdrstop
 #endif
 
-#ifndef WX_PRECOMP
-    #include "wx/wx.h"
-#endif
-
 #ifdef __WIN95__
 
+#ifndef WX_PRECOMP
+    #include "wx/app.h"
+    #include "wx/textctrl.h"
+    #include "wx/imaglist.h"
+    #include "wx/intl.h"
+    #include "wx/log.h"
+    #include "wx/settings.h"
+#endif
+
 #include "wx/listctrl.h"
-#include "wx/log.h"
 
 #include "wx/msw/private.h"