diff --git a/include/os.h b/include/os.h
index 8a6fd0516..29c849b11 100644
--- a/include/os.h
+++ b/include/os.h
@@ -184,10 +184,6 @@ typedef CARD32 (*OsTimerCallback) (OsTimerPtr timer,
                                    CARD32 time,
                                    void *arg);
 
-extern _X_EXPORT void TimerInit(void);
-
-extern _X_EXPORT Bool TimerForce(OsTimerPtr /* timer */ );
-
 #define TimerAbsolute (1<<0)
 #define TimerForceOld (1<<1)
 
diff --git a/os/log.c b/os/log.c
index e15823046..ab7c252a4 100644
--- a/os/log.c
+++ b/os/log.c
@@ -89,6 +89,7 @@ OR PERFORMANCE OF THIS SOFTWARE.
 
 #include "input.h"
 #include "opaque.h"
+#include "osdep.h"
 
 #ifdef WIN32
 #include <process.h>
diff --git a/os/osdep.h b/os/osdep.h
index 85fc7f9a1..f5ad07705 100644
--- a/os/osdep.h
+++ b/os/osdep.h
@@ -129,4 +129,8 @@ extern Bool ComputeLocalClient(ClientPtr client);
 /* in auth.c */
 extern void GenerateRandomData(int len, char *buf);
 
+/* OsTimer functions */
+void TimerInit(void);
+Bool TimerForce(OsTimerPtr timer);
+
 #endif                          /* _OSDEP_H_ */