diff --git a/dix/dixgrabs_priv.h b/dix/dixgrabs_priv.h
index 4735473f0..1d23cabac 100644
--- a/dix/dixgrabs_priv.h
+++ b/dix/dixgrabs_priv.h
@@ -37,4 +37,6 @@ Bool GrabIsPointerGrab(GrabPtr grab);
 Bool GrabIsKeyboardGrab(GrabPtr grab);
 Bool GrabIsGestureGrab(GrabPtr grab);
 
+int DeletePassiveGrab(void *value, XID id);
+
 #endif /* _XSERVER_DIXGRABS_PRIV_H */
diff --git a/dix/resource.c b/dix/resource.c
index 3778044bd..e94df6829 100644
--- a/dix/resource.c
+++ b/dix/resource.c
@@ -122,6 +122,7 @@ Equipment Corporation.
 #include <X11/X.h>
 
 #include "dix/colormap_priv.h"
+#include "dix/dixgrabs_priv.h"
 #include "dix/gc_priv.h"
 #include "dix/registry_priv.h"
 #include "os/osdep.h"
@@ -135,7 +136,6 @@ Equipment Corporation.
 #include "dixfont.h"
 #include "colormap.h"
 #include "inputstr.h"
-#include "dixevents.h"
 #include "dixgrabs.h"
 #include "cursor.h"
 #ifdef PANORAMIX
diff --git a/include/dixgrabs.h b/include/dixgrabs.h
index 28195c7a0..068fcc86c 100644
--- a/include/dixgrabs.h
+++ b/include/dixgrabs.h
@@ -28,9 +28,6 @@ OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 
 struct _GrabParameters;
 
-extern _X_EXPORT int DeletePassiveGrab(void *value,
-                                       XID id);
-
 extern _X_EXPORT Bool GrabMatchesSecond(GrabPtr /* pFirstGrab */ ,
                                         GrabPtr /* pSecondGrab */ ,
                                         Bool /*ignoreDevice */ );