diff --git a/hw/xfree86/common/xf86VGAarbiterPriv.h b/hw/xfree86/common/xf86VGAarbiterPriv.h
index 573afd8d9c..e4ca3450cd 100644
--- a/hw/xfree86/common/xf86VGAarbiterPriv.h
+++ b/hw/xfree86/common/xf86VGAarbiterPriv.h
@@ -32,7 +32,6 @@
 #include "xf86.h"
 #include "xf86_OSproc.h"
 #include <X11/X.h>
-#include "colormapst.h"
 #include "scrnintstr.h"
 #include "screenint.h"
 #include "gcstruct.h"
diff --git a/hw/xfree86/common/xf86cmap.h b/hw/xfree86/common/xf86cmap.h
index 2661cf4299..8d4364ca33 100644
--- a/hw/xfree86/common/xf86cmap.h
+++ b/hw/xfree86/common/xf86cmap.h
@@ -30,7 +30,6 @@
 #define _XF86CMAP_H
 
 #include "xf86str.h"
-#include "colormapst.h"
 
 #define CMAP_PALETTED_TRUECOLOR		0x0000001
 #define CMAP_RELOAD_ON_MODE_SWITCH	0x0000002
diff --git a/hw/xfree86/dri/dri.c b/hw/xfree86/dri/dri.c
index 33e31f8489..483b42a647 100644
--- a/hw/xfree86/dri/dri.c
+++ b/hw/xfree86/dri/dri.c
@@ -56,7 +56,6 @@ SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 #include "dixstruct.h"
 #include "extnsionst.h"
 #include "extinit.h"
-#include "colormapst.h"
 #include "cursorstr.h"
 #include "scrnintstr.h"
 #include "windowstr.h"
diff --git a/hw/xfree86/dri/xf86dri.c b/hw/xfree86/dri/xf86dri.c
index ffe7008a3c..de4206d189 100644
--- a/hw/xfree86/dri/xf86dri.c
+++ b/hw/xfree86/dri/xf86dri.c
@@ -49,7 +49,6 @@ SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 #include "dixstruct.h"
 #include "extnsionst.h"
 #include "extinit.h"
-#include "colormapst.h"
 #include "cursorstr.h"
 #include "scrnintstr.h"
 #include "servermd.h"
diff --git a/hw/xfree86/fbdevhw/fbdevhw.h b/hw/xfree86/fbdevhw/fbdevhw.h
index 72f834fbff..44eb9dd1ed 100644
--- a/hw/xfree86/fbdevhw/fbdevhw.h
+++ b/hw/xfree86/fbdevhw/fbdevhw.h
@@ -3,7 +3,6 @@
 #define _FBDEVHW_H_
 
 #include "xf86str.h"
-#include "colormapst.h"
 
 #define FBDEVHW_PACKED_PIXELS		0       /* Packed Pixels        */
 #define FBDEVHW_INTERLEAVED_PLANES	2       /* Interleaved planes   */
diff --git a/hw/xfree86/vgahw/vgaHW.h b/hw/xfree86/vgahw/vgaHW.h
index a7d7a500a8..e34ad629a4 100644
--- a/hw/xfree86/vgahw/vgaHW.h
+++ b/hw/xfree86/vgahw/vgaHW.h
@@ -16,7 +16,6 @@
 #include "misc.h"
 #include "input.h"
 #include "scrnintstr.h"
-#include "colormapst.h"
 
 #include "xf86str.h"
 #include "xf86Pci.h"