diff --git a/include/wx/generic/clrpickerg.h b/include/wx/generic/clrpickerg.h
index 585abfc1f5..ba70b2087c 100644
--- a/include/wx/generic/clrpickerg.h
+++ b/include/wx/generic/clrpickerg.h
@@ -13,6 +13,7 @@
 #define _WX_CLRPICKER_H_
 
 #include "wx/button.h"
+#include "wx/bmpbuttn.h"
 #include "wx/cmndata.h"
 
 //-----------------------------------------------------------------------------
diff --git a/src/generic/clrpickerg.cpp b/src/generic/clrpickerg.cpp
index 4e2a86b32c..4c1a588490 100644
--- a/src/generic/clrpickerg.cpp
+++ b/src/generic/clrpickerg.cpp
@@ -27,8 +27,8 @@
 #if wxUSE_COLOURPICKERCTRL
 
 #include "wx/clrpicker.h"
-
 #include "wx/colordlg.h"
+#include "wx/dcmemory.h"
 
 
 // ============================================================================