diff --git a/include/wx/gifdecod.h b/include/wx/gifdecod.h
index 9c3d14fc9c..922ac29777 100644
--- a/include/wx/gifdecod.h
+++ b/include/wx/gifdecod.h
@@ -50,8 +50,7 @@ typedef struct _IMAGEN
 #define E_FORMATO       1           /* error in gif header */
 #define E_MEMORIA       2           /* error allocating memory */
 
-
-class wxGIFDecoder
+class WXDLLEXPORT wxGIFDecoder
 {
 private:
     /* logical screen */
diff --git a/include/wx/html/helpfrm.h b/include/wx/html/helpfrm.h
index 5f2de5df08..6be92402de 100644
--- a/include/wx/html/helpfrm.h
+++ b/include/wx/html/helpfrm.h
@@ -55,6 +55,17 @@ enum {
     wxID_HTML_HELPFRAME // the id of wxHtmlHelpController's helpframe
 };
 
+class WXDLLEXPORT wxHtmlHelpFrameCfg
+{
+public:
+    wxHtmlHelpFrameCfg() {};
+	long x, y, w, h;
+	long sashpos;
+	bool navig_on;
+	int style; // flags given to wxHtmlHelpFrame ctor
+	wxString titleformat;
+};
+
 class WXDLLEXPORT wxHtmlHelpFrame : public wxFrame
 {
     DECLARE_DYNAMIC_CLASS(wxHtmlHelpFrame)
@@ -153,14 +164,7 @@ protected:
     wxListBox *m_SearchList;
     wxChoice *m_SearchChoice;
 
-    struct WXDLLEXPORT _struct_Cfg {
-	long x, y, w, h;
-	long sashpos;
-	bool navig_on;
-	int style; // flags given to wxHtmlHelpFrame ctor
-	wxString titleformat;
-    } m_Cfg;
-    // settings (window size, position, sash pos etc..)
+    wxHtmlHelpFrameCfg m_Cfg;
     wxConfigBase *m_Config;
     wxString m_ConfigRoot;