diff --git a/hw/xfree86/common/xf86.h b/hw/xfree86/common/xf86.h
index 8d0cb0532..729cb22a7 100644
--- a/hw/xfree86/common/xf86.h
+++ b/hw/xfree86/common/xf86.h
@@ -41,6 +41,8 @@
 #include <dix-config.h>
 #endif
 
+#include <X11/Xfuncproto.h>
+
 #include "xf86str.h"
 #include "xf86Opt.h"
 #include <X11/Xfuncproto.h>
diff --git a/pseudoramiX/pseudoramiX.c b/pseudoramiX/pseudoramiX.c
index 230a7eef3..a57bfa1c7 100644
--- a/pseudoramiX/pseudoramiX.c
+++ b/pseudoramiX/pseudoramiX.c
@@ -38,6 +38,8 @@
 #endif
 
 #include <X11/Xfuncproto.h>
+#include <X11/Xmd.h>
+#include <X11/extensions/panoramiXproto.h>
 
 #include "miext/extinit_priv.h"
 
@@ -46,7 +48,6 @@
 #include "nonsdk_extinit.h"
 #include "dixstruct.h"
 #include "window.h"
-#include <X11/extensions/panoramiXproto.h>
 #include "globals.h"
 
 #define TRACE PseudoramiXTrace("TRACE " __FILE__ ":%s",__FUNCTION__)