diff --git a/composite/compinit.c b/composite/compinit.c
index e0a5653651..2aa6902ec3 100644
--- a/composite/compinit.c
+++ b/composite/compinit.c
@@ -44,6 +44,7 @@
 #include <dix-config.h>
 
 #include "dix/dix_priv.h"
+#include "include/colormapst.h"
 #include "os/osdep.h"
 
 #include "compint.h"
diff --git a/composite/compint.h b/composite/compint.h
index cb73c386d6..2b707ecb35 100644
--- a/composite/compint.h
+++ b/composite/compint.h
@@ -56,7 +56,6 @@
 #include "windowstr.h"
 #include "input.h"
 #include "resource.h"
-#include "colormapst.h"
 #include "cursorstr.h"
 #include "dixstruct.h"
 #include "gcstruct.h"