diff --git a/include/meson.build b/include/meson.build
index 77dc49d2a2..a0dd5f6e6d 100644
--- a/include/meson.build
+++ b/include/meson.build
@@ -452,6 +452,16 @@ if build_xorg
             'input.h',
             'inputstr.h',
             'list.h',
+            'micmap.h',
+            'micoord.h',
+            'migc.h',
+            'mi.h',
+            'miline.h',
+            'mioverlay.h',
+            'mipointer.h',
+            'mipointrst.h',
+            'mistruct.h',
+            'mizerarc.h',
             'misc.h',
             'miscstruct.h',
             'misync.h',
diff --git a/mi/mi.h b/include/mi.h
similarity index 100%
rename from mi/mi.h
rename to include/mi.h
diff --git a/mi/micmap.h b/include/micmap.h
similarity index 100%
rename from mi/micmap.h
rename to include/micmap.h
diff --git a/mi/micoord.h b/include/micoord.h
similarity index 100%
rename from mi/micoord.h
rename to include/micoord.h
diff --git a/mi/migc.h b/include/migc.h
similarity index 100%
rename from mi/migc.h
rename to include/migc.h
diff --git a/mi/miline.h b/include/miline.h
similarity index 100%
rename from mi/miline.h
rename to include/miline.h
diff --git a/mi/mioverlay.h b/include/mioverlay.h
similarity index 100%
rename from mi/mioverlay.h
rename to include/mioverlay.h
diff --git a/mi/mipointer.h b/include/mipointer.h
similarity index 100%
rename from mi/mipointer.h
rename to include/mipointer.h
diff --git a/mi/mipointrst.h b/include/mipointrst.h
similarity index 100%
rename from mi/mipointrst.h
rename to include/mipointrst.h
diff --git a/mi/mistruct.h b/include/mistruct.h
similarity index 100%
rename from mi/mistruct.h
rename to include/mistruct.h
diff --git a/mi/mizerarc.h b/include/mizerarc.h
similarity index 100%
rename from mi/mizerarc.h
rename to include/mizerarc.h
diff --git a/mi/meson.build b/mi/meson.build
index cde465a9be..6c0e373fa4 100644
--- a/mi/meson.build
+++ b/mi/meson.build
@@ -27,19 +27,6 @@ srcs_mi = [
     'mizerline.c',
 ]
 
-hdrs_mi = [
-  'micmap.h',
-  'micoord.h',
-  'migc.h',
-  'mi.h',
-  'miline.h',
-  'mioverlay.h',
-  'mipointer.h',
-  'mipointrst.h',
-  'mistruct.h',
-  'mizerarc.h',
-]
-
 libxserver_mi = static_library('xserver_mi',
     srcs_mi,
     include_directories: inc,
@@ -48,7 +35,3 @@ libxserver_mi = static_library('xserver_mi',
         m_dep,
     ],
 )
-
-if build_xorg
-    install_data(hdrs_mi, install_dir: xorgsdkdir)
-endif
diff --git a/mi/mi_priv.h b/mi/mi_priv.h
index 14ee426576..ac352d0659 100644
--- a/mi/mi_priv.h
+++ b/mi/mi_priv.h
@@ -13,14 +13,14 @@
 #include "include/callback.h"
 #include "include/events.h"
 #include "include/gc.h"
+#include "include/mi.h"
+#include "include/micmap.h"
 #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"
 
 static inline void SetInstalledmiColormap(ScreenPtr s, ColormapPtr c) {
     dixSetPrivate(&(s)->devPrivates, micmapScrPrivateKey, c);
diff --git a/mi/mipointer_priv.h b/mi/mipointer_priv.h
index cc4ce99400..549135e4d4 100644
--- a/mi/mipointer_priv.h
+++ b/mi/mipointer_priv.h
@@ -9,7 +9,7 @@
 
 #include "dix/screenint_priv.h"
 #include "include/input.h"
-#include "mi/mipointer.h"
+#include "include/mipointer.h"
 
 void miPointerWarpCursor(DeviceIntPtr pDev, ScreenPtr pScreen, int x, int y);
 void miPointerSetScreen(DeviceIntPtr pDev, int screen_num, int x, int y);
diff --git a/test/meson.build b/test/meson.build
index 79fce475ba..07114be05c 100644
--- a/test/meson.build
+++ b/test/meson.build
@@ -174,7 +174,7 @@ if build_xorg
      '../mi/miinitext.c',
      '../mi/miinitext.h',
      '../mi/micmap.c',
-     '../mi/micmap.h',
+     '../include/micmap.h',
      'fixes.c',
      'input.c',
      'list.c',