diff --git a/include/wx/msw/regconf.h b/include/wx/msw/regconf.h
index 59fc5c67d2..d90dec3bb0 100644
--- a/include/wx/msw/regconf.h
+++ b/include/wx/msw/regconf.h
@@ -9,13 +9,14 @@
 // Licence:     wxWindows licence
 ///////////////////////////////////////////////////////////////////////////////
 
-#ifndef   _REGCONF_H
-#define   _REGCONF_H
+#ifndef _WX_MSW_REGCONF_H_
+#define _WX_MSW_REGCONF_H_
 
-#ifndef   _REGISTRY_H
-  #include "wx/msw/registry.h"
-#endif
+#include "wx/defs.h"
 
+#if wxUSE_CONFIG && wxUSE_REGKEY
+
+#include "wx/msw/registry.h"
 #include "wx/object.h"
 #include "wx/confbase.h"
 #include "wx/buffer.h"
@@ -109,4 +110,6 @@ private:
   DECLARE_ABSTRACT_CLASS(wxRegConfig)
 };
 
-#endif  //_REGCONF_H
+#endif // wxUSE_CONFIG && wxUSE_REGKEY
+
+#endif  // _WX_MSW_REGCONF_H_
diff --git a/src/msw/regconf.cpp b/src/msw/regconf.cpp
index 4d5388cf4c..363987830b 100644
--- a/src/msw/regconf.cpp
+++ b/src/msw/regconf.cpp
@@ -16,7 +16,7 @@
     #pragma hdrstop
 #endif
 
-#if wxUSE_CONFIG
+#if wxUSE_CONFIG && wxUSE_REGKEY
 
 #include "wx/config.h"
 
@@ -780,4 +780,4 @@ bool wxRegConfig::DeleteAll()
   return bOk;
 }
 
-#endif // wxUSE_CONFIG
+#endif // wxUSE_CONFIG && wxUSE_REGKEY