diff --git a/hw/dmx/config/xdmxconfig.c b/hw/dmx/config/xdmxconfig.c
index 1ba59b67e..9a350a826 100644
--- a/hw/dmx/config/xdmxconfig.c
+++ b/hw/dmx/config/xdmxconfig.c
@@ -32,6 +32,10 @@
  *
  */
 
+#ifdef HAVE_DMX_CONFIG_H
+#include <dmx-config.h>
+#endif
+                                                                                
 #include <stdio.h>
 #include <stdlib.h>
 #include <X11/Intrinsic.h>
diff --git a/hw/dmx/examples/dmxaddinput.c b/hw/dmx/examples/dmxaddinput.c
index d4ec963a0..c391385e9 100644
--- a/hw/dmx/examples/dmxaddinput.c
+++ b/hw/dmx/examples/dmxaddinput.c
@@ -35,7 +35,7 @@
 #include <stdio.h>
 #include <stdlib.h>
 #include <X11/Xlib.h>
-#include "dmxext.h"
+#include <X11/extensions/dmxext.h>
 
 int main(int argc, char **argv)
 {
diff --git a/hw/dmx/examples/dmxaddscreen.c b/hw/dmx/examples/dmxaddscreen.c
index a1118f437..5fa008c21 100644
--- a/hw/dmx/examples/dmxaddscreen.c
+++ b/hw/dmx/examples/dmxaddscreen.c
@@ -36,7 +36,7 @@
 #include <stdio.h>
 #include <stdlib.h>
 #include <X11/Xlib.h>
-#include "dmxext.h"
+#include <X11/extensions/dmxext.h>
 
 int main(int argc, char **argv)
 {
diff --git a/hw/dmx/examples/dmxreconfig.c b/hw/dmx/examples/dmxreconfig.c
index a334fb3cf..efcead86e 100644
--- a/hw/dmx/examples/dmxreconfig.c
+++ b/hw/dmx/examples/dmxreconfig.c
@@ -35,7 +35,7 @@
 #include <stdio.h>
 #include <stdlib.h>
 #include <X11/Xlib.h>
-#include "dmxext.h"
+#include <X11/extensions/dmxext.h>
 
 int main(int argc, char **argv)
 {
diff --git a/hw/dmx/examples/dmxresize.c b/hw/dmx/examples/dmxresize.c
index 3801658a6..f6fadf70c 100644
--- a/hw/dmx/examples/dmxresize.c
+++ b/hw/dmx/examples/dmxresize.c
@@ -35,7 +35,7 @@
 #include <stdio.h>
 #include <stdlib.h>
 #include <X11/Xlib.h>
-#include "dmxext.h"
+#include <X11/extensions/dmxext.h>
 
 int main(int argc, char **argv)
 {
diff --git a/hw/dmx/examples/dmxrminput.c b/hw/dmx/examples/dmxrminput.c
index 932a5d321..3860cc9c6 100644
--- a/hw/dmx/examples/dmxrminput.c
+++ b/hw/dmx/examples/dmxrminput.c
@@ -35,7 +35,7 @@
 #include <stdio.h>
 #include <stdlib.h>
 #include <X11/Xlib.h>
-#include "dmxext.h"
+#include <X11/extensions/dmxext.h>
 
 int main(int argc, char **argv)
 {
diff --git a/hw/dmx/examples/dmxrmscreen.c b/hw/dmx/examples/dmxrmscreen.c
index 1b60b1088..ab3653d24 100644
--- a/hw/dmx/examples/dmxrmscreen.c
+++ b/hw/dmx/examples/dmxrmscreen.c
@@ -36,7 +36,7 @@
 #include <stdio.h>
 #include <stdlib.h>
 #include <X11/Xlib.h>
-#include "dmxext.h"
+#include <X11/extensions/dmxext.h>
 
 int main(int argc, char **argv)
 {
diff --git a/hw/dmx/examples/dmxwininfo.c b/hw/dmx/examples/dmxwininfo.c
index 201420574..bbf7f7446 100644
--- a/hw/dmx/examples/dmxwininfo.c
+++ b/hw/dmx/examples/dmxwininfo.c
@@ -41,7 +41,7 @@
 #include <X11/Xlib.h>
 #include <X11/Xutil.h>
 #include <X11/Xmu/SysUtil.h>
-#include "dmxext.h"
+#include <X11/extensions/dmxext.h>
 
 static const char *FontName = "fixed";
 
diff --git a/hw/dmx/examples/xdmx.c b/hw/dmx/examples/xdmx.c
index 540465a79..3fec7dd3d 100644
--- a/hw/dmx/examples/xdmx.c
+++ b/hw/dmx/examples/xdmx.c
@@ -35,7 +35,7 @@
 #include <stdio.h>
 #include <stdlib.h>
 #include <X11/Xlib.h>
-#include "dmxext.h"
+#include <X11/extensions/dmxext.h>
 
 static void indent(int level)
 {
diff --git a/hw/dmx/examples/xinput.c b/hw/dmx/examples/xinput.c
index c1787f18c..c2b9bc0f4 100644
--- a/hw/dmx/examples/xinput.c
+++ b/hw/dmx/examples/xinput.c
@@ -40,7 +40,7 @@
 #include <X11/extensions/XInput.h>
 #include <X11/extensions/XKB.h>
 #include <X11/extensions/XKBstr.h>
-#include "dmxext.h"
+#include <X11/extensions/dmxext.h>
 #include <sys/time.h>
 
 static const char *core(DMXInputAttributes *iinf)