diff --git a/include/wx/animate.h b/include/wx/animate.h
index d8d5e956ad..64754d58bc 100644
--- a/include/wx/animate.h
+++ b/include/wx/animate.h
@@ -146,13 +146,13 @@ protected:
 // include the platform-specific version of the wxAnimationCtrl class
 // ----------------------------------------------------------------------------
 
-#include "wx/generic/animate.h"
-
 #if defined(__WXGTK20__)
     #include "wx/gtk/animate.h"
 
     #define wxHAS_NATIVE_ANIMATIONCTRL
 #else
+    #include "wx/generic/animate.h"
+
     class WXDLLIMPEXP_ADV wxAnimationCtrl : public wxGenericAnimationCtrl
     {
     public:
diff --git a/include/wx/gtk/animate.h b/include/wx/gtk/animate.h
index 24c0dc7f9a..8b9983c585 100644
--- a/include/wx/gtk/animate.h
+++ b/include/wx/gtk/animate.h
@@ -21,7 +21,7 @@ typedef struct _GdkPixbufAnimationIter GdkPixbufAnimationIter;
 // Resize to animation size if this is set
 #define wxAN_FIT_ANIMATION       0x0010
 
-class WXDLLIMPEXP_ADV wxAnimationCtrl: public wxGenericAnimationCtrl
+class WXDLLIMPEXP_ADV wxAnimationCtrl: public wxAnimationCtrlBase
 {
 public:
     wxAnimationCtrl() { Init(); }
diff --git a/samples/animate/anitest.cpp b/samples/animate/anitest.cpp
index 03157888d4..d10366e594 100644
--- a/samples/animate/anitest.cpp
+++ b/samples/animate/anitest.cpp
@@ -42,6 +42,9 @@
     #error Cannot compile this sample if wxAnimationCtrl is not enabled
 #endif
 
+#ifdef wxHAS_NATIVE_ANIMATIONCTRL
+    #include "wx/generic/animate.h"
+#endif
 
 wxIMPLEMENT_APP(MyApp);
 
diff --git a/src/generic/animateg.cpp b/src/generic/animateg.cpp
index ea772ac1eb..4f6e2a902a 100644
--- a/src/generic/animateg.cpp
+++ b/src/generic/animateg.cpp
@@ -17,6 +17,7 @@
 #if wxUSE_ANIMATIONCTRL
 
 #include "wx/animate.h"
+#include "wx/generic/animate.h"
 #include "wx/generic/private/animate.h"
 
 #ifndef WX_PRECOMP