diff --git a/include/wx/animate.h b/include/wx/animate.h
index 5d2772fec5..c10a05ba47 100644
--- a/include/wx/animate.h
+++ b/include/wx/animate.h
@@ -28,15 +28,15 @@
 
 class WXDLLIMPEXP_ADV wxAnimation;
 
-extern WXDLLEXPORT_DATA(wxAnimation) wxNullAnimation;
-extern WXDLLEXPORT_DATA(const wxChar) wxAnimationCtrlNameStr[];
+extern WXDLLIMPEXP_DATA_ADV(wxAnimation) wxNullAnimation;
+extern WXDLLIMPEXP_DATA_ADV(const wxChar) wxAnimationCtrlNameStr[];
 
 
 // ----------------------------------------------------------------------------
 // wxAnimationBase
 // ----------------------------------------------------------------------------
 
-class WXDLLEXPORT wxAnimationBase : public wxGDIObject
+class WXDLLIMPEXP_ADV wxAnimationBase : public wxGDIObject
 {
 public:
     wxAnimationBase() {}
diff --git a/include/wx/generic/animate.h b/include/wx/generic/animate.h
index a244d32ccd..8b9dc20120 100644
--- a/include/wx/generic/animate.h
+++ b/include/wx/generic/animate.h
@@ -24,9 +24,9 @@
 
 class WXDLLIMPEXP_ADV wxAnimationBase;
 class WXDLLIMPEXP_ADV wxAnimationPlayer;
-class WXDLLEXPORT wxImage;
-class WXDLLEXPORT wxGIFDecoder;
-class WXDLLEXPORT wxAnimation;
+class WXDLLEXPORT     wxImage;
+class WXDLLEXPORT     wxGIFDecoder;
+class WXDLLIMPEXP_ADV wxAnimation;
 
 
 // ----------------------------------------------------------------------------