diff --git a/hw/xnest/Keyboard.c b/hw/xnest/Keyboard.c
index 16e9fdc7e..cedaa7a25 100644
--- a/hw/xnest/Keyboard.c
+++ b/hw/xnest/Keyboard.c
@@ -59,29 +59,6 @@ extern	Status	XkbGetControls(
 	unsigned long		/* which */,
 	XkbDescPtr		/* desc */
 );
-
-#ifndef XKB_BASE_DIRECTORY
-#define	XKB_BASE_DIRECTORY	"/usr/X11R6/lib/X11/xkb/"
-#endif
-#ifndef XKB_CONFIG_FILE
-#define	XKB_CONFIG_FILE		"X0-config.keyboard"
-#endif
-#ifndef XKB_DFLT_RULES_FILE
-#define	XKB_DFLT_RULES_FILE	XKB_DFLT_RULES
-#endif
-#ifndef XKB_DFLT_KB_LAYOUT
-#define	XKB_DFLT_KB_LAYOUT	"us"
-#endif
-#ifndef XKB_DFLT_KB_MODEL
-#define	XKB_DFLT_KB_MODEL	"pc101"
-#endif
-#ifndef XKB_DFLT_KB_VARIANT
-#define	XKB_DFLT_KB_VARIANT	NULL
-#endif
-#ifndef XKB_DFLT_KB_OPTIONS
-#define	XKB_DFLT_KB_OPTIONS	NULL
-#endif
-
 #endif
 
 DeviceIntPtr xnestKeyboardDevice = NULL;
@@ -222,11 +199,11 @@ XkbError:
 	XkbGetControls(xnestDisplay, XkbAllControlsMask, xkb);
 
 	memset(&names, 0, sizeof(XkbComponentNamesRec));
-	rules = XKB_DFLT_RULES_FILE;
-	model = XKB_DFLT_KB_MODEL;
-	layout = XKB_DFLT_KB_LAYOUT;
-	variants = XKB_DFLT_KB_VARIANT;
-	options = XKB_DFLT_KB_OPTIONS;
+	rules = XKB_DFLT_RULES;
+	model = XKB_DFLT_MODEL;
+	layout = XKB_DFLT_LAYOUT;
+	variants = XKB_DFLT_VARIANT;
+	options = XKB_DFLT_OPTIONS;
 
 	XkbSetRulesDflts(rules, model, layout, variants, options);
 	XkbInitKeyboardDeviceStruct(pDev, &names, &keySyms, modmap,
diff --git a/include/xorg-server.h.in b/include/xorg-server.h.in
index 4cf1bbf0e..57b8a82a2 100644
--- a/include/xorg-server.h.in
+++ b/include/xorg-server.h.in
@@ -106,7 +106,10 @@
 /* Enable XKB per default */
 #undef XKB_DFLT_DISABLED
 
-/* Build XKB server */
+/* XKB default rules */
+#undef XKB_DFLT_RULES
+
+/* Build XKB support in server */
 #undef XKB_IN_SERVER
 
 /* Support loadable input and output drivers */
@@ -160,9 +163,6 @@
 /* Location of configuration file */
 #undef __XCONFIGFILE__
 
-/* XKB default rules */
-#undef __XKBDEFRULES__
-
 /* Name of X server */
 #undef __XSERVERNAME__