diff --git a/miext/rootless/safeAlpha/safeAlphaWindow.c b/miext/rootless/safeAlpha/safeAlphaWindow.c
index 381380e50..252124f3f 100644
--- a/miext/rootless/safeAlpha/safeAlphaWindow.c
+++ b/miext/rootless/safeAlpha/safeAlphaWindow.c
@@ -1,4 +1,4 @@
-/* $XdotOrg: xc/programs/Xserver/miext/rootless/safeAlpha/safeAlphaWindow.c,v 1.1.4.1 2003/12/18 19:29:15 kaleb Exp $ */
+/* $XdotOrg: xc/programs/Xserver/miext/rootless/safeAlpha/safeAlphaWindow.c,v 1.1.4.2 2004/02/23 21:37:25 kaleb Exp $ */
 /*
  * Specialized window functions to protect the alpha channel
  */
@@ -39,8 +39,8 @@
 #include "rootlessCommon.h"
 
 #ifdef XINERAMA
-#include "xinerama.h"
-#include "xineramaSrv.h"
+#include "panoramiX.h"
+#include "panoramiXsrv.h"
 #endif
 
 /*
@@ -70,13 +70,13 @@ SafeAlphaFillRegionTiled(
     FbBits      planeMask;
 
 #ifdef XINERAMA
-    if(!noXineramaExtension)
+    if(!noPanoramiXExtension)
     {
         int index = pDrawable->pScreen->myNum;
         if(&WindowTable[index]->drawable == pDrawable)
         {
-            xRot -= xineramaDataPtr[index].x;
-            yRot -= xineramaDataPtr[index].y;
+            xRot -= panoramiXdataPtr[index].x;
+            yRot -= panoramiXdataPtr[index].y;
         }
     }
 #endif