diff --git a/hw/dmx/config/dmxconfig.c b/hw/dmx/config/dmxconfig.c
index 225d89277..a31e5f7f7 100644
--- a/hw/dmx/config/dmxconfig.c
+++ b/hw/dmx/config/dmxconfig.c
@@ -490,9 +490,8 @@ void dmxConfigSetMaxScreens(void)
      return (char *)(dmx##glob ? dmx##glob : def);                            \
  }
 
-GEN(rules,   XkbRules,   DMX_DEFAULT_XKB_RULES)
-GEN(model,   XkbModel,   DMX_DEFAULT_XKB_MODEL)
-GEN(layout,  XkbLayout,  DMX_DEFAULT_XKB_LAYOUT)
-GEN(variant, XkbVariant, DMX_DEFAULT_XKB_VARIANT)
-GEN(options, XkbOptions, DMX_DEFAULT_XKB_OPTIONS)
-    
+GEN(rules,   XkbRules,   XKB_DFLT_RULES)
+GEN(model,   XkbModel,   XKB_DFLT_MODEL)
+GEN(layout,  XkbLayout,  XKB_DFLT_LAYOUT)
+GEN(variant, XkbVariant, XKB_DFLT_VARIANT)
+GEN(options, XkbOptions, XKB_DFLT_OPTIONS)
diff --git a/hw/dmx/config/dmxconfig.h b/hw/dmx/config/dmxconfig.h
index 477db4a63..91a6662e3 100644
--- a/hw/dmx/config/dmxconfig.h
+++ b/hw/dmx/config/dmxconfig.h
@@ -36,11 +36,8 @@
 
 #ifndef _DMXCONFIG_H_
 #define _DMXCONFIG_H_
-#define DMX_DEFAULT_XKB_RULES  "base"
-#define DMX_DEFAULT_XKB_MODEL  "pc101"
-#define DMX_DEFAULT_XKB_LAYOUT "us"
-#define DMX_DEFAULT_XKB_VARIANT NULL
-#define DMX_DEFAULT_XKB_OPTIONS NULL
+
+#include <xkb-config.h>
 
 extern void dmxConfigStoreDisplay(const char *display);
 extern void dmxConfigStoreInput(const char *input); /* Core devices */
diff --git a/hw/kdrive/src/kinput.c b/hw/kdrive/src/kinput.c
index fb8ebd076..65fc75a54 100644
--- a/hw/kdrive/src/kinput.c
+++ b/hw/kdrive/src/kinput.c
@@ -898,11 +898,11 @@ KdNewKeyboard (void)
     ki->bellDuration = 200;
     ki->next = NULL;
     ki->options = NULL;
-    ki->xkbRules = strdup("base");
-    ki->xkbModel = strdup("pc105");
-    ki->xkbLayout = strdup("us");
-    ki->xkbVariant = NULL;
-    ki->xkbOptions = NULL;
+    ki->xkbRules = strdup(XKB_DFLT_RULES);
+    ki->xkbModel = strdup(XKB_DFLT_MODEL);
+    ki->xkbLayout = strdup(XKB_DFLT_LAYOUT);
+    ki->xkbVariant = strdup(XKB_DFLT_VARIANT);
+    ki->xkbOptions = strdup(XKB_DFLT_OPTIONS);
 
     return ki;
 }