diff --git a/src/common/imagall.cpp b/src/common/imagall.cpp
index aaf6d459c7..42f2e50f95 100644
--- a/src/common/imagall.cpp
+++ b/src/common/imagall.cpp
@@ -60,11 +60,7 @@ void wxInitAllImageHandlers()
   wxImage::AddHandler( new wxCURHandler );
   wxImage::AddHandler( new wxANIHandler );
 #endif
-#if wxUSE_XPM && (defined(__WXGTK__) || defined(__WXMOTIF__))
-  // NB: keep this #ifdef in sync with the one in image.cpp
-  //     (wxImage::InitStandardHandlers) - they must complement each other
-  //     so that there's always exactly one XPM handler added after calling
-  //     wxInitAllImageHandlers()
+#if wxUSE_XPM
   wxImage::AddHandler( new wxXPMHandler );
 #endif
 }
diff --git a/src/common/image.cpp b/src/common/image.cpp
index f26ae13855..a9201c2aaf 100644
--- a/src/common/image.cpp
+++ b/src/common/image.cpp
@@ -1267,13 +1267,6 @@ void wxImage::InitStandardHandlers()
 #if wxUSE_STREAMS
     AddHandler(new wxBMPHandler);
 #endif // wxUSE_STREAMS
-
-#if wxUSE_XPM && !defined(__WXGTK__) && !defined(__WXMOTIF__)
-    // NB: keep this #ifdef in sync with the one in imagall.cpp -
-    //     they must complement each other so that there's always exactly
-    //     one XPM handler added after calling wxInitAllImageHandlers()
-    AddHandler(new wxXPMHandler);
-#endif
 }
 
 void wxImage::CleanUpHandlers()