diff --git a/include/gcstruct.h b/include/gcstruct.h
index 48c2122b96..9e3c53d43d 100644
--- a/include/gcstruct.h
+++ b/include/gcstruct.h
@@ -271,8 +271,8 @@ typedef struct _GC {
      */
     PixUnion tile;
     PixmapPtr stipple;
-    DDXPointRec patOrg;         /* origin for (tile, stipple) */
-    DDXPointRec clipOrg;
+    xPoint patOrg;         /* origin for (tile, stipple) */
+    xPoint clipOrg;
     struct _Font *font;
     RegionPtr clientClip;
     unsigned int stateChanges; /* masked with GC_<kind> */
diff --git a/include/scrnintstr.h b/include/scrnintstr.h
index 3f5382f039..f4342b6595 100644
--- a/include/scrnintstr.h
+++ b/include/scrnintstr.h
@@ -168,7 +168,7 @@ typedef void (*PaintWindowProcPtr) (WindowPtr /*pWindow*/,
                                     int /*what*/);
 
 typedef void (*CopyWindowProcPtr) (WindowPtr /*pWindow */ ,
-                                   DDXPointRec /*ptOldOrg */ ,
+                                   xPoint /*ptOldOrg */ ,
                                    RegionPtr /*prgnSrc */ );
 
 typedef void (*ClearToBackgroundProcPtr) (WindowPtr /*pWindow */ ,
diff --git a/include/windowstr.h b/include/windowstr.h
index 2eb0dda292..3c68c88781 100644
--- a/include/windowstr.h
+++ b/include/windowstr.h
@@ -127,7 +127,7 @@ typedef struct _Window {
     union _Validate *valdata;
     RegionRec winSize;
     RegionRec borderSize;
-    DDXPointRec origin;         /* position relative to parent */
+    xPoint origin;         /* position relative to parent */
     unsigned short borderWidth;
     unsigned short deliverableEvents;   /* all masks from all clients */
     Mask eventMask;             /* mask from the creating client */