diff --git a/dix/dixgrabs_priv.h b/dix/dixgrabs_priv.h
index 1d23cabac..aa9b6ef20 100644
--- a/dix/dixgrabs_priv.h
+++ b/dix/dixgrabs_priv.h
@@ -39,4 +39,8 @@ Bool GrabIsGestureGrab(GrabPtr grab);
 
 int DeletePassiveGrab(void *value, XID id);
 
+Bool GrabMatchesSecond(GrabPtr pFirstGrab,
+                       GrabPtr pSecondGrab,
+                       Bool ignoreDevice);
+
 #endif /* _XSERVER_DIXGRABS_PRIV_H */
diff --git a/dix/resource.c b/dix/resource.c
index e94df6829..8e8768180 100644
--- a/dix/resource.c
+++ b/dix/resource.c
@@ -136,7 +136,6 @@ Equipment Corporation.
 #include "dixfont.h"
 #include "colormap.h"
 #include "inputstr.h"
-#include "dixgrabs.h"
 #include "cursor.h"
 #ifdef PANORAMIX
 #include "panoramiX.h"
diff --git a/include/dixgrabs.h b/include/dixgrabs.h
index 068fcc86c..edfb934ba 100644
--- a/include/dixgrabs.h
+++ b/include/dixgrabs.h
@@ -28,10 +28,6 @@ OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 
 struct _GrabParameters;
 
-extern _X_EXPORT Bool GrabMatchesSecond(GrabPtr /* pFirstGrab */ ,
-                                        GrabPtr /* pSecondGrab */ ,
-                                        Bool /*ignoreDevice */ );
-
 extern _X_EXPORT int AddPassiveGrabToList(ClientPtr /* client */ ,
                                           GrabPtr /* pGrab */ );
 
diff --git a/test/input.c b/test/input.c
index 6e5e83b5a..67ef4fb77 100644
--- a/test/input.c
+++ b/test/input.c
@@ -34,6 +34,7 @@
 
 #include "dix/dix_priv.h"
 #include "dix/eventconvert.h"
+#include "dix/dixgrabs_priv.h"
 #include "dix/exevents_priv.h"
 #include "dix/input_priv.h"
 
@@ -42,7 +43,6 @@
 #include "windowstr.h"
 #include "inputstr.h"
 #include "exglobals.h"
-#include "dixgrabs.h"
 #include "eventstr.h"
 #include "inpututils.h"
 #include "mi.h"