diff --git a/hw/xfree86/common/xf86Xinput.h b/hw/xfree86/common/xf86Xinput.h
index 218774882..d2faaf07b 100644
--- a/hw/xfree86/common/xf86Xinput.h
+++ b/hw/xfree86/common/xf86Xinput.h
@@ -181,9 +181,6 @@ extern _X_EXPORT void
 xf86IDrvMsg(InputInfoPtr dev, MessageType type, const char *format, ...)
 _X_ATTRIBUTE_PRINTF(3, 4);
 
-extern _X_EXPORT void xf86RemoveInputEventDrainCallback(CallbackProcPtr callback,
-                                                        void *param);
-
 /* xf86Option.c */
 extern _X_EXPORT void
 xf86CollectInputOptions(InputInfoPtr pInfo, const char **defaultOpts);
diff --git a/hw/xfree86/common/xf86Xinput_priv.h b/hw/xfree86/common/xf86Xinput_priv.h
index bf41f74a6..d90b0736c 100644
--- a/hw/xfree86/common/xf86Xinput_priv.h
+++ b/hw/xfree86/common/xf86Xinput_priv.h
@@ -23,4 +23,6 @@ InputInfoPtr xf86LookupInput(const char *name);
 
 void xf86AddInputEventDrainCallback(CallbackProcPtr callback, void *param);
 
+void xf86RemoveInputEventDrainCallback(CallbackProcPtr callback, void *param);
+
 #endif /* _XSERVER__XF86XINPUT_H */