diff --git a/damageext/damageext.c b/damageext/damageext.c
index 733491c40..192d2e562 100644
--- a/damageext/damageext.c
+++ b/damageext/damageext.c
@@ -57,6 +57,8 @@ static DevPrivateKeyRec DamageClientPrivateKeyRec;
 
 #define DamageClientPrivateKey (&DamageClientPrivateKeyRec)
 
+Bool noDamageExtension = FALSE;
+
 static void
 DamageNoteCritical(ClientPtr pClient)
 {
diff --git a/include/extinit.h b/include/extinit.h
index a92aef935..d68516196 100644
--- a/include/extinit.h
+++ b/include/extinit.h
@@ -57,10 +57,6 @@ OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 extern _X_EXPORT Bool noCompositeExtension;
 #endif
 
-#ifdef DAMAGE
-extern _X_EXPORT Bool noDamageExtension;
-#endif
-
 #if defined(DBE)
 extern _X_EXPORT Bool noDbeExtension;
 #endif
diff --git a/include/extinit_priv.h b/include/extinit_priv.h
index 186fe8ad2..2f0c8b31a 100644
--- a/include/extinit_priv.h
+++ b/include/extinit_priv.h
@@ -8,6 +8,7 @@
 
 #include "extinit.h"
 
+extern Bool noDamageExtension;
 extern Bool noGEExtension;
 
 void CompositeExtensionInit(void);
diff --git a/os/utils.c b/os/utils.c
index 6db344403..73f57eab9 100644
--- a/os/utils.c
+++ b/os/utils.c
@@ -125,10 +125,6 @@ Bool noTestExtensions;
 #ifdef COMPOSITE
 Bool noCompositeExtension = FALSE;
 #endif
-
-#ifdef DAMAGE
-Bool noDamageExtension = FALSE;
-#endif
 #ifdef DBE
 Bool noDbeExtension = FALSE;
 #endif