diff --git a/samples/grid/griddemo.cpp b/samples/grid/griddemo.cpp
index 6e682f597b..e3cd8a30b4 100644
--- a/samples/grid/griddemo.cpp
+++ b/samples/grid/griddemo.cpp
@@ -35,6 +35,7 @@
 #include "wx/grid.h"
 #include "wx/headerctrl.h"
 #include "wx/generic/gridctrl.h"
+#include "wx/generic/grideditors.h"
 
 #include "griddemo.h"
 
diff --git a/src/generic/gridctrl.cpp b/src/generic/gridctrl.cpp
index d1df91d099..8db47ed3cf 100644
--- a/src/generic/gridctrl.cpp
+++ b/src/generic/gridctrl.cpp
@@ -24,6 +24,9 @@
     #include "wx/textctrl.h"
     #include "wx/dc.h"
     #include "wx/combobox.h"
+	#include "wx/settings.h"
+    #include "wx/log.h"
+    #include "wx/checkbox.h"
 #endif // WX_PRECOMP
 
 #include "wx/tokenzr.h"