diff --git a/Xext/security.c b/Xext/security.c
index 97af836ab..c76c37f1f 100644
--- a/Xext/security.c
+++ b/Xext/security.c
@@ -28,6 +28,8 @@ in this Software without prior written authorization from The Open Group.
 #include <dix-config.h>
 #endif
 
+#include "dix/registry_priv.h"
+
 #include "scrnintstr.h"
 #include "inputstr.h"
 #include "windowstr.h"
diff --git a/dix/dispatch.c b/dix/dispatch.c
index 88502709d..b947a02d2 100644
--- a/dix/dispatch.c
+++ b/dix/dispatch.c
@@ -101,6 +101,8 @@ Equipment Corporation.
 #include <version-config.h>
 #endif
 
+#include "dix/registry_priv.h"
+
 #include "windowstr.h"
 #include <X11/fonts/fontstruct.h>
 #include <X11/fonts/libxfont2.h>
diff --git a/dix/extension.c b/dix/extension.c
index dce6a91da..a970f1b89 100644
--- a/dix/extension.c
+++ b/dix/extension.c
@@ -50,6 +50,9 @@ SOFTWARE.
 
 #include <X11/X.h>
 #include <X11/Xproto.h>
+
+#include "dix/registry_priv.h"
+
 #include "misc.h"
 #include "dixstruct.h"
 #include "extnsionst.h"
diff --git a/dix/registry_priv.h b/dix/registry_priv.h
index ac575e142..f8c12e5ed 100644
--- a/dix/registry_priv.h
+++ b/dix/registry_priv.h
@@ -5,6 +5,7 @@
 #ifndef _XSERVER_DIX_REGISTRY_H
 #define _XSERVER_DIX_REGISTRY_H
 
+#include "include/extnsionst.h"
 #include "include/resource.h"
 
 /*
@@ -18,4 +19,14 @@ void dixCloseRegistry(void);
 void RegisterResourceName(RESTYPE type, const char *name);
 const char *LookupResourceName(RESTYPE rtype);
 
+void RegisterExtensionNames(ExtensionEntry * ext);
+
+/*
+ * Lookup functions.  The returned string must not be modified or freed.
+ */
+const char *LookupMajorName(int major);
+const char *LookupRequestName(int major, int minor);
+const char *LookupEventName(int event);
+const char *LookupErrorName(int error);
+
 #endif /* _XSERVER_DIX_REGISTRY_H */
diff --git a/include/registry.h b/include/registry.h
index aaf49d850..a3b26427e 100644
--- a/include/registry.h
+++ b/include/registry.h
@@ -20,16 +20,4 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 #include "resource.h"
 #include "extnsionst.h"
 
-#ifdef X_REGISTRY_REQUEST
-extern _X_EXPORT void RegisterExtensionNames(ExtensionEntry * ext);
-
-/*
- * Lookup functions.  The returned string must not be modified or freed.
- */
-extern _X_EXPORT const char *LookupMajorName(int major);
-extern _X_EXPORT const char *LookupRequestName(int major, int minor);
-extern _X_EXPORT const char *LookupEventName(int event);
-extern _X_EXPORT const char *LookupErrorName(int error);
-#endif
-
 #endif                          /* DIX_REGISTRY_H */