diff --git a/dix/colormap_priv.h b/dix/colormap_priv.h
index 2768d3e79..81615f800 100644
--- a/dix/colormap_priv.h
+++ b/dix/colormap_priv.h
@@ -20,7 +20,15 @@
 #define CM_AllAllocated 2
 #define CM_BeingCreated 4
 
-typedef struct _CMEntry *EntryPtr;
+/* color map entry */
+typedef struct _CMEntry {
+    union {
+        LOCO local;
+        SHCO shco;
+    } co;
+    short refcnt;
+    Bool fShared;
+} Entry, *EntryPtr;
 
 /* COLORMAPs can be used for either Direct or Pseudo color.  PseudoColor
  * only needs one cell table, we arbitrarily pick red.  We keep track
diff --git a/include/colormapst.h b/include/colormapst.h
index c9eee9752..eb0c59137 100644
--- a/include/colormapst.h
+++ b/include/colormapst.h
@@ -70,14 +70,4 @@ typedef struct {
     SHAREDCOLOR *red, *green, *blue;
 } SHCO;
 
-/* color map entry */
-typedef struct _CMEntry {
-    union {
-        LOCO local;
-        SHCO shco;
-    } co;
-    short refcnt;
-    Bool fShared;
-} Entry;
-
 #endif                          /* COLORMAP_H */