diff --git a/src/common/config.cpp b/src/common/config.cpp
index d2015ed568..1b614016b2 100644
--- a/src/common/config.cpp
+++ b/src/common/config.cpp
@@ -132,9 +132,9 @@ bool wxConfigBase::Read(const wxString& key, long *pl, long defVal) const
 bool wxConfigBase::Read(const wxString& key, double* val) const
 {
     wxString str;
-    if (Read(key, & str))
+    if ( Read(key, &str) )
     {
-        return wxSscanf(str, _T("%g"), val) == 1;
+        return str.ToDouble(val);
     }
 
     return FALSE;
diff --git a/src/generic/gridctrl.cpp b/src/generic/gridctrl.cpp
index 23fa38899a..f16184ecf7 100644
--- a/src/generic/gridctrl.cpp
+++ b/src/generic/gridctrl.cpp
@@ -19,6 +19,11 @@
     #pragma hdrstop
 #endif
 
+#ifndef WX_PRECOMP
+    #include "wx/textctrl.h"
+    #include "wx/dc.h"
+#endif // WX_PRECOMP
+
 #include "wx/generic/gridctrl.h"
 #include "wx/tokenzr.h"