diff --git a/hw/kdrive/src/kdrive.h b/hw/kdrive/src/kdrive.h
index aa14eaf25..de938ef5d 100644
--- a/hw/kdrive/src/kdrive.h
+++ b/hw/kdrive/src/kdrive.h
@@ -343,6 +343,8 @@ extern Bool kdEnabled;
 extern Bool kdSwitchPending;
 extern Bool kdEmulateMiddleButton;
 extern Bool kdDisableZaphod;
+extern Bool kdAllowZap;
+extern int kdVirtualTerminal;
 extern char *kdSwitchCmd;
 
 /*
@@ -352,9 +354,6 @@ extern char *kdSwitchCmd;
  */
 extern const KdOsFuncs *kdOsFuncs;
 
-extern Bool kdAllowZap;
-extern int kdVirtualTerminal;
-
 #define KdGetScreenPriv(pScreen) ((KdPrivScreenPtr) \
     dixLookupPrivate(&(pScreen)->devPrivates, kdScreenPrivateKey))
 #define KdSetScreenPriv(pScreen,v) \
@@ -538,7 +537,6 @@ const KdMonitorTiming *KdFindMode(KdScreenInfo * screen,
                                                      const KdMonitorTiming *));
 
 Bool
-
 KdTuneMode(KdScreenInfo * screen,
            Bool (*usable) (KdScreenInfo *),
            Bool (*supported) (KdScreenInfo *, const KdMonitorTiming *));
diff --git a/hw/kdrive/src/kinput.c b/hw/kdrive/src/kinput.c
index 708058780..3eee596b7 100644
--- a/hw/kdrive/src/kinput.c
+++ b/hw/kdrive/src/kinput.c
@@ -153,8 +153,6 @@ void KdAssertSigioBlocked(char *where)
 #define KdAssertSigioBlocked(s)
 
 #endif
-
-static int kdnFds;
 #endif
 
 #ifdef FNONBLOCK