diff --git a/glamor/glamor_copy.c b/glamor/glamor_copy.c
index e4282a9fa8..204ea891ed 100644
--- a/glamor/glamor_copy.c
+++ b/glamor/glamor_copy.c
@@ -776,7 +776,7 @@ glamor_copy_plane(DrawablePtr src, DrawablePtr dst, GCPtr gc,
 }
 
 void
-glamor_copy_window(WindowPtr window, DDXPointRec old_origin, RegionPtr src_region)
+glamor_copy_window(WindowPtr window, xPoint old_origin, RegionPtr src_region)
 {
     PixmapPtr pixmap = glamor_get_drawable_pixmap(&window->drawable);
     DrawablePtr drawable = &pixmap->drawable;
diff --git a/glamor/glamor_lines.c b/glamor/glamor_lines.c
index 4177ba83b1..754729d9c5 100644
--- a/glamor/glamor_lines.c
+++ b/glamor/glamor_lines.c
@@ -74,16 +74,16 @@ glamor_poly_lines_solid_gl(DrawablePtr drawable, GCPtr gc,
     /* Set up the vertex buffers for the points */
 
     v = glamor_get_vbo_space(drawable->pScreen,
-                             (n + add_last) * sizeof (DDXPointRec),
+                             (n + add_last) * sizeof(xPoint),
                              &vbo_offset);
 
     glEnableVertexAttribArray(GLAMOR_VERTEX_POS);
     glVertexAttribPointer(GLAMOR_VERTEX_POS, 2, GL_SHORT, GL_FALSE,
-                          sizeof (DDXPointRec), vbo_offset);
+                          sizeof(xPoint), vbo_offset);
 
     if (mode == CoordModePrevious) {
         int i;
-        DDXPointRec here = { 0, 0 };
+        xPoint here = { 0, 0 };
 
         for (i = 0; i < n; i++) {
             here.x += points[i].x;
@@ -91,7 +91,7 @@ glamor_poly_lines_solid_gl(DrawablePtr drawable, GCPtr gc,
             v[i] = here;
         }
     } else {
-        memcpy(v, points, n * sizeof (DDXPointRec));
+        memcpy(v, points, n * sizeof(xPoint));
     }
 
     if (add_last) {
diff --git a/glamor/glamor_priv.h b/glamor/glamor_priv.h
index 1ca9cab5cc..5cfe6d91ba 100644
--- a/glamor/glamor_priv.h
+++ b/glamor/glamor_priv.h
@@ -1064,7 +1064,7 @@ void glamor_egl_screen_init(ScreenPtr screen,
 
 Bool glamor_change_window_attributes(WindowPtr pWin, unsigned long mask);
 
-void glamor_copy_window(WindowPtr window, DDXPointRec old_origin, RegionPtr src_region);
+void glamor_copy_window(WindowPtr window, xPoint old_origin, RegionPtr src_region);
 
 #include "glamor_utils.h"
 
diff --git a/glamor/glamor_segs.c b/glamor/glamor_segs.c
index 4428c7b9b6..cf93766a93 100644
--- a/glamor/glamor_segs.c
+++ b/glamor/glamor_segs.c
@@ -74,7 +74,7 @@ glamor_poly_segment_solid_gl(DrawablePtr drawable, GCPtr gc,
 
     glEnableVertexAttribArray(GLAMOR_VERTEX_POS);
     glVertexAttribPointer(GLAMOR_VERTEX_POS, 2, GL_SHORT, GL_FALSE,
-                          sizeof(DDXPointRec), vbo_offset);
+                          sizeof(xPoint), vbo_offset);
 
     if (add_last) {
         int i, j;