diff --git a/include/wx/bitmap.h b/include/wx/bitmap.h
index f5ccd8397b..1442c75a36 100644
--- a/include/wx/bitmap.h
+++ b/include/wx/bitmap.h
@@ -22,10 +22,12 @@
 
 class WXDLLIMPEXP_FWD_CORE wxBitmap;
 class WXDLLIMPEXP_FWD_CORE wxBitmapHandler;
+class WXDLLIMPEXP_FWD_CORE wxCursor;
+class WXDLLIMPEXP_FWD_CORE wxDC;
 class WXDLLIMPEXP_FWD_CORE wxIcon;
 class WXDLLIMPEXP_FWD_CORE wxMask;
 class WXDLLIMPEXP_FWD_CORE wxPalette;
-class WXDLLIMPEXP_FWD_CORE wxDC;
+class WXDLLIMPEXP_FWD_CORE wxPixelDataBase;
 
 // ----------------------------------------------------------------------------
 // wxVariant support
diff --git a/include/wx/gtk/bitmap.h b/include/wx/gtk/bitmap.h
index 2919fc80d9..e981f7a232 100644
--- a/include/wx/gtk/bitmap.h
+++ b/include/wx/gtk/bitmap.h
@@ -14,8 +14,6 @@ typedef struct _cairo cairo_t;
 typedef struct _cairo_surface cairo_surface_t;
 #endif
 typedef struct _GdkPixbuf GdkPixbuf;
-class WXDLLIMPEXP_FWD_CORE wxPixelDataBase;
-class WXDLLIMPEXP_FWD_CORE wxCursor;
 
 //-----------------------------------------------------------------------------
 // wxMask
diff --git a/include/wx/gtk1/bitmap.h b/include/wx/gtk1/bitmap.h
index 00f592de92..b7e49d476c 100644
--- a/include/wx/gtk1/bitmap.h
+++ b/include/wx/gtk1/bitmap.h
@@ -10,14 +10,9 @@
 #ifndef __GTKBITMAPH__
 #define __GTKBITMAPH__
 
-#include "wx/defs.h"
-#include "wx/object.h"
-#include "wx/string.h"
 #include "wx/palette.h"
 #include "wx/gdiobj.h"
 
-class WXDLLIMPEXP_FWD_CORE wxPixelDataBase;
-
 //-----------------------------------------------------------------------------
 // classes
 //-----------------------------------------------------------------------------
diff --git a/include/wx/msw/bitmap.h b/include/wx/msw/bitmap.h
index 90401db1e2..c055716fcd 100644
--- a/include/wx/msw/bitmap.h
+++ b/include/wx/msw/bitmap.h
@@ -15,19 +15,10 @@
 #include "wx/math.h"
 #include "wx/palette.h"
 
-class WXDLLIMPEXP_FWD_CORE wxBitmap;
-class WXDLLIMPEXP_FWD_CORE wxBitmapHandler;
 class WXDLLIMPEXP_FWD_CORE wxBitmapRefData;
-class WXDLLIMPEXP_FWD_CORE wxControl;
-class WXDLLIMPEXP_FWD_CORE wxCursor;
-class WXDLLIMPEXP_FWD_CORE wxDC;
 #if wxUSE_WXDIB
 class WXDLLIMPEXP_FWD_CORE wxDIB;
 #endif
-class WXDLLIMPEXP_FWD_CORE wxIcon;
-class WXDLLIMPEXP_FWD_CORE wxMask;
-class WXDLLIMPEXP_FWD_CORE wxPalette;
-class WXDLLIMPEXP_FWD_CORE wxPixelDataBase;
 
 // What kind of transparency should a bitmap copied from an icon or cursor
 // have?
diff --git a/include/wx/osx/bitmap.h b/include/wx/osx/bitmap.h
index cef7860f1c..7db0b97bc3 100644
--- a/include/wx/osx/bitmap.h
+++ b/include/wx/osx/bitmap.h
@@ -14,15 +14,7 @@
 #include "wx/palette.h"
 
 // Bitmap
-class WXDLLIMPEXP_FWD_CORE wxBitmap;
 class wxBitmapRefData ;
-class WXDLLIMPEXP_FWD_CORE wxBitmapHandler;
-class WXDLLIMPEXP_FWD_CORE wxControl;
-class WXDLLIMPEXP_FWD_CORE wxCursor;
-class WXDLLIMPEXP_FWD_CORE wxDC;
-class WXDLLIMPEXP_FWD_CORE wxIcon;
-class WXDLLIMPEXP_FWD_CORE wxImage;
-class WXDLLIMPEXP_FWD_CORE wxPixelDataBase;
 
 // A mask is a bitmap used for drawing bitmaps
 // Internally it is stored as a 8 bit deep memory chunk, 0 = black means the source will be drawn
diff --git a/include/wx/qt/bitmap.h b/include/wx/qt/bitmap.h
index d9451ce4b8..d530ae6c31 100644
--- a/include/wx/qt/bitmap.h
+++ b/include/wx/qt/bitmap.h
@@ -8,12 +8,7 @@
 #ifndef _WX_QT_BITMAP_H_
 #define _WX_QT_BITMAP_H_
 
-class WXDLLIMPEXP_FWD_CORE wxPixelDataBase;
-
-class WXDLLIMPEXP_FWD_CORE wxImage;
-class WXDLLIMPEXP_FWD_CORE wxCursor;
 class QImage;
-
 class QPixmap;
 class QBitmap;
 
diff --git a/include/wx/x11/bitmap.h b/include/wx/x11/bitmap.h
index 4c0e6ce3b6..9570e31a80 100644
--- a/include/wx/x11/bitmap.h
+++ b/include/wx/x11/bitmap.h
@@ -11,20 +11,9 @@
 #ifndef _WX_BITMAP_H_
 #define _WX_BITMAP_H_
 
-#include "wx/defs.h"
-#include "wx/object.h"
-#include "wx/string.h"
 #include "wx/palette.h"
 #include "wx/gdiobj.h"
 
-//-----------------------------------------------------------------------------
-// classes
-//-----------------------------------------------------------------------------
-
-class WXDLLIMPEXP_FWD_CORE wxMask;
-class WXDLLIMPEXP_FWD_CORE wxBitmap;
-class WXDLLIMPEXP_FWD_CORE wxImage;
-
 //-----------------------------------------------------------------------------
 // wxMask
 //-----------------------------------------------------------------------------