diff --git a/src/common/effects.cpp b/src/common/effects.cpp
index ed11c6934d..c735d825db 100644
--- a/src/common/effects.cpp
+++ b/src/common/effects.cpp
@@ -20,10 +20,10 @@
 
 #ifndef WX_PRECOMP
     #include "wx/dcmemory.h"
+    #include "wx/pen.h"
 #endif //WX_PRECOMP
 
 #include "wx/gdicmn.h"
-#include "wx/pen.h"
 #include "wx/settings.h"
 
 /*
diff --git a/src/common/gdicmn.cpp b/src/common/gdicmn.cpp
index 61f6525035..b323e03a1b 100644
--- a/src/common/gdicmn.cpp
+++ b/src/common/gdicmn.cpp
@@ -28,10 +28,10 @@
     #include "wx/app.h"
     #include "wx/utils.h"
     #include "wx/dc.h"
+    #include "wx/pen.h"
 #endif
 
 #include "wx/brush.h"
-#include "wx/pen.h"
 #include "wx/bitmap.h"
 #include "wx/icon.h"
 #include "wx/cursor.h"
diff --git a/src/mac/carbon/app.cpp b/src/mac/carbon/app.cpp
index 82d28bc4c8..cf9ec7f9dc 100644
--- a/src/mac/carbon/app.cpp
+++ b/src/mac/carbon/app.cpp
@@ -22,10 +22,10 @@
     #include "wx/dc.h"
     #include "wx/button.h"
     #include "wx/menu.h"
+    #include "wx/pen.h"
 #endif
 
 #include "wx/gdicmn.h"
-#include "wx/pen.h"
 #include "wx/brush.h"
 #include "wx/cursor.h"
 #include "wx/icon.h"
diff --git a/src/mac/classic/app.cpp b/src/mac/classic/app.cpp
index e0c3cebdd9..e1d1cbee1f 100644
--- a/src/mac/classic/app.cpp
+++ b/src/mac/classic/app.cpp
@@ -26,10 +26,10 @@
     #include "wx/dc.h"
     #include "wx/button.h"
     #include "wx/menu.h"
+    #include "wx/pen.h"
 #endif
 
 #include "wx/gdicmn.h"
-#include "wx/pen.h"
 #include "wx/brush.h"
 #include "wx/cursor.h"
 #include "wx/icon.h"
diff --git a/src/msw/pen.cpp b/src/msw/pen.cpp
index d460b6a9b4..745caf55b0 100644
--- a/src/msw/pen.cpp
+++ b/src/msw/pen.cpp
@@ -16,12 +16,13 @@
     #pragma hdrstop
 #endif
 
+#include "wx/pen.h"
+
 #ifndef WX_PRECOMP
     #include <stdio.h>
     #include "wx/list.h"
     #include "wx/utils.h"
     #include "wx/app.h"
-    #include "wx/pen.h"
 #endif
 
 #include "wx/msw/private.h"
diff --git a/src/os2/pen.cpp b/src/os2/pen.cpp
index b0523de111..b5699b6ae4 100644
--- a/src/os2/pen.cpp
+++ b/src/os2/pen.cpp
@@ -12,12 +12,13 @@
 // For compilers that support precompilation, includes "wx.h".
 #include "wx/wxprec.h"
 
+#include "wx/pen.h"
+
 #ifndef WX_PRECOMP
     #include <stdio.h>
     #include "wx/list.h"
     #include "wx/utils.h"
     #include "wx/app.h"
-    #include "wx/pen.h"
     #include "wx/log.h"
 #endif
 
diff --git a/src/palmos/pen.cpp b/src/palmos/pen.cpp
index 1290ab10ae..af9311f7c2 100644
--- a/src/palmos/pen.cpp
+++ b/src/palmos/pen.cpp
@@ -13,15 +13,16 @@
 #include "wx/wxprec.h"
 
 #ifdef __BORLANDC__
-#pragma hdrstop
+    #pragma hdrstop
 #endif
 
+#include "wx/pen.h"
+
 #ifndef WX_PRECOMP
     #include <stdio.h>
     #include "wx/list.h"
     #include "wx/utils.h"
     #include "wx/app.h"
-    #include "wx/pen.h"
 #endif
 
 static int wx2msPenStyle(int wx_style);