diff --git a/Xext/dpms.c b/Xext/dpms.c
index 7fca78c43..f5e8ab256 100644
--- a/Xext/dpms.c
+++ b/Xext/dpms.c
@@ -47,6 +47,8 @@ Equipment Corporation.
 #include "windowstr.h"
 #include "protocol-versions.h"
 
+Bool noDPMSExtension = FALSE;
+
 CARD16 DPMSPowerLevel = 0;
 Bool DPMSDisabledSwitch = FALSE;
 CARD32 DPMSStandbyTime = -1;
diff --git a/hw/xnest/Args.c b/hw/xnest/Args.c
index 94532969e..94f52764c 100644
--- a/hw/xnest/Args.c
+++ b/hw/xnest/Args.c
@@ -17,6 +17,7 @@ is" without express or implied warranty.
 #include <X11/Xdefs.h>
 #include <X11/Xproto.h>
 
+#include "include/extinit_priv.h"
 #include "os/ddx_priv.h"
 
 #include "screenint.h"
@@ -24,7 +25,6 @@ is" without express or implied warranty.
 #include "misc.h"
 #include "scrnintstr.h"
 #include "servermd.h"
-#include "extinit.h"
 
 #include "xnest-xcb.h"
 
diff --git a/include/extinit.h b/include/extinit.h
index 4b62d6f48..8852c4b95 100644
--- a/include/extinit.h
+++ b/include/extinit.h
@@ -56,10 +56,6 @@ OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 #ifdef COMPOSITE
 extern _X_EXPORT Bool noCompositeExtension;
 #endif
-#if defined(DPMSExtension)
-extern _X_EXPORT Bool noDPMSExtension;
-#endif
-
 #ifdef GLXEXT
 extern _X_EXPORT Bool noGlxExtension;
 #endif
diff --git a/include/extinit_priv.h b/include/extinit_priv.h
index d10ce79f2..b4a8fd827 100644
--- a/include/extinit_priv.h
+++ b/include/extinit_priv.h
@@ -10,6 +10,7 @@
 
 extern Bool noDamageExtension;
 extern Bool noDbeExtension;
+extern Bool noDPMSExtension;
 extern Bool noGEExtension;
 
 void CompositeExtensionInit(void);
diff --git a/os/utils.c b/os/utils.c
index bdcc7e0c1..49c43d005 100644
--- a/os/utils.c
+++ b/os/utils.c
@@ -107,6 +107,7 @@ __stdcall unsigned long GetTickCount(void);
 
 #include "dix/dix_priv.h"
 #include "dix/input_priv.h"
+#include "include/extinit_priv.h"
 #include "os/auth.h"
 #include "os/cmdline.h"
 #include "os/ddx_priv.h"
@@ -119,16 +120,13 @@ __stdcall unsigned long GetTickCount(void);
 #include "miinitext.h"
 #include "present.h"
 #include "dixstruct_priv.h"
+#include "dpmsproc.h"
 
 Bool noTestExtensions;
 
 #ifdef COMPOSITE
 Bool noCompositeExtension = FALSE;
 #endif
-#ifdef DPMSExtension
-#include "dpmsproc.h"
-Bool noDPMSExtension = FALSE;
-#endif
 #ifdef GLXEXT
 Bool noGlxExtension = FALSE;
 #endif