diff --git a/damageext/damageext.c b/Xext/damage/damageext.c
similarity index 100%
rename from damageext/damageext.c
rename to Xext/damage/damageext.c
diff --git a/damageext/damageextint.h b/Xext/damage/damageextint.h
similarity index 100%
rename from damageext/damageextint.h
rename to Xext/damage/damageextint.h
diff --git a/damageext/meson.build b/Xext/damage/meson.build
similarity index 100%
rename from damageext/meson.build
rename to Xext/damage/meson.build
diff --git a/Xext/meson.build b/Xext/meson.build
index fe2e1d60b0..1695b71a18 100644
--- a/Xext/meson.build
+++ b/Xext/meson.build
@@ -70,3 +70,5 @@ libxserver_xext_vidmode = static_library('xserver_xext_vidmode',
 if build_xorg
     install_data(hdrs_xext, install_dir: xorgsdkdir)
 endif
+
+subdir('damage')
diff --git a/Xext/panoramiX.c b/Xext/panoramiX.c
index 0a2bdeafb8..8c0c743076 100644
--- a/Xext/panoramiX.c
+++ b/Xext/panoramiX.c
@@ -56,7 +56,7 @@ Equipment Corporation.
 #include "resource.h"
 #include "picturestr_priv.h"
 #include "xfixesint.h"
-#include "damageextint.h"
+#include "Xext/damage/damageextint.h"
 #include "compint.h"
 #include "protocol-versions.h"
 
diff --git a/composite/compint.h b/composite/compint.h
index 3a91914f93..cd0a1a4630 100644
--- a/composite/compint.h
+++ b/composite/compint.h
@@ -68,7 +68,7 @@
 #include "privates.h"
 #include "mi.h"
 #include "damage.h"
-#include "damageextint.h"
+#include "Xext/damage/damageextint.h"
 #include "xfixes.h"
 #include <X11/extensions/compositeproto.h>
 #include "compositeext.h"
diff --git a/meson.build b/meson.build
index 279dba255e..2b4bbb5438 100644
--- a/meson.build
+++ b/meson.build
@@ -602,7 +602,6 @@ inc = include_directories(
     'Xext',
     'Xi',
     'composite',
-    'damageext',
     'exa',
     'fb',
     'glamor',
@@ -713,7 +712,6 @@ subdir('mi')
 subdir('os')
 # X extensions
 subdir('composite')
-subdir('damageext')
 subdir('dbe')
 subdir('miext/damage')
 subdir('miext/shadow')