diff --git a/record/record.c b/record/record.c
index bc6ba3cda..f33ae6cbe 100644
--- a/record/record.c
+++ b/record/record.c
@@ -39,12 +39,14 @@ and Jim Haggerty of Metheus.
 #include <X11/Xmd.h>
 #include <X11/extensions/recordproto.h>
 
-#include "dix/dix_priv.h"
 #include "dix/cursor_priv.h"
+#include "dix/dix_priv.h"
 #include "dix/eventconvert.h"
 #include "dix/input_priv.h"
 #include "dix/resource_priv.h"
 #include "os/client_priv.h"
+#include "Xext/panoramiX.h"
+#include "Xext/panoramiXsrv.h"
 
 #include "dixstruct.h"
 #include "extnsionst.h"
@@ -53,13 +55,8 @@ and Jim Haggerty of Metheus.
 #include "swaprep.h"
 #include "inputstr.h"
 #include "scrnintstr.h"
-
-#ifdef XINERAMA
 #include "globals.h"
-#include "panoramiX.h"
-#include "panoramiXsrv.h"
 #include "cursor.h"
-#endif /* XINERAMA */
 
 #include "protocol-versions.h"