diff --git a/hw/vfb/InitOutput.c b/hw/vfb/InitOutput.c
index 94a227b400..6df8b26574 100644
--- a/hw/vfb/InitOutput.c
+++ b/hw/vfb/InitOutput.c
@@ -39,6 +39,7 @@ from The Open Group.
 #include "dix/colormap_priv.h"
 #include "dix/dix_priv.h"
 #include "dix/screenint_priv.h"
+#include "mi/mi_priv.h"
 #include "mi/mipointer_priv.h"
 #include "os/cmdline.h"
 #include "os/ddx_priv.h"
diff --git a/mi/mi_priv.h b/mi/mi_priv.h
index 1264e03b19..3c9d95e121 100644
--- a/mi/mi_priv.h
+++ b/mi/mi_priv.h
@@ -16,13 +16,19 @@
 #include "include/pixmap.h"
 #include "include/regionstr.h"
 #include "include/screenint.h"
+#include "include/scrnintstr.h"
 #include "include/validate.h"
 #include "include/window.h"
 #include "mi/mi.h"
+#include "mi/micmap.h"
 
 #define SetInstalledmiColormap(s,c) \
     (dixSetPrivate(&(s)->devPrivates, micmapScrPrivateKey, c))
 
+static inline ColormapPtr GetInstalledmiColormap(ScreenPtr s) {
+    return (ColormapPtr)dixLookupPrivate(&(s)->devPrivates, &micmapScrPrivateKeyRec);
+}
+
 void miScreenClose(ScreenPtr pScreen);
 
 void miWideArc(DrawablePtr pDraw, GCPtr pGC, int narcs, xArc * parcs);
diff --git a/mi/micmap.h b/mi/micmap.h
index eeb70c4ae1..23e07ec103 100644
--- a/mi/micmap.h
+++ b/mi/micmap.h
@@ -4,9 +4,6 @@
 #ifndef _MICMAP_H_
 #define _MICMAP_H_
 
-#define GetInstalledmiColormap(s) \
-    ((ColormapPtr) dixLookupPrivate(&(s)->devPrivates, micmapScrPrivateKey))
-
 extern _X_EXPORT DevPrivateKeyRec micmapScrPrivateKeyRec;
 
 #define micmapScrPrivateKey (&micmapScrPrivateKeyRec)