diff --git a/hw/vfb/Makefile.am b/hw/vfb/Makefile.am
index ed46dbbc1..9f4992c8b 100644
--- a/hw/vfb/Makefile.am
+++ b/hw/vfb/Makefile.am
@@ -4,8 +4,6 @@ bin_PROGRAMS = Xvfb
 noinst_LIBRARIES = libfbcmap.a
 
 AM_CFLAGS = -DHAVE_DIX_CONFIG_H \
-            -DNO_HW_ONLY_EXTS \
-            -DNO_MODULE_EXTS \
             $(XVFBMODULES_CFLAGS) \
 	    $(DIX_CFLAGS)
 
diff --git a/hw/xnest/Makefile.am b/hw/xnest/Makefile.am
index c395b4dae..3c099cd6b 100644
--- a/hw/xnest/Makefile.am
+++ b/hw/xnest/Makefile.am
@@ -4,7 +4,6 @@ bin_PROGRAMS = Xnest
 noinst_LIBRARIES = libfbcmap.a
 
 AM_CFLAGS = -DHAVE_XNEST_CONFIG_H \
-            -DNO_HW_ONLY_EXTS \
             $(DIX_CFLAGS) \
             $(XNESTMODULES_CFLAGS)
 
diff --git a/mi/miinitext.c b/mi/miinitext.c
index a1438316b..a84d486e1 100644
--- a/mi/miinitext.c
+++ b/mi/miinitext.c
@@ -157,7 +157,7 @@ static ExtensionToggle ExtensionToggleList[] = {
 #ifdef XF86BIGFONT
     {"XFree86-Bigfont", &noXFree86BigfontExtension},
 #endif
-#ifndef NO_HW_ONLY_EXTS
+#ifdef XorgLoader
 #ifdef XFreeXDGA
     {"XFree86-DGA", &noXFree86DGAExtension},
 #endif