diff --git a/include/wx/msw/iniconf.h b/include/wx/msw/iniconf.h
index 81872a9290..880746f406 100644
--- a/include/wx/msw/iniconf.h
+++ b/include/wx/msw/iniconf.h
@@ -12,6 +12,10 @@
 #ifndef   _INICONF_H
 #define   _INICONF_H
 
+#include "wx/defs.h"
+
+#if wxUSE_CONFIG
+
 // ----------------------------------------------------------------------------
 // wxIniConfig is a wxConfig implementation which uses MS Windows INI files to
 // store the data. Because INI files don't really support arbitrary nesting of
@@ -92,4 +96,6 @@ private:
            m_strPath;     // the rest of the path (no trailing '_'!)
 };
 
-#endif  //_INICONF_H
+#endif // wxUSE_CONFIG
+
+#endif // _INICONF_H
diff --git a/include/wx/msw/regconf.h b/include/wx/msw/regconf.h
index ff886d1796..625c3cc522 100644
--- a/include/wx/msw/regconf.h
+++ b/include/wx/msw/regconf.h
@@ -12,6 +12,10 @@
 #ifndef   _REGCONF_H
 #define   _REGCONF_H
 
+#include "wx/defs.h"
+
+#if wxUSE_CONFIG
+
 #ifndef   _REGISTRY_H
   #include "wx/msw/registry.h"
 #endif
@@ -107,4 +111,6 @@ private:
   wxString  m_strPath;
 };
 
-#endif  //_REGCONF_H
+#endif // wxUSE_CONFIG
+
+#endif // _REGCONF_H
diff --git a/include/wx/palmos/prefconf.h b/include/wx/palmos/prefconf.h
index e5f7f4104a..89d8c485d3 100644
--- a/include/wx/palmos/prefconf.h
+++ b/include/wx/palmos/prefconf.h
@@ -12,6 +12,10 @@
 #ifndef _PREFCONF_H_
 #define _PREFCONF_H_
 
+#include "wx/defs.h"
+
+#if wxUSE_CONFIG
+
 // ----------------------------------------------------------------------------
 // wxPrefConfig
 // ----------------------------------------------------------------------------
@@ -86,5 +90,6 @@ private:
   bool m_modGroup;
 };
 
-#endif // _PREFCONF_H_
+#endif // wxUSE_CONFIG
 
+#endif // _PREFCONF_H_