diff --git a/hw/xquartz/quartz.c b/hw/xquartz/quartz.c
index 0e971d5eb1..c587a67029 100644
--- a/hw/xquartz/quartz.c
+++ b/hw/xquartz/quartz.c
@@ -35,6 +35,7 @@
 
 #include "dix/dix_priv.h"
 #include "dix/screenint_priv.h"
+#include "miext/extinit_priv.h"
 
 #include "quartzRandR.h"
 #include "inputstr.h"
@@ -43,7 +44,6 @@
 #include "darwinEvents.h"
 #include "pseudoramiX.h"
 #include "extension.h"
-#include "nonsdk_extinit.h"
 #include "glx_extinit.h"
 #define _APPLEWM_SERVER_
 #include "applewmExt.h"
diff --git a/hw/xquartz/xpr/xprScreen.c b/hw/xquartz/xpr/xprScreen.c
index 5e4b281b87..885ed84626 100644
--- a/hw/xquartz/xpr/xprScreen.c
+++ b/hw/xquartz/xpr/xprScreen.c
@@ -32,6 +32,7 @@
 #include <dix-config.h>
 
 #include "dix/screenint_priv.h"
+#include "miext/extinit_priv.h"
 
 #include "inputstr.h"
 #include "quartz.h"
@@ -53,9 +54,6 @@
 #include "damage.h"
 #endif
 
-#include "nonsdk_extinit.h"
-#include "miext/extinit_priv.h"
-
 /* 10.4's deferred update makes X slower.. have to live with the tearing
  * for now.. */
 #define XP_NO_DEFERRED_UPDATES 8
diff --git a/hw/xwin/InitOutput.c b/hw/xwin/InitOutput.c
index d7470cc3b7..d3d4a07d32 100644
--- a/hw/xwin/InitOutput.c
+++ b/hw/xwin/InitOutput.c
@@ -61,7 +61,6 @@ typedef WINAPI HRESULT(*SHGETFOLDERPATHPROC) (HWND hwndOwner,
 #endif
 
 #include "winmonitors.h"
-#include "nonsdk_extinit.h"
 #include "pseudoramiX/pseudoramiX.h"
 
 #include "glx_extinit.h"
diff --git a/include/meson.build b/include/meson.build
index 687cb0af15..146e44fb05 100644
--- a/include/meson.build
+++ b/include/meson.build
@@ -463,7 +463,6 @@ if build_xorg
             'misc.h',
             'miscstruct.h',
             'opaque.h',
-            'nonsdk_extinit.h',
             'optionstr.h',
             'os.h',
             'pixmap.h',
diff --git a/include/nonsdk_extinit.h b/include/nonsdk_extinit.h
deleted file mode 100644
index dc10df12bf..0000000000
--- a/include/nonsdk_extinit.h
+++ /dev/null
@@ -1,34 +0,0 @@
-/***********************************************************
-
-Copyright 2014 Jon TURNEY
-
-Permission is hereby granted, free of charge, to any person obtaining a
-copy of this software and associated documentation files (the "Software"),
-to deal in the Software without restriction, including without limitation
-the rights to use, copy, modify, merge, publish, distribute, sublicense,
-and/or sell copies of the Software, and to permit persons to whom the
-Software is furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice (including the next
-paragraph) shall be included in all copies or substantial portions of the
-Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
-THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
-FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
-DEALINGS IN THE SOFTWARE.
-
-******************************************************************/
-
-#ifndef NONSDK_EXT_INIT_H
-#define NONSDK_EXT_INIT_H
-
-/* this is separate from extinit.h to avoid references to these symbols being
-   pulled in by sdksyms */
-
-extern _X_EXPORT Bool noPseudoramiXExtension;
-
-#endif
diff --git a/miext/extinit_priv.h b/miext/extinit_priv.h
index 4610f0c3d0..34d6a59fb9 100644
--- a/miext/extinit_priv.h
+++ b/miext/extinit_priv.h
@@ -29,6 +29,8 @@ extern Bool noNamespaceExtension;
 
 extern Bool PanoramiXExtensionDisabledHack;
 
+extern Bool noPseudoramiXExtension;
+
 extern char *namespaceConfigFile;
 
 void CompositeExtensionInit(void);
diff --git a/pseudoramiX/pseudoramiX.c b/pseudoramiX/pseudoramiX.c
index 899d15b3b3..cbcf2005d5 100644
--- a/pseudoramiX/pseudoramiX.c
+++ b/pseudoramiX/pseudoramiX.c
@@ -43,7 +43,6 @@
 
 #include "pseudoramiX.h"
 #include "extnsionst.h"
-#include "nonsdk_extinit.h"
 #include "dixstruct.h"
 #include "window.h"
 #include <X11/extensions/panoramiXproto.h>