diff --git a/include/wx/univ/listbox.h b/include/wx/univ/listbox.h
index a5ef8d0d87..47fd5a69ac 100644
--- a/include/wx/univ/listbox.h
+++ b/include/wx/univ/listbox.h
@@ -121,7 +121,7 @@ protected:
                               wxClientDataType type);
 
     // universal wxComboBox implementation internally uses wxListBox
-    friend class WXDLLEXPORT wxComboBox;
+    friend class WXDLLIMPEXP_FWD_CORE wxComboBox;
 
     virtual void DoSetFirstItem(int n);
 
diff --git a/utils/helpview/src/remhelp.h b/utils/helpview/src/remhelp.h
index 0c43f6a48f..1f45bf0da8 100644
--- a/utils/helpview/src/remhelp.h
+++ b/utils/helpview/src/remhelp.h
@@ -16,7 +16,7 @@
 #include <wx/ipc.h>
 #include <wx/html/helpctrl.h>
 
-class WXDLLEXPORT wxConfigBase;
+class WXDLLIMPEXP_FWD_BASE wxConfigBase;
 
 class rhhcConnection : public wxConnection
 {