diff --git a/hw/kdrive/src/kdrive.c b/hw/kdrive/src/kdrive.c
index 65a8f73bd..92801c188 100644
--- a/hw/kdrive/src/kdrive.c
+++ b/hw/kdrive/src/kdrive.c
@@ -79,13 +79,18 @@ KdDepths kdDepths[] = {
 DevPrivateKeyRec kdScreenPrivateKeyRec;
 x_server_generation_t kdGeneration;
 
+Bool kdVideoTest;
+unsigned long kdVideoTestTime;
 Bool kdEmulateMiddleButton;
 Bool kdRawPointerCoordinates;
 Bool kdDisableZaphod;
+Bool kdAllowZap;
 Bool kdEnabled;
-static int kdSubpixelOrder;
+int kdSubpixelOrder;
+int kdVirtualTerminal = -1;
+Bool kdSwitchPending;
 char *kdSwitchCmd;
-static DDXPointRec kdOrigin;
+DDXPointRec kdOrigin;
 Bool kdHasPointer = FALSE;
 Bool kdHasKbd = FALSE;
 const char *kdGlobalXkbRules = NULL;
@@ -94,6 +99,7 @@ const char *kdGlobalXkbLayout = NULL;
 const char *kdGlobalXkbVariant = NULL;
 const char *kdGlobalXkbOptions = NULL;
 
+static Bool kdCaughtSignal = FALSE;
 
 /*
  * Carry arguments from InitOutput through driver initialization
@@ -183,8 +189,8 @@ ddxGiveUp(enum ExitCode error)
     KdDisableScreens();
 }
 
-static Bool kdDumbDriver;
-static Bool kdSoftCursor;
+Bool kdDumbDriver;
+Bool kdSoftCursor;
 
 const char *
 KdParseFindNext(const char *cur, const char *delim, char *save, char *last)
diff --git a/hw/kdrive/src/kdrive.h b/hw/kdrive/src/kdrive.h
index 53f40403c..2af6bf2d1 100644
--- a/hw/kdrive/src/kdrive.h
+++ b/hw/kdrive/src/kdrive.h
@@ -338,6 +338,7 @@ extern DevPrivateKeyRec kdScreenPrivateKeyRec;
 
 extern x_server_generation_t kdGeneration;
 extern Bool kdEnabled;
+extern Bool kdSwitchPending;
 extern Bool kdEmulateMiddleButton;
 extern Bool kdDisableZaphod;
 extern char *kdSwitchCmd;
@@ -349,6 +350,9 @@ 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) \