diff --git a/include/wx/defs.h b/include/wx/defs.h
index 51e07843f8..f2e95d4aff 100644
--- a/include/wx/defs.h
+++ b/include/wx/defs.h
@@ -403,15 +403,12 @@ typedef int wxWindowID;
     #define WXDLLIMPEXP_DATA_CORE(type) type
 #endif
 
-#ifdef WXMAKINGDLL_HTML
-    #define WXDLLIMPEXP_HTML WXEXPORT
-    #define WXDLLIMPEXP_DATA_HTML(type) WXEXPORT type
+#ifdef WXMAKINGDLL_GL
+    #define WXDLLIMPEXP_GL WXEXPORT
 #elif defined(WXUSINGDLL)
-    #define WXDLLIMPEXP_HTML WXIMPORT
-    #define WXDLLIMPEXP_DATA_HTML(type) WXIMPORT type
+    #define WXDLLIMPEXP_GL WXIMPORT
 #else // not making nor using DLL
-    #define WXDLLIMPEXP_HTML
-    #define WXDLLIMPEXP_DATA_HTML(type) type
+    #define WXDLLIMPEXP_GL
 #endif
 
 // for backwards compatibility, define suffix-less versions too
diff --git a/include/wx/msw/glcanvas.h b/include/wx/msw/glcanvas.h
index b8dab7af65..a12a47b6c1 100644
--- a/include/wx/msw/glcanvas.h
+++ b/include/wx/msw/glcanvas.h
@@ -52,9 +52,9 @@ enum
   WX_GL_MIN_ACCUM_ALPHA  /* use blue buffer with most bits (> MIN_ACCUM_ALPHA bits) */
 };
 
-class WXDLLEXPORT wxGLCanvas;     /* forward reference */
+class WXDLLIMPEXP_GL wxGLCanvas;     /* forward reference */
 
-class WXDLLEXPORT wxGLContext: public wxObject
+class WXDLLIMPEXP_GL wxGLContext: public wxObject
 {
 public:
    wxGLContext(bool isRGB, wxGLCanvas *win, const wxPalette& palette = wxNullPalette);
@@ -80,7 +80,7 @@ public:
    wxWindow*        m_window;
 };
 
-class WXDLLEXPORT wxGLCanvas: public wxWindow
+class WXDLLIMPEXP_GL wxGLCanvas: public wxWindow
 {
    DECLARE_CLASS(wxGLCanvas)
  public: