diff --git a/include/wx/html/helpdata.h b/include/wx/html/helpdata.h
index 21719640c7..ee861f43e2 100644
--- a/include/wx/html/helpdata.h
+++ b/include/wx/html/helpdata.h
@@ -77,7 +77,8 @@ protected:
 };
 
 
-WX_DECLARE_EXPORTED_OBJARRAY(wxHtmlBookRecord, wxHtmlBookRecArray);
+WX_DECLARE_USER_EXPORTED_OBJARRAY(wxHtmlBookRecord, wxHtmlBookRecArray,
+                                  WXDLLIMPEXP_HTML);
 
 
 struct wxHtmlContentsItem
diff --git a/include/wx/mimetype.h b/include/wx/mimetype.h
index f7cab60e83..f332faf641 100644
--- a/include/wx/mimetype.h
+++ b/include/wx/mimetype.h
@@ -149,7 +149,8 @@ private:
 #endif // 0
 };
 
-WX_DECLARE_EXPORTED_OBJARRAY(wxFileTypeInfo, wxArrayFileTypeInfo);
+WX_DECLARE_USER_EXPORTED_OBJARRAY(wxFileTypeInfo, wxArrayFileTypeInfo,
+                                  WXDLLIMPEXP_BASE);
 
 // ----------------------------------------------------------------------------
 // wxFileType: gives access to all information about the files of given type.
diff --git a/include/wx/module.h b/include/wx/module.h
index 181dff1e29..bbdfd7a428 100644
--- a/include/wx/module.h
+++ b/include/wx/module.h
@@ -21,7 +21,7 @@
 
 // declare a linked list of modules
 class wxModule;
-WX_DECLARE_EXPORTED_LIST(wxModule, wxModuleList);
+WX_DECLARE_USER_EXPORTED_LIST(wxModule, wxModuleList, WXDLLIMPEXP_BASE);
 
 // declaring a class derived from wxModule will automatically create an
 // instance of this class on program startup, call its OnInit() method and call
diff --git a/src/html/htmlwin.cpp b/src/html/htmlwin.cpp
index 6b6dc54236..6120a8b7ba 100644
--- a/src/html/htmlwin.cpp
+++ b/src/html/htmlwin.cpp
@@ -120,7 +120,7 @@ void wxHtmlWinAutoScrollTimer::Notify()
 //-----------------------------------------------------------------------------
 
 // item of history list
-class WXDLLEXPORT wxHtmlHistoryItem
+class WXDLLIMPEXP_HTML wxHtmlHistoryItem
 {
 public:
     wxHtmlHistoryItem(const wxString& p, const wxString& a) {m_Page = p, m_Anchor = a, m_Pos = 0;}
diff --git a/src/html/m_layout.cpp b/src/html/m_layout.cpp
index 78424023c8..b524a9db1c 100644
--- a/src/html/m_layout.cpp
+++ b/src/html/m_layout.cpp
@@ -66,7 +66,7 @@ FORCE_LINK_ME(m_layout)
 // array wxHtmlPrintout::m_PageBreaks of pagebreaks already set, and
 // set a new one only if it's not in that array.
 
-class WXDLLEXPORT wxHtmlPageBreakCell : public wxHtmlCell
+class wxHtmlPageBreakCell : public wxHtmlCell
 {
 public:
     wxHtmlPageBreakCell() {}