diff --git a/src/msw/timer.cpp b/src/msw/timer.cpp
index 822ece8f35..14c53817f0 100644
--- a/src/msw/timer.cpp
+++ b/src/msw/timer.cpp
@@ -23,8 +23,6 @@
 #if wxUSE_TIMER
 
 #ifndef WX_PRECOMP
-    #include "wx/hashmap.h"
-    #include "wx/setup.h"
     #include "wx/window.h"
     #include "wx/list.h"
     #include "wx/event.h"
@@ -33,6 +31,8 @@
     #include "wx/log.h"
 #endif
 
+#include "wx/hashmap.h"
+
 #include "wx/timer.h"
 
 #include "wx/msw/private.h"
@@ -42,7 +42,7 @@
 // ----------------------------------------------------------------------------
 
 WX_DECLARE_HASH_MAP( long,
-                     wxTimer*,
+                     wxTimer *,
                      wxIntegerHash,
                      wxIntegerEqual,
                      wxTimerMap );