diff --git a/include/wx/headercol.h b/include/wx/headercol.h
index 29a26e5ecc..d82fbff2e5 100644
--- a/include/wx/headercol.h
+++ b/include/wx/headercol.h
@@ -163,7 +163,7 @@ protected:
 
 #if defined(__WXMSW__) && !defined(__WXUNIVERSAL__)
     #include "wx/msw/headercol.h"
-#else
+#elif 0 // TODO
     #define wxHAS_GENERIC_HEADERCOL
     #include "wx/generic/headercolg.h"
 #endif
diff --git a/include/wx/headerctrl.h b/include/wx/headerctrl.h
index c65b7d7d32..f47df31917 100644
--- a/include/wx/headerctrl.h
+++ b/include/wx/headerctrl.h
@@ -134,7 +134,7 @@ private:
 
 #if defined(__WXMSW__) && !defined(__WXUNIVERSAL__)
     #include "wx/msw/headerctrl.h"
-#else // !native MSW
+#elif 0 // TODO
     #define wxHAS_GENERIC_HEADERCTRL
     #include "wx/generic/headerctrl.h"
 #endif // platform