diff --git a/hw/xnest/Color.c b/hw/xnest/Color.c
index dea33f57d..1dbf2ba4c 100644
--- a/hw/xnest/Color.c
+++ b/hw/xnest/Color.c
@@ -136,7 +136,7 @@ xnestDestroyColormap(ColormapPtr pCmap)
 }
 
 #define SEARCH_PREDICATE \
-  (xnestWindow(pWin) != None && wColormap(pWin) == icws->cmapIDs[i])
+  (xnestWindow(pWin) != XCB_WINDOW_NONE && wColormap(pWin) == icws->cmapIDs[i])
 
 static int
 xnestCountInstalledColormapWindows(WindowPtr pWin, void *ptr)
@@ -345,7 +345,7 @@ xnestInstallColormap(ColormapPtr pCmap)
         xnestDirectUninstallColormaps(pCmap->pScreen);
 
         /* Uninstall pInstalledMap. Notify all interested parties. */
-        if (pOldCmap != (ColormapPtr) None)
+        if (pOldCmap != (ColormapPtr) XCB_COLORMAP_NONE)
             WalkTree(pCmap->pScreen, TellLostMap, (void *) &pOldCmap->mid);
 
         SetInstalledColormap(pCmap->pScreen, pCmap);
diff --git a/hw/xnest/Cursor.c b/hw/xnest/Cursor.c
index ea7d94912..71c0ba0a2 100644
--- a/hw/xnest/Cursor.c
+++ b/hw/xnest/Cursor.c
@@ -53,7 +53,7 @@ xnestRealizeCursor(DeviceIntPtr pDev, ScreenPtr pScreen, CursorPtr pCursor)
     values.plane_mask = AllPlanes;
     values.foreground = 1L;
     values.background = 0L;
-    values.clip_mask = None;
+    values.clip_mask = XCB_PIXMAP_NONE;
 
     XChangeGC(xnestDisplay, xnestBitmapGC, valuemask, &values);
 
diff --git a/hw/xnest/Display.c b/hw/xnest/Display.c
index e9e98fcb4..332b6ec97 100644
--- a/hw/xnest/Display.c
+++ b/hw/xnest/Display.c
@@ -141,7 +141,7 @@ xnestOpenDisplay(int argc, char *argv[])
         xnestEventMask = 0L;
 
     for (i = 0; i <= MAXDEPTH; i++)
-        xnestDefaultDrawables[i] = None;
+        xnestDefaultDrawables[i] = XCB_WINDOW_NONE;
 
     for (i = 0; i < xnestNumPixmapFormats; i++)
         for (j = 0; j < xnestNumDepths; j++)
diff --git a/hw/xnest/GC.c b/hw/xnest/GC.c
index 075ccac83..f0720a072 100644
--- a/hw/xnest/GC.c
+++ b/hw/xnest/GC.c
@@ -198,7 +198,7 @@ xnestChangeClip(GCPtr pGC, int type, void *pValue, int nRects)
 
     switch (type) {
     case CT_NONE:
-        XSetClipMask(xnestDisplay, xnestGC(pGC), None);
+        XSetClipMask(xnestDisplay, xnestGC(pGC), XCB_PIXMAP_NONE);
         pValue = NULL;
         break;
 
@@ -277,7 +277,7 @@ xnestDestroyClip(GCPtr pGC)
 {
     if (pGC->clientClip) {
         RegionDestroy(pGC->clientClip);
-        XSetClipMask(xnestDisplay, xnestGC(pGC), None);
+        XSetClipMask(xnestDisplay, xnestGC(pGC), XCB_PIXMAP_NONE);
         pGC->clientClip = NULL;
     }
 }
diff --git a/hw/xnest/Visual.c b/hw/xnest/Visual.c
index 858324b2c..c0a660f60 100644
--- a/hw/xnest/Visual.c
+++ b/hw/xnest/Visual.c
@@ -63,5 +63,5 @@ xnestDefaultVisualColormap(Visual * visual)
         if (xnestVisuals[i].visual == visual)
             return xnestDefaultColormaps[i];
 
-    return None;
+    return XCB_WINDOW_NONE;
 }
diff --git a/hw/xnest/Window.c b/hw/xnest/Window.c
index 56882883e..181241ee9 100644
--- a/hw/xnest/Window.c
+++ b/hw/xnest/Window.c
@@ -134,7 +134,7 @@ xnestCreateWindow(WindowPtr pWin)
     xnestWindowPriv(pWin)->width = pWin->drawable.width;
     xnestWindowPriv(pWin)->height = pWin->drawable.height;
     xnestWindowPriv(pWin)->border_width = pWin->borderWidth;
-    xnestWindowPriv(pWin)->sibling_above = None;
+    xnestWindowPriv(pWin)->sibling_above = XCB_WINDOW_NONE;
     if (pWin->nextSib)
         xnestWindowPriv(pWin->nextSib)->sibling_above = xnestWindow(pWin);
     xnestWindowPriv(pWin)->bounding_shape = RegionCreate(NULL, 1);
@@ -155,7 +155,7 @@ xnestDestroyWindow(WindowPtr pWin)
     RegionDestroy(xnestWindowPriv(pWin)->bounding_shape);
     RegionDestroy(xnestWindowPriv(pWin)->clip_shape);
     XDestroyWindow(xnestDisplay, xnestWindow(pWin));
-    xnestWindowPriv(pWin)->window = None;
+    xnestWindowPriv(pWin)->window = XCB_WINDOW_NONE;
 
     if (pWin->optional && pWin->optional->colormap && pWin->parent)
         xnestSetInstalledColormapWindows(pWin->drawable.pScreen);
@@ -192,7 +192,7 @@ xnestConfigureWindow(WindowPtr pWin, unsigned int mask)
         xnestWindowPriv(pWin)->parent = xnestWindowParent(pWin);
         xnestWindowPriv(pWin)->x = pWin->origin.x - wBorderWidth(pWin);
         xnestWindowPriv(pWin)->y = pWin->origin.y - wBorderWidth(pWin);
-        xnestWindowPriv(pWin)->sibling_above = None;
+        xnestWindowPriv(pWin)->sibling_above = XCB_WINDOW_NONE;
         if (pWin->nextSib)
             xnestWindowPriv(pWin->nextSib)->sibling_above = xnestWindow(pWin);
     }
@@ -245,7 +245,7 @@ xnestConfigureWindow(WindowPtr pWin, unsigned int mask)
         valuemask = XCB_CONFIG_WINDOW_STACK_MODE;
         values.stack_mode = Above;
         XConfigureWindow(xnestDisplay, xnestWindow(pSib), valuemask, &values);
-        xnestWindowPriv(pSib)->sibling_above = None;
+        xnestWindowPriv(pSib)->sibling_above = XCB_WINDOW_NONE;
 
         /* the rest of siblings */
         for (pSib = pSib->nextSib; pSib != NullWindow; pSib = pSib->nextSib) {
@@ -268,7 +268,7 @@ xnestChangeWindowAttributes(WindowPtr pWin, unsigned long mask)
     if (mask & XCB_CW_BACK_PIXMAP)
         switch (pWin->backgroundState) {
         case XCB_BACK_PIXMAP_NONE:
-            attributes.background_pixmap = None;
+            attributes.background_pixmap = XCB_PIXMAP_NONE;
             break;
 
         case XCB_BACK_PIXMAP_PARENT_RELATIVE:
@@ -488,7 +488,7 @@ xnestShapeWindow(WindowPtr pWin)
             RegionEmpty(xnestWindowPriv(pWin)->bounding_shape);
 
             XShapeCombineMask(xnestDisplay, xnestWindow(pWin),
-                              ShapeBounding, 0, 0, None, ShapeSet);
+                              ShapeBounding, 0, 0, XCB_PIXMAP_NONE, ShapeSet);
         }
     }
 
@@ -515,7 +515,7 @@ xnestShapeWindow(WindowPtr pWin)
             RegionEmpty(xnestWindowPriv(pWin)->clip_shape);
 
             XShapeCombineMask(xnestDisplay, xnestWindow(pWin),
-                              ShapeClip, 0, 0, None, ShapeSet);
+                              ShapeClip, 0, 0, XCB_PIXMAP_NONE, ShapeSet);
         }
     }
 }
diff --git a/hw/xnest/XNWindow.h b/hw/xnest/XNWindow.h
index f7e32bb18..408da7ed4 100644
--- a/hw/xnest/XNWindow.h
+++ b/hw/xnest/XNWindow.h
@@ -50,10 +50,10 @@ extern DevPrivateKeyRec xnestWindowPrivateKeyRec;
    xnestDefaultWindows[pWin->drawable.pScreen->myNum])
 
 #define xnestWindowSiblingAbove(pWin) \
-  ((pWin)->prevSib ? xnestWindow((pWin)->prevSib) : None)
+  ((pWin)->prevSib ? xnestWindow((pWin)->prevSib) : XCB_WINDOW_NONE)
 
 #define xnestWindowSiblingBelow(pWin) \
-  ((pWin)->nextSib ? xnestWindow((pWin)->nextSib) : None)
+  ((pWin)->nextSib ? xnestWindow((pWin)->nextSib) : XCB_WINDOW_NONE)
 
 WindowPtr xnestWindowPtr(Window window);
 Bool xnestCreateWindow(WindowPtr pWin);