diff --git a/src/emuMB.c b/src/emuMB.c
index cf122af..cffa26c 100644
--- a/src/emuMB.c
+++ b/src/emuMB.c
@@ -326,7 +326,7 @@ EvdevMBEmuOn(InputInfoPtr pInfo)
 
     RegisterBlockAndWakeupHandlers (EvdevMBEmuBlockHandler,
                                     EvdevMBEmuWakeupHandler,
-                                    (pointer)pInfo);
+                                    (void*)pInfo);
 }
 
 void
@@ -337,7 +337,7 @@ EvdevMBEmuFinalize(InputInfoPtr pInfo)
 
     RemoveBlockAndWakeupHandlers (EvdevMBEmuBlockHandler,
                                   EvdevMBEmuWakeupHandler,
-                                  (pointer)pInfo);
+                                  (void*)pInfo);
 
 }
 
diff --git a/src/emuThird.c b/src/emuThird.c
index 409a84a..39385b4 100644
--- a/src/emuThird.c
+++ b/src/emuThird.c
@@ -81,7 +81,7 @@ Evdev3BEmuPostButtonEvent(InputInfoPtr pInfo, int button, enum ButtonAction act)
  * @param arg The InputInfoPtr for this device.
  */
 CARD32
-Evdev3BEmuTimer(OsTimerPtr timer, CARD32 time, pointer arg)
+Evdev3BEmuTimer(OsTimerPtr timer, CARD32 time, void *arg)
 {
     InputInfoPtr      pInfo    = (InputInfoPtr)arg;
     EvdevPtr          pEvdev   = pInfo->private;
diff --git a/src/evdev.c b/src/evdev.c
index a26ff57..c227afe 100644
--- a/src/evdev.c
+++ b/src/evdev.c
@@ -2693,16 +2693,9 @@ _X_EXPORT InputDriverRec EVDEV = {
 #endif
 };
 
-static void
-EvdevUnplug(pointer	p)
-{
-}
+static void EvdevUnplug(void *p) { }
 
-static pointer
-EvdevPlug(pointer	module,
-          pointer	options,
-          int		*errmaj,
-          int		*errmin)
+static void *EvdevPlug(void *module, void *options, int *errmaj, int *errmin)
 {
     xf86AddInputDriver(&EVDEV, module, 0);
     return module;
diff --git a/src/evdev.h b/src/evdev.h
index 3fa1661..19c9af9 100644
--- a/src/evdev.h
+++ b/src/evdev.h
@@ -269,7 +269,7 @@ void EvdevMBEmuOn(InputInfoPtr);
 void EvdevMBEmuFinalize(InputInfoPtr);
 
 /* Third button emulation */
-CARD32 Evdev3BEmuTimer(OsTimerPtr timer, CARD32 time, pointer arg);
+CARD32 Evdev3BEmuTimer(OsTimerPtr timer, CARD32 time, void *arg);
 BOOL Evdev3BEmuFilterEvent(InputInfoPtr, int, BOOL);
 void Evdev3BEmuPreInit(InputInfoPtr pInfo);
 void Evdev3BEmuOn(InputInfoPtr);