diff --git a/include/wx/config.h b/include/wx/config.h
index 74f90300f7..e8734bf25d 100644
--- a/include/wx/config.h
+++ b/include/wx/config.h
@@ -12,12 +12,10 @@
 #ifndef _WX_CONFIG_H_BASE_
 #define _WX_CONFIG_H_BASE_
 
-#include "wx/defs.h"
+#include "wx/confbase.h"
 
 #if wxUSE_CONFIG
 
-#include "wx/confbase.h"
-
 // ----------------------------------------------------------------------------
 // define the native wxConfigBase implementation
 // ----------------------------------------------------------------------------
diff --git a/src/common/persist.cpp b/src/common/persist.cpp
index 76ab2698bd..64b5957c7c 100644
--- a/src/common/persist.cpp
+++ b/src/common/persist.cpp
@@ -23,6 +23,8 @@
     #pragma hdrstop
 #endif
 
+#if wxUSE_CONFIG
+
 #ifndef WX_PRECOMP
 #endif // WX_PRECOMP
 
@@ -151,3 +153,5 @@ wxPERSIST_DEFINE_SAVE_RESTORE_FOR(long)
 wxPERSIST_DEFINE_SAVE_RESTORE_FOR(wxString)
 
 #undef wxPERSIST_DEFINE_SAVE_RESTORE_FOR  
+
+#endif // wxUSE_CONFIG