diff --git a/Xext/panoramiX.c b/Xext/panoramiX.c
index f144768895..f2a5c5d0ec 100644
--- a/Xext/panoramiX.c
+++ b/Xext/panoramiX.c
@@ -111,8 +111,8 @@ static DevPrivateKeyRec PanoramiXGCKeyRec;
 static DevPrivateKeyRec PanoramiXScreenKeyRec;
 
 typedef struct {
-    DDXPointRec clipOrg;
-    DDXPointRec patOrg;
+    xPoint clipOrg;
+    xPoint patOrg;
     const GCFuncs *wrapFuncs;
 } PanoramiXGCRec, *PanoramiXGCPtr;
 
diff --git a/Xext/panoramiXprocs.c b/Xext/panoramiXprocs.c
index baaad6a096..3fc2ad54ad 100644
--- a/Xext/panoramiXprocs.c
+++ b/Xext/panoramiXprocs.c
@@ -1764,15 +1764,15 @@ PanoramiXFillPoly(ClientPtr client)
 
     count = bytes_to_int32((client->req_len << 2) - sizeof(xFillPolyReq));
     if (count > 0) {
-        DDXPointPtr locPts = calloc(count, sizeof(DDXPointRec));
+        DDXPointPtr locPts = calloc(count, sizeof(xPoint));
         if (!locPts)
             return BadAlloc;
         memcpy((char *) locPts, (char *) &stuff[1],
-               count * sizeof(DDXPointRec));
+               count * sizeof(xPoint));
 
         XINERAMA_FOR_EACH_SCREEN_FORWARD({
             if (walkScreenIdx) /* skip screen #0 */
-                memcpy(&stuff[1], locPts, count * sizeof(DDXPointRec));
+                memcpy(&stuff[1], locPts, count * sizeof(xPoint));
 
             if (isRoot) {
                 int x_off = walkScreen->x;