diff --git a/include/wx/anidecod.h b/include/wx/anidecod.h
index 4fe25b6da8..4375a24f70 100644
--- a/include/wx/anidecod.h
+++ b/include/wx/anidecod.h
@@ -12,7 +12,7 @@
 
 #include "wx/defs.h"
 
-#if wxUSE_STREAMS && wxUSE_GIF
+#if wxUSE_STREAMS && wxUSE_ICO_CUR
 
 #include "wx/stream.h"
 #include "wx/image.h"
@@ -72,6 +72,6 @@ private:
 };
 
 
-#endif  // wxUSE_STREAM && wxUSE_GIF
-#endif  // _WX_ANIDECOD_H
+#endif  // wxUSE_STREAM && wxUSE_ICO_CUR
 
+#endif  // _WX_ANIDECOD_H
diff --git a/src/common/anidecod.cpp b/src/common/anidecod.cpp
index e3b5ba4718..7f90c8fdeb 100644
--- a/src/common/anidecod.cpp
+++ b/src/common/anidecod.cpp
@@ -14,7 +14,7 @@
     #pragma hdrstop
 #endif
 
-#if wxUSE_STREAMS && wxUSE_GIF
+#if wxUSE_STREAMS && wxUSE_ICO_CUR
 
 #include "wx/anidecod.h"
 
@@ -330,4 +330,4 @@ bool wxANIDecoder::Load( wxInputStream& stream )
     return m_szAnimation != wxDefaultSize;
 }
 
-#endif // wxUSE_STREAMS && wxUSE_GIF
+#endif // wxUSE_STREAMS && wxUSE_ICO_CUR
diff --git a/src/generic/animateg.cpp b/src/generic/animateg.cpp
index 3495d4a15f..3a84197ddd 100644
--- a/src/generic/animateg.cpp
+++ b/src/generic/animateg.cpp
@@ -209,8 +209,12 @@ const wxAnimationDecoder *wxAnimation::FindHandler( wxAnimationType animType )
 
 void wxAnimation::InitStandardHandlers()
 {
+#if wxUSE_GIF
     AddHandler(new wxGIFDecoder);
+#endif // wxUSE_GIF
+#if wxUSE_ICO_CUR
     AddHandler(new wxANIDecoder);
+#endif // wxUSE_ICO_CUR
 }
 
 void wxAnimation::CleanUpHandlers()