diff --git a/dix/resource_priv.h b/dix/resource_priv.h
index ab62f5747f..7a2af5c82d 100644
--- a/dix/resource_priv.h
+++ b/dix/resource_priv.h
@@ -7,6 +7,7 @@
 
 #include <X11/Xdefs.h>
 
+#include "include/callback.h"
 #include "include/dix.h"
 #include "include/resource.h"
 
@@ -156,4 +157,19 @@ void GetXIDRange(int client,
                  XID *minp,
                  XID *maxp);
 
+/* Resource state callback */
+extern CallbackListPtr ResourceStateCallback;
+
+typedef enum {
+    ResourceStateAdding,
+    ResourceStateFreeing
+} ResourceState;
+
+typedef struct {
+    ResourceState state;
+    XID id;
+    RESTYPE type;
+    void *value;
+} ResourceStateInfoRec;
+
 #endif /* _XSERVER_DIX_RESOURCE_PRIV_H */
diff --git a/include/resource.h b/include/resource.h
index 70ee2f575b..0a5922791f 100644
--- a/include/resource.h
+++ b/include/resource.h
@@ -46,6 +46,9 @@ SOFTWARE.
 
 #ifndef RESOURCE_H
 #define RESOURCE_H 1
+
+#include "callback.h"
+
 #include "misc.h"
 #include "dixaccess.h"
 
@@ -103,20 +106,6 @@ extern _X_EXPORT unsigned int ResourceClientBits(void);
 
 #define BAD_RESOURCE 0xe0000000
 
-/* Resource state callback */
-extern _X_EXPORT CallbackListPtr ResourceStateCallback;
-
-typedef enum { ResourceStateAdding,
-    ResourceStateFreeing
-} ResourceState;
-
-typedef struct {
-    ResourceState state;
-    XID id;
-    RESTYPE type;
-    void *value;
-} ResourceStateInfoRec;
-
 typedef int (*DeleteType) (void *value,
                            XID id);