diff --git a/include/wx/generic/gridctrl.h b/include/wx/generic/gridctrl.h
index 9a87f635ff..1295d5d10b 100644
--- a/include/wx/generic/gridctrl.h
+++ b/include/wx/generic/gridctrl.h
@@ -16,6 +16,8 @@
     #pragma interface "gridctrl.h"
 #endif
 
+#if wxUSE_GRID || wxUSE_NEW_GRID
+
 #include "wx/grid.h"
 #include "wx/string.h"
 #include "wx/datetime.h"
@@ -146,5 +148,7 @@ private:
 
 };
 
+#endif  // #if wxUSE_GRID || wxUSE_NEW_GRID
+
 #endif //_WX_GENERIC_GRIDCTRL_H_
 
diff --git a/src/generic/gridctrl.cpp b/src/generic/gridctrl.cpp
index ddd9793285..12f1c6c655 100644
--- a/src/generic/gridctrl.cpp
+++ b/src/generic/gridctrl.cpp
@@ -19,6 +19,9 @@
     #pragma hdrstop
 #endif
 
+
+#if wxUSE_GRID || wxUSE_NEW_GRID 
+
 #ifndef WX_PRECOMP
     #include "wx/textctrl.h"
     #include "wx/dc.h"
@@ -386,3 +389,4 @@ wxGridCellAutoWrapStringRenderer::GetBestSize(wxGrid& grid,
     return wxSize(width,height);
 }
 
+#endif