diff --git a/hw/xfree86/common/xf86cmap.c b/hw/xfree86/common/xf86cmap.c
index 84f6a495d..ca547cc33 100644
--- a/hw/xfree86/common/xf86cmap.c
+++ b/hw/xfree86/common/xf86cmap.c
@@ -36,11 +36,9 @@
 #include "misc.h"
 
 #include "dix/colormap_priv.h"
-#include "mi/mi_priv.h"
-
-#include "misc.h"
 #include "colormapst.h"
 #include "scrnintstr.h"
+
 #include "resource.h"
 
 #include "xf86.h"
diff --git a/mi/mi_priv.h b/mi/mi_priv.h
index a9360c9b3..281e2e376 100644
--- a/mi/mi_priv.h
+++ b/mi/mi_priv.h
@@ -19,9 +19,6 @@
 #include "include/window.h"
 #include "mi/mi.h"
 
-#define SetInstalledmiColormap(s,c) \
-    (dixSetPrivate(&(s)->devPrivates, micmapScrPrivateKey, c))
-
 void miScreenClose(ScreenPtr pScreen);
 
 void miWideArc(DrawablePtr pDraw, GCPtr pGC, int narcs, xArc * parcs);
diff --git a/mi/micmap.c b/mi/micmap.c
index e8b3ad568..8c132335c 100644
--- a/mi/micmap.c
+++ b/mi/micmap.c
@@ -33,8 +33,6 @@
 #include <X11/Xproto.h>
 
 #include "dix/colormap_priv.h"
-#include "mi/mi_priv.h"
-#include "os/osdep.h"
 
 #include "scrnintstr.h"
 #include "colormapst.h"
diff --git a/mi/micmap.h b/mi/micmap.h
index d8bf7e2c2..bb71c7cb1 100644
--- a/mi/micmap.h
+++ b/mi/micmap.h
@@ -6,6 +6,8 @@
 
 #define GetInstalledmiColormap(s) \
     ((ColormapPtr) dixLookupPrivate(&(s)->devPrivates, micmapScrPrivateKey))
+#define SetInstalledmiColormap(s,c) \
+    (dixSetPrivate(&(s)->devPrivates, micmapScrPrivateKey, c))
 
 extern _X_EXPORT DevPrivateKeyRec micmapScrPrivateKeyRec;