diff --git a/Xext/xres.c b/Xext/xres.c
index 354329802..ff0259bd1 100644
--- a/Xext/xres.c
+++ b/Xext/xres.c
@@ -11,6 +11,9 @@
 #include <X11/X.h>
 #include <X11/Xproto.h>
 #include <assert.h>
+
+#include "dix/registry_priv.h"
+
 #include "misc.h"
 #include "os.h"
 #include "dixstruct.h"
diff --git a/Xext/xselinux_hooks.c b/Xext/xselinux_hooks.c
index 57b24e452..55fd54a5b 100644
--- a/Xext/xselinux_hooks.c
+++ b/Xext/xselinux_hooks.c
@@ -29,10 +29,11 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 #include <sys/socket.h>
 #include <stdio.h>
 #include <stdarg.h>
-
 #include <libaudit.h>
-
 #include <X11/Xatom.h>
+
+#include "dix/registry_priv.h"
+
 #include "selection.h"
 #include "inputstr.h"
 #include "scrnintstr.h"
diff --git a/Xext/xselinux_label.c b/Xext/xselinux_label.c
index 48414d88a..b71d08266 100644
--- a/Xext/xselinux_label.c
+++ b/Xext/xselinux_label.c
@@ -23,6 +23,8 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 
 #include <selinux/label.h>
 
+#include "dix/registry_priv.h"
+
 #include "registry.h"
 #include "xselinuxint.h"
 
diff --git a/dix/registry_priv.h b/dix/registry_priv.h
index 17f05b88d..ac575e142 100644
--- a/dix/registry_priv.h
+++ b/dix/registry_priv.h
@@ -5,6 +5,8 @@
 #ifndef _XSERVER_DIX_REGISTRY_H
 #define _XSERVER_DIX_REGISTRY_H
 
+#include "include/resource.h"
+
 /*
  * Setup and teardown
  */
@@ -12,4 +14,8 @@ void dixResetRegistry(void);
 void dixFreeRegistry(void);
 void dixCloseRegistry(void);
 
+/* Functions used by the X-Resource extension */
+void RegisterResourceName(RESTYPE type, const char *name);
+const char *LookupResourceName(RESTYPE rtype);
+
 #endif /* _XSERVER_DIX_REGISTRY_H */
diff --git a/dix/resource.c b/dix/resource.c
index 53c4fcfba..0cff04758 100644
--- a/dix/resource.c
+++ b/dix/resource.c
@@ -122,6 +122,9 @@ Equipment Corporation.
 #endif
 
 #include <X11/X.h>
+
+#include "dix/registry_priv.h"
+
 #include "misc.h"
 #include "os.h"
 #include "resource.h"
diff --git a/include/registry.h b/include/registry.h
index ba447b6a2..aaf49d850 100644
--- a/include/registry.h
+++ b/include/registry.h
@@ -20,14 +20,6 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 #include "resource.h"
 #include "extnsionst.h"
 
-/* Internal string registry - for auditing, debugging, security, etc. */
-
-#ifdef X_REGISTRY_RESOURCE
-/* Functions used by the X-Resource extension */
-extern _X_EXPORT void RegisterResourceName(RESTYPE type, const char *name);
-extern _X_EXPORT const char *LookupResourceName(RESTYPE rtype);
-#endif
-
 #ifdef X_REGISTRY_REQUEST
 extern _X_EXPORT void RegisterExtensionNames(ExtensionEntry * ext);