diff --git a/Xext/xselinux_label.c b/Xext/xselinux_label.c
index d7d7fcec93..782b8abedf 100644
--- a/Xext/xselinux_label.c
+++ b/Xext/xselinux_label.c
@@ -22,6 +22,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 #include <selinux/label.h>
 
 #include "dix/registry_priv.h"
+#include "dix/resource_priv.h"
 
 #include "xselinuxint.h"
 
diff --git a/dix/privates.c b/dix/privates.c
index ebcb964297..860c56e02f 100644
--- a/dix/privates.c
+++ b/dix/privates.c
@@ -53,10 +53,10 @@ from The Open Group.
 #include <stddef.h>
 
 #include "dix/colormap_priv.h"
+#include "dix/resource_priv.h"
 #include "dix/screenint_priv.h"
 
 #include "windowstr.h"
-#include "resource.h"
 #include "privates.h"
 #include "gcstruct.h"
 #include "cursorstr.h"
diff --git a/dix/registry.c b/dix/registry.c
index cfe851eed5..93cc11eeba 100644
--- a/dix/registry.c
+++ b/dix/registry.c
@@ -25,8 +25,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 #include <X11/Xproto.h>
 
 #include "dix/registry_priv.h"
-
-#include "resource.h"
+#include "dix/resource_priv.h"
 
 #define BASE_SIZE 16
 
diff --git a/dix/resource_priv.h b/dix/resource_priv.h
index 7a2af5c82d..6ff7f9d25f 100644
--- a/dix/resource_priv.h
+++ b/dix/resource_priv.h
@@ -11,6 +11,9 @@
 #include "include/dix.h"
 #include "include/resource.h"
 
+extern RESTYPE lastResourceType;
+extern RESTYPE TypeMask;
+
 #define SameClient(obj,client) \
         (CLIENT_BITS((obj)->resource) == (client)->clientAsMask)
 
diff --git a/include/resource.h b/include/resource.h
index 0a5922791f..e7567f7dd5 100644
--- a/include/resource.h
+++ b/include/resource.h
@@ -229,9 +229,6 @@ extern _X_EXPORT int dixLookupResourceByClass(void **result,
                                               ClientPtr client,
                                               Mask access_mode);
 
-extern _X_EXPORT RESTYPE lastResourceType;
-extern _X_EXPORT RESTYPE TypeMask;
-
 /*
  * @brief allocate a XID (resource ID) for the server itself
  *