diff --git a/Xext/xtest.c b/Xext/xtest.c
index 703a19fff..59e12ea8a 100644
--- a/Xext/xtest.c
+++ b/Xext/xtest.c
@@ -33,6 +33,12 @@
 #include <X11/X.h>
 #include <X11/Xproto.h>
 #include <X11/Xatom.h>
+#include <X11/extensions/xtestproto.h>
+#include <X11/extensions/XI.h>
+#include <X11/extensions/XIproto.h>
+
+#include "os/osdep.h"
+
 #include "misc.h"
 #include "os.h"
 #include "dixstruct.h"
@@ -45,9 +51,6 @@
 #include "mi.h"
 #include "xkbsrv.h"
 #include "xkbstr.h"
-#include <X11/extensions/xtestproto.h>
-#include <X11/extensions/XI.h>
-#include <X11/extensions/XIproto.h>
 #include "exglobals.h"
 #include "mipointer.h"
 #include "xserver-properties.h"
diff --git a/include/os.h b/include/os.h
index bbd9c8f22..782135bef 100644
--- a/include/os.h
+++ b/include/os.h
@@ -158,10 +158,6 @@ extern _X_EXPORT void IgnoreClient(ClientPtr /*client */ );
 
 extern _X_EXPORT void AttendClient(ClientPtr /*client */ );
 
-extern _X_EXPORT void MakeClientGrabImpervious(ClientPtr /*client */ );
-
-extern _X_EXPORT void MakeClientGrabPervious(ClientPtr /*client */ );
-
 extern _X_EXPORT void ListenOnOpenFD(int /* fd */ , int /* noxauth */ );
 
 extern _X_EXPORT Bool AddClientOnOpenFD(int /* fd */ );
diff --git a/os/osdep.h b/os/osdep.h
index ca6aa63b3..be3389b57 100644
--- a/os/osdep.h
+++ b/os/osdep.h
@@ -242,4 +242,7 @@ extern void (*OsVendorVErrorFProc) (const char *, va_list args)
     _X_ATTRIBUTE_PRINTF(1, 0);
 #endif
 
+void MakeClientGrabPervious(ClientPtr client);
+void MakeClientGrabImpervious(ClientPtr client);
+
 #endif                          /* _OSDEP_H_ */