diff --git a/include/wx/generic/private/grid.h b/include/wx/generic/private/grid.h
index cd92f64fe5..c67f462902 100644
--- a/include/wx/generic/private/grid.h
+++ b/include/wx/generic/private/grid.h
@@ -15,6 +15,8 @@
 
 #if wxUSE_GRID
 
+#include "wx/headerctrl.h"
+
 // Internally used (and hence intentionally not exported) event telling wxGrid
 // to hide the currently shown editor.
 wxDECLARE_EVENT( wxEVT_GRID_HIDE_EDITOR, wxCommandEvent );
diff --git a/src/generic/grideditors.cpp b/src/generic/grideditors.cpp
index f8799997e3..e5b008697b 100644
--- a/src/generic/grideditors.cpp
+++ b/src/generic/grideditors.cpp
@@ -37,7 +37,6 @@
 #include "wx/spinctrl.h"
 #include "wx/tokenzr.h"
 #include "wx/renderer.h"
-#include "wx/headerctrl.h"
 #include "wx/datectrl.h"
 
 #include "wx/generic/gridsel.h"