diff --git a/include/wx/docview.h b/include/wx/docview.h
index 84697a7a7a..5bab609af6 100644
--- a/include/wx/docview.h
+++ b/include/wx/docview.h
@@ -32,7 +32,7 @@ class WXDLLIMPEXP_FWD_CORE wxDocManager;
 class WXDLLIMPEXP_FWD_CORE wxPrintInfo;
 class WXDLLIMPEXP_FWD_CORE wxCommandProcessor;
 class WXDLLIMPEXP_FWD_CORE wxFileHistory;
-class WXDLLIMPEXP_FWD_CORE wxConfigBase;
+class WXDLLIMPEXP_FWD_BASE wxConfigBase;
 
 #if wxUSE_STD_IOSTREAM
   #include "wx/iosfwrap.h"
diff --git a/include/wx/generic/datectrl.h b/include/wx/generic/datectrl.h
index 6e10829231..65065d6c50 100644
--- a/include/wx/generic/datectrl.h
+++ b/include/wx/generic/datectrl.h
@@ -15,7 +15,7 @@
 class WXDLLIMPEXP_FWD_ADV wxCalendarDateAttr;
 class WXDLLIMPEXP_FWD_ADV wxCalendarCtrl;
 class WXDLLIMPEXP_FWD_ADV wxCalendarEvent;
-class WXDLLIMPEXP_FWD_ADV wxComboCtrl;
+class WXDLLIMPEXP_FWD_CORE wxComboCtrl;
 class WXDLLIMPEXP_FWD_ADV wxCalendarComboPopup;
 
 class WXDLLIMPEXP_ADV wxDatePickerCtrlGeneric : public wxDatePickerCtrlBase
diff --git a/include/wx/html/helpfrm.h b/include/wx/html/helpfrm.h
index 886d7b26a2..9916dcb4a7 100644
--- a/include/wx/html/helpfrm.h
+++ b/include/wx/html/helpfrm.h
@@ -64,7 +64,7 @@ class wxHtmlHelpMergedIndex;
 
 class WXDLLIMPEXP_FWD_CORE wxHelpControllerBase;
 class WXDLLIMPEXP_FWD_HTML wxHtmlHelpController;
-class WXDLLIMPEXP_FWD_CORE wxHtmlHelpWindow;
+class WXDLLIMPEXP_FWD_HTML wxHtmlHelpWindow;
 
 class WXDLLIMPEXP_HTML wxHtmlHelpFrame : public wxFrame
 {
diff --git a/include/wx/mac/carbon/app.h b/include/wx/mac/carbon/app.h
index 0de63d5dc8..e44056bd9b 100644
--- a/include/wx/mac/carbon/app.h
+++ b/include/wx/mac/carbon/app.h
@@ -21,7 +21,7 @@ class WXDLLIMPEXP_FWD_CORE wxFrame;
 class WXDLLIMPEXP_FWD_CORE wxWindowMac;
 class WXDLLIMPEXP_FWD_CORE wxApp ;
 class WXDLLIMPEXP_FWD_CORE wxKeyEvent;
-class WXDLLIMPEXP_FWD_CORE wxLog;
+class WXDLLIMPEXP_FWD_BASE wxLog;
 
 // Force an exit from main loop
 void WXDLLEXPORT wxExit();
diff --git a/include/wx/mgl/app.h b/include/wx/mgl/app.h
index 8bd35c9760..c6462d41a6 100644
--- a/include/wx/mgl/app.h
+++ b/include/wx/mgl/app.h
@@ -19,7 +19,7 @@
 //-----------------------------------------------------------------------------
 
 class WXDLLIMPEXP_FWD_CORE wxApp;
-class WXDLLIMPEXP_FWD_CORE wxLog;
+class WXDLLIMPEXP_FWD_BASE wxLog;
 class WXDLLIMPEXP_FWD_CORE wxEventLoop;
 
 //-----------------------------------------------------------------------------
diff --git a/include/wx/motif/app.h b/include/wx/motif/app.h
index 088f2d39cc..94b695567d 100644
--- a/include/wx/motif/app.h
+++ b/include/wx/motif/app.h
@@ -27,7 +27,7 @@ class WXDLLIMPEXP_FWD_CORE wxFrame;
 class WXDLLIMPEXP_FWD_CORE wxWindow;
 class WXDLLIMPEXP_FWD_CORE wxApp;
 class WXDLLIMPEXP_FWD_CORE wxKeyEvent;
-class WXDLLIMPEXP_FWD_CORE wxLog;
+class WXDLLIMPEXP_FWD_BASE wxLog;
 class WXDLLIMPEXP_FWD_CORE wxEventLoop;
 class WXDLLIMPEXP_FWD_CORE wxXVisualInfo;
 class WXDLLIMPEXP_FWD_CORE wxPerDisplayData;
diff --git a/include/wx/motif/listbox.h b/include/wx/motif/listbox.h
index c743a98add..9b90c9fcc6 100644
--- a/include/wx/motif/listbox.h
+++ b/include/wx/motif/listbox.h
@@ -16,7 +16,7 @@
 #include "wx/clntdata.h"
 
 // forward decl for GetSelections()
-class WXDLLIMPEXP_FWD_CORE wxArrayInt;
+class WXDLLIMPEXP_FWD_BASE wxArrayInt;
 
 // List box item
 class WXDLLEXPORT wxListBox: public wxListBoxBase
diff --git a/include/wx/os2/app.h b/include/wx/os2/app.h
index 13d3911521..33f4443e00 100644
--- a/include/wx/os2/app.h
+++ b/include/wx/os2/app.h
@@ -41,7 +41,7 @@ class WXDLLIMPEXP_FWD_CORE wxFrame;
 class WXDLLIMPEXP_FWD_CORE wxWindow;
 class WXDLLIMPEXP_FWD_CORE wxApp;
 class WXDLLIMPEXP_FWD_CORE wxKeyEvent;
-class WXDLLIMPEXP_FWD_CORE wxLog;
+class WXDLLIMPEXP_FWD_BASE wxLog;
 
 WXDLLEXPORT_DATA(extern wxApp*) wxTheApp;
 WXDLLEXPORT_DATA(extern HAB)    vHabmain;
diff --git a/include/wx/scrolwin.h b/include/wx/scrolwin.h
index e7660e93ea..001eb0bca8 100644
--- a/include/wx/scrolwin.h
+++ b/include/wx/scrolwin.h
@@ -15,7 +15,7 @@
 #include "wx/panel.h"
 
 class WXDLLIMPEXP_FWD_CORE wxScrollHelperEvtHandler;
-class WXDLLIMPEXP_FWD_CORE wxTimer;
+class WXDLLIMPEXP_FWD_BASE wxTimer;
 
 // default scrolled window style: scroll in both directions
 #define wxScrolledWindowStyle (wxHSCROLL | wxVSCROLL)
diff --git a/include/wx/unix/mimetype.h b/include/wx/unix/mimetype.h
index d34b020f91..fd21e6c352 100644
--- a/include/wx/unix/mimetype.h
+++ b/include/wx/unix/mimetype.h
@@ -140,7 +140,7 @@ protected:
     virtual bool WriteMimeInfo(int nIndex, bool delete_mime );
 
     // give it access to m_aXXX variables
-    friend class WXDLLIMPEXP_FWD_CORE wxFileTypeImpl;
+    friend class WXDLLIMPEXP_FWD_BASE wxFileTypeImpl;
 };
 
 
diff --git a/include/wx/utils.h b/include/wx/utils.h
index 7a7ec0d892..0baa6099d6 100644
--- a/include/wx/utils.h
+++ b/include/wx/utils.h
@@ -46,7 +46,7 @@ class WXDLLIMPEXP_FWD_BASE wxArrayInt;
 // Forward declaration
 // ----------------------------------------------------------------------------
 
-class WXDLLIMPEXP_FWD_CORE wxProcess;
+class WXDLLIMPEXP_FWD_BASE wxProcess;
 class WXDLLIMPEXP_FWD_CORE wxFrame;
 class WXDLLIMPEXP_FWD_CORE wxWindow;
 class WXDLLIMPEXP_FWD_CORE wxWindowList;
diff --git a/include/wx/x11/app.h b/include/wx/x11/app.h
index a32699073a..0aa5f73d7f 100644
--- a/include/wx/x11/app.h
+++ b/include/wx/x11/app.h
@@ -27,7 +27,7 @@ class WXDLLIMPEXP_FWD_CORE wxFrame;
 class WXDLLIMPEXP_FWD_CORE wxWindow;
 class WXDLLIMPEXP_FWD_CORE wxApp;
 class WXDLLIMPEXP_FWD_CORE wxKeyEvent;
-class WXDLLIMPEXP_FWD_CORE wxLog;
+class WXDLLIMPEXP_FWD_BASE wxLog;
 class WXDLLIMPEXP_FWD_CORE wxXVisualInfo;
 
 // ----------------------------------------------------------------------------
diff --git a/include/wx/xrc/xh_wizrd.h b/include/wx/xrc/xh_wizrd.h
index a9ff5d0768..1831d79c9c 100644
--- a/include/wx/xrc/xh_wizrd.h
+++ b/include/wx/xrc/xh_wizrd.h
@@ -15,8 +15,8 @@
 
 #if wxUSE_XRC && wxUSE_WIZARDDLG
 
-class WXDLLIMPEXP_FWD_CORE wxWizard;
-class WXDLLIMPEXP_FWD_CORE wxWizardPageSimple;
+class WXDLLIMPEXP_FWD_ADV wxWizard;
+class WXDLLIMPEXP_FWD_ADV wxWizardPageSimple;
 
 class WXDLLIMPEXP_XRC wxWizardXmlHandler : public wxXmlResourceHandler
 {