diff --git a/hw/xfree86/common/xf86.h b/hw/xfree86/common/xf86.h
index 44147bbba..5f8e8561c 100644
--- a/hw/xfree86/common/xf86.h
+++ b/hw/xfree86/common/xf86.h
@@ -178,7 +178,6 @@ extern _X_EXPORT void SetTimeSinceLastInputEvent(void);
 extern _X_EXPORT void *xf86AddGeneralHandler(int fd, InputHandlerProc proc,
                                                void *data);
 extern _X_EXPORT int xf86RemoveGeneralHandler(void *handler);
-extern _X_EXPORT void xf86DisableGeneralHandler(void *handler);
 extern _X_EXPORT void xf86EnableGeneralHandler(void *handler);
 extern _X_EXPORT InputHandlerProc xf86SetConsoleHandler(InputHandlerProc
                                                         handler, void *data);
diff --git a/hw/xfree86/common/xf86Events.c b/hw/xfree86/common/xf86Events.c
index c60d5c180..e8d4e4e19 100644
--- a/hw/xfree86/common/xf86Events.c
+++ b/hw/xfree86/common/xf86Events.c
@@ -343,6 +343,7 @@ xf86UpdateHasVTProperty(Bool hasVT)
 
 static void xf86DisableInputHandler(void *handler);
 static void xf86EnableInputHandler(void *handler);
+static void xf86DisableGeneralHandler(void *handler);
 
 void
 xf86VTLeave(void)
@@ -637,8 +638,7 @@ static void xf86DisableInputHandler(void *handler)
         RemoveNotifyFd(ih->fd);
 }
 
-void
-xf86DisableGeneralHandler(void *handler)
+static void xf86DisableGeneralHandler(void *handler)
 {
     IHPtr ih;