diff --git a/hw/kdrive/ephyr/ephyr.c b/hw/kdrive/ephyr/ephyr.c
index 7958cf7fc..2ba0b4597 100644
--- a/hw/kdrive/ephyr/ephyr.c
+++ b/hw/kdrive/ephyr/ephyr.c
@@ -26,6 +26,7 @@
 #include <dix-config.h>
 
 #include <xcb/xcb_keysyms.h>
+#include <X11/Xdefs.h>
 #include <X11/keysym.h>
 
 #include "mi/mipointer_priv.h"
@@ -1316,7 +1317,7 @@ KdPointerDriver EphyrMouseDriver = {
 
 /* Keyboard */
 
-static Status
+static Bool
 EphyrKeyboardInit(KdKeyboardInfo * ki)
 {
     KeySymsRec keySyms;
@@ -1344,15 +1345,14 @@ EphyrKeyboardInit(KdKeyboardInfo * ki)
 
     ki->name = strdup("Xephyr virtual keyboard");
     ephyrKbd = ki;
-    return Success;
+    return TRUE;
 }
 
-static Status
+static Bool
 EphyrKeyboardEnable(KdKeyboardInfo * ki)
 {
     ((EphyrKbdPrivate *) ki->driverPrivate)->enabled = TRUE;
-
-    return Success;
+    return TRUE;
 }
 
 static void
diff --git a/hw/kdrive/src/kinput.c b/hw/kdrive/src/kinput.c
index fae933166..4d81bfd28 100644
--- a/hw/kdrive/src/kinput.c
+++ b/hw/kdrive/src/kinput.c
@@ -541,9 +541,8 @@ KdKeyboardProc(DeviceIntPtr pDevice, int onoff)
             return BadImplementation;
         }
 
-        if ((*ki->driver->Init) (ki) != Success) {
+        if (!(ki->driver->Init(ki)))
             return BadRequest;
-        }
 
         xiclass = AtomFromName(XI_KEYBOARD);
         AssignTypeAndName(pDevice, xiclass,
@@ -560,9 +559,8 @@ KdKeyboardProc(DeviceIntPtr pDevice, int onoff)
         if (!ki->driver->Enable)
             return BadImplementation;
 
-        if ((*ki->driver->Enable) (ki) != Success) {
+        if (!(ki->driver->Enable(ki)))
             return BadMatch;
-        }
 
         pDev->on = TRUE;
         return Success;