diff --git a/fb/fbpict_priv.h b/fb/fbpict_priv.h
index 8708fe9042..4092b5a64d 100644
--- a/fb/fbpict_priv.h
+++ b/fb/fbpict_priv.h
@@ -8,7 +8,7 @@
 #include <X11/extensions/renderproto.h>
 
 #include "include/fbpict.h"
-#include "render/picture.h"
+#include "include/picture.h"
 
 void fbRasterizeTrapezoid(PicturePtr alpha, xTrapezoid *trap,
                           int x_off, int y_off);
diff --git a/render/glyphstr.h b/include/glyphstr.h
similarity index 100%
rename from render/glyphstr.h
rename to include/glyphstr.h
diff --git a/include/meson.build b/include/meson.build
index 90f5fed128..270c23ef28 100644
--- a/include/meson.build
+++ b/include/meson.build
@@ -472,6 +472,10 @@ if build_xorg
             'opaque.h',
             'optionstr.h',
             'os.h',
+            'glyphstr.h',
+            'mipict.h',
+            'picture.h',
+            'picturestr.h',
             'present.h',
             'pixmap.h',
             'pixmapstr.h',
diff --git a/render/mipict.h b/include/mipict.h
similarity index 100%
rename from render/mipict.h
rename to include/mipict.h
diff --git a/render/picture.h b/include/picture.h
similarity index 100%
rename from render/picture.h
rename to include/picture.h
diff --git a/render/picturestr.h b/include/picturestr.h
similarity index 100%
rename from render/picturestr.h
rename to include/picturestr.h
diff --git a/render/meson.build b/render/meson.build
index b091d30c65..cdef4d5994 100644
--- a/render/meson.build
+++ b/render/meson.build
@@ -12,19 +12,8 @@ srcs_render = [
     'render.c',
 ]
 
-hdrs_render = [
-    'glyphstr.h',
-    'mipict.h',
-    'picture.h',
-    'picturestr.h',
-]
-
 libxserver_render = static_library('xserver_render',
     srcs_render,
     include_directories: inc,
     dependencies: common_dep,
 )
-
-if build_xorg
-    install_data(hdrs_render, install_dir: xorgsdkdir)
-endif