nx-X11/programs/Xserver: Drop {X,x}free() macros, use free() instead.

Fixes ArcticaProject/nx-libs#105

26 files changed, 185 insertions, 185 deletions

diff --git a/nx-X11/programs/Xserver/hw/nxagent/Args.c b/nx-X11/programs/Xserver/hw/nxagent/Args.c
index 6e6d61772..4f0173db0 100644
--- a/nx-X11/programs/Xserver/hw/nxagent/Args.c
+++ b/nx-X11/programs/Xserver/hw/nxagent/Args.c
@@ -355,7 +355,7 @@ int ddxProcessArgument(int argc, char *argv[], int i)
 
       if (nxagentOptionFile != NULL)
       {
-        xfree(nxagentOptionFile);
+        free(nxagentOptionFile);
 
         nxagentOptionFile = NULL;
       }
@@ -719,7 +719,7 @@ int ddxProcessArgument(int argc, char *argv[], int i)
 
       if (nxagentKeyboard != NULL)
       {
-        xfree(nxagentKeyboard);
+        free(nxagentKeyboard);
 
         nxagentKeyboard = NULL;
       }
@@ -1591,7 +1591,7 @@ nxagentProcessOptionsFileFree:
 
   if (data != NULL)
   {
-    Xfree(data);
+    free(data);
   }
 
 nxagentProcessOptionsFileClose:
diff --git a/nx-X11/programs/Xserver/hw/nxagent/Clipboard.c b/nx-X11/programs/Xserver/hw/nxagent/Clipboard.c
index a0dfbf602..5249d8550 100644
--- a/nx-X11/programs/Xserver/hw/nxagent/Clipboard.c
+++ b/nx-X11/programs/Xserver/hw/nxagent/Clipboard.c
@@ -745,7 +745,7 @@ void nxagentCollectPropertyEvent(int resource)
 
         if (pszReturnData != NULL)
         {
-          Xfree(pszReturnData);
+          free(pszReturnData);
         }
 
         return;
@@ -787,7 +787,7 @@ void nxagentCollectPropertyEvent(int resource)
 
         if (pszReturnData != NULL)
         {
-          Xfree(pszReturnData);
+          free(pszReturnData);
         }
 
         return;
@@ -1487,7 +1487,7 @@ int nxagentInitClipboard(WindowPtr pWin)
 
   if (lastSelectionOwner != NULL)
   {
-    xfree(lastSelectionOwner);
+    free(lastSelectionOwner);
     lastSelectionOwner = NULL;
   }
 
diff --git a/nx-X11/programs/Xserver/hw/nxagent/Colormap.c b/nx-X11/programs/Xserver/hw/nxagent/Colormap.c
index fe3b6ce1d..18c4c67a6 100644
--- a/nx-X11/programs/Xserver/hw/nxagent/Colormap.c
+++ b/nx-X11/programs/Xserver/hw/nxagent/Colormap.c
@@ -112,7 +112,7 @@ Bool nxagentCreateColormap(ColormapPtr pCmap)
       pCmap->red[i].co.local.green = colors[i].red;
       pCmap->red[i].co.local.blue = colors[i].red;
     }
-    xfree(colors);
+    free(colors);
     break;
 
   case StaticColor: /* read only */
@@ -125,7 +125,7 @@ Bool nxagentCreateColormap(ColormapPtr pCmap)
       pCmap->red[i].co.local.green = colors[i].green;
       pCmap->red[i].co.local.blue = colors[i].blue;
     }
-    xfree(colors);
+    free(colors);
     break;
 
   case TrueColor: /* read only */
@@ -149,7 +149,7 @@ Bool nxagentCreateColormap(ColormapPtr pCmap)
       pCmap->green[i].co.local.green = colors[i].green;
       pCmap->blue[i].co.local.blue = colors[i].blue;
     }
-    xfree(colors);
+    free(colors);
     break;
 
   case GrayScale: /* read and write */
@@ -168,7 +168,7 @@ Bool nxagentCreateColormap(ColormapPtr pCmap)
 void nxagentDestroyColormap(ColormapPtr pCmap)
 {
   XFreeColormap(nxagentDisplay, nxagentColormap(pCmap));
-  xfree(pCmap->devPriv);
+  free(pCmap->devPriv);
 }
 
 #define SEARCH_PREDICATE \
@@ -246,11 +246,11 @@ void nxagentSetInstalledColormapWindows(ScreenPtr pScreen)
     numWindows = 0;
   }
 
-  xfree(icws.cmapIDs);
+  free(icws.cmapIDs);
 
   if (!nxagentSameInstalledColormapWindows(icws.windows, icws.numWindows)) {
     if (nxagentOldInstalledColormapWindows)
-      xfree(nxagentOldInstalledColormapWindows);
+      free(nxagentOldInstalledColormapWindows);
 
 #ifdef _XSERVER64
     {
@@ -261,7 +261,7 @@ void nxagentSetInstalledColormapWindows(ScreenPtr pScreen)
 	  windows[i] = icws.windows[i];
       XSetWMColormapWindows(nxagentDisplay, nxagentDefaultWindows[pScreen->myNum],
 			    windows, numWindows);
-      xfree(windows);
+      free(windows);
     }
 #else
     XSetWMColormapWindows(nxagentDisplay, nxagentDefaultWindows[pScreen->myNum],
@@ -310,13 +310,13 @@ void nxagentSetInstalledColormapWindows(ScreenPtr pScreen)
 #endif /* DUMB_WINDOW_MANAGERS */
   }
   else
-    if (icws.windows) xfree(icws.windows);
+    if (icws.windows) free(icws.windows);
 }
 
 void nxagentSetScreenSaverColormapWindow(ScreenPtr pScreen)
 {
   if (nxagentOldInstalledColormapWindows)
-    xfree(nxagentOldInstalledColormapWindows);
+    free(nxagentOldInstalledColormapWindows);
 
 #ifdef _XSERVER64
   {
@@ -448,7 +448,7 @@ void nxagentStoreColors(ColormapPtr pCmap, int nColors, xColorItem *pColors)
       pColors64[i].flags = pColors[i].flags;
     }
     XStoreColors(nxagentDisplay, nxagentColormap(pCmap), pColors64, nColors);
-    xfree(pColors64);
+    free(pColors64);
   }
 #else
     XStoreColors(nxagentDisplay, nxagentColormap(pCmap),
diff --git a/nx-X11/programs/Xserver/hw/nxagent/Cursor.c b/nx-X11/programs/Xserver/hw/nxagent/Cursor.c
index 62095d5b3..b1449bf13 100644
--- a/nx-X11/programs/Xserver/hw/nxagent/Cursor.c
+++ b/nx-X11/programs/Xserver/hw/nxagent/Cursor.c
@@ -267,7 +267,7 @@ Bool nxagentUnrealizeCursor(ScreenPtr pScreen, CursorPtr pCursor)
     nxagentCursor(pCursor, pScreen) = None;
   }
 
-  xfree(nxagentCursorPriv(pCursor, pScreen));
+  free(nxagentCursorPriv(pCursor, pScreen));
 
   return True;
 }
@@ -366,7 +366,7 @@ void nxagentReconnectCursor(void * p0, XID x1, void * p2)
     }
     else
     {
-      xfree(nxagentCursorPriv(pCursor, nxagentDefaultScreen));
+      free(nxagentCursorPriv(pCursor, nxagentDefaultScreen));
       if (!nxagentRealizeCursor(nxagentDefaultScreen, pCursor))
       {
         fprintf(stderr, "nxagentReconnectCursor: nxagentRealizeCursor failed\n");
diff --git a/nx-X11/programs/Xserver/hw/nxagent/Display.c b/nx-X11/programs/Xserver/hw/nxagent/Display.c
index 31ea7c2a0..27cd0859a 100644
--- a/nx-X11/programs/Xserver/hw/nxagent/Display.c
+++ b/nx-X11/programs/Xserver/hw/nxagent/Display.c
@@ -1814,13 +1814,13 @@ void nxagentCloseDisplay()
    * traffic
    */
 
-  xfree(nxagentDefaultColormaps);
+  free(nxagentDefaultColormaps);
   nxagentDefaultColormaps = NULL;
 
   XFree(nxagentVisuals);
   nxagentVisuals = NULL;
 
-  xfree(nxagentDepths);
+  free(nxagentDepths);
   nxagentDepths = NULL;
 
   XFree(nxagentPixmapFormats);
@@ -2060,7 +2060,7 @@ void nxagentBackupDisplayInfo(void)
   nxagentNumVisualsRecBackup = nxagentNumVisuals;
   if (nxagentVisualHasBeenIgnored)
   {
-    xfree(nxagentVisualHasBeenIgnored);
+    free(nxagentVisualHasBeenIgnored);
     nxagentVisualHasBeenIgnored = NULL;
   }
   nxagentVisualHasBeenIgnored = xalloc(nxagentNumVisuals * sizeof(Bool));
@@ -2074,17 +2074,17 @@ void nxagentBackupDisplayInfo(void)
 
 void nxagentCleanupBackupDisplayInfo(void)
 {
-  xfree(nxagentDepthsRecBackup);
+  free(nxagentDepthsRecBackup);
   nxagentNumDepthsRecBackup = 0;
 
   nxagentNumDefaultColormapsRecBackup = 0;
 
-  xfree(nxagentVisualsRecBackup);
+  free(nxagentVisualsRecBackup);
   nxagentNumVisualsRecBackup = 0;
 
   if (nxagentVisualHasBeenIgnored)
   {
-    xfree(nxagentVisualHasBeenIgnored);
+    free(nxagentVisualHasBeenIgnored);
     nxagentVisualHasBeenIgnored = NULL;
   }
 
@@ -2107,7 +2107,7 @@ void nxagentCleanupBackupDisplayInfo(void)
     }
     else
     {
-      xfree(nxagentBitmapGCBackup);
+      free(nxagentBitmapGCBackup);
     }
 
     nxagentBitmapGCBackup = NULL;
diff --git a/nx-X11/programs/Xserver/hw/nxagent/Drawable.c b/nx-X11/programs/Xserver/hw/nxagent/Drawable.c
index 377e119ab..a73040eeb 100644
--- a/nx-X11/programs/Xserver/hw/nxagent/Drawable.c
+++ b/nx-X11/programs/Xserver/hw/nxagent/Drawable.c
@@ -359,7 +359,7 @@ nxagentSynchronizeDrawableDataFree:
 
   if (data != NULL)
   {
-    xfree(data);
+    free(data);
   }
 
 nxagentSynchronizeDrawableDataEnd:
@@ -860,7 +860,7 @@ int nxagentSynchronizeRegion(DrawablePtr pDrawable, RegionPtr pRegion, unsigned
 
             if (cmpData != NULL)
             {
-              xfree(cmpData);
+              free(cmpData);
             }
           }
         }
@@ -1060,7 +1060,7 @@ nxagentSynchronizeRegionFree:
 
   if (data != NULL)
   {
-    xfree(data);
+    free(data);
   }
 
   RegionUninit(&exposeRegion);
@@ -2161,7 +2161,7 @@ unsigned long nxagentGetColor(DrawablePtr pDrawable, int xPixel, int yPixel)
     fprintf(stderr, "nxagentGetColor: WARNING! Failed to create the XImage.\n");
     #endif
 
-    xfree(data);
+    free(data);
 
     return -1;
   }
@@ -2387,7 +2387,7 @@ void nxagentFillRemoteRegion(DrawablePtr pDrawable, RegionPtr pRegion)
     XFillRectangles(nxagentDisplay, nxagentDrawable(pDrawable), nxagentGC(pGC),
                         pRects, nrects);
 
-    xfree(pRects);
+    free(pRects);
   }
 }
 
diff --git a/nx-X11/programs/Xserver/hw/nxagent/Font.c b/nx-X11/programs/Xserver/hw/nxagent/Font.c
index 8f692eb85..22b3e6c88 100644
--- a/nx-X11/programs/Xserver/hw/nxagent/Font.c
+++ b/nx-X11/programs/Xserver/hw/nxagent/Font.c
@@ -196,11 +196,11 @@ void nxagentFreeFontCache(void)
       nxagentFreeFont(CACHE_FSTRUCT(i));
     }
 
-    xfree(CACHE_NAME(i));
-    xfree(CACHE_ENTRY(i));
+    free(CACHE_NAME(i));
+    free(CACHE_ENTRY(i));
   }
 
-  xfree(CACHE_ENTRY_PTR);
+  free(CACHE_ENTRY_PTR);
   CACHE_ENTRY_PTR = NULL;
   CACHE_INDEX = 0;
   CACHE_SIZE = 0;
@@ -364,10 +364,10 @@ static void nxagentFreeRemoteFontList(nxagentFontList *listRec)
   {
     if (listRec -> list[l])
     {
-      xfree(listRec -> list[l] -> name);
+      free(listRec -> list[l] -> name);
       listRec -> list[l] -> name = NULL;
 
-      xfree(listRec -> list[l]);
+      free(listRec -> list[l]);
       listRec -> list[l] = NULL;
     }
   }
@@ -686,7 +686,7 @@ Bool nxagentUnrealizeFont(ScreenPtr pScreen, FontPtr pFont)
     if (nxagentFontPriv(pFont) -> mirrorID)
       FreeResource(nxagentFontPriv(pFont) -> mirrorID, RT_NONE);
 
-    xfree(nxagentFontPriv(pFont));
+    free(nxagentFontPriv(pFont));
     FontSetPrivate(pFont, nxagentFontPrivateIndex, NULL);
   }
 
@@ -1640,7 +1640,7 @@ XFontStruct* nxagentLoadQueryFont(register Display *dpy, char *name, FontPtr pFo
     fprintf(stderr, "nxagentLoadQueryFont: WARNING! Font not found '%s'.\n", name);
     #endif
 
-    Xfree(fs);
+    free(fs);
 
     return (XFontStruct *) NULL;
   }
@@ -1674,7 +1674,7 @@ XFontStruct* nxagentLoadQueryFont(register Display *dpy, char *name, FontPtr pFo
       fprintf(stderr, "nxagentLoadQueryFont: WARNING! Failed allocation of XFontProp.");
       #endif
 
-      Xfree((char *) fs);
+      free((char *) fs);
       return (XFontStruct *) NULL;
     }
 
@@ -1714,13 +1714,13 @@ int nxagentFreeFont(XFontStruct *fs)
     #ifdef USE_XF86BIGFONT
     _XF86BigfontFreeFontMetrics(fs);
     #else
-    Xfree ((char *) fs->per_char);
+    free ((char *) fs->per_char);
     #endif
   }
 
   if (fs -> properties)
   {
-    Xfree (fs->properties);
+    free (fs->properties);
   }
 
   XFree(fs);
diff --git a/nx-X11/programs/Xserver/hw/nxagent/GC.c b/nx-X11/programs/Xserver/hw/nxagent/GC.c
index 7450c1e6c..21e828769 100644
--- a/nx-X11/programs/Xserver/hw/nxagent/GC.c
+++ b/nx-X11/programs/Xserver/hw/nxagent/GC.c
@@ -686,7 +686,7 @@ void nxagentChangeClip(GCPtr pGC, int type, void * pValue, int nRects)
 
         XSetClipRectangles(nxagentDisplay, nxagentGC(pGC), pGC -> clipOrg.x, pGC -> clipOrg.y,
                                pRects, nRects, Unsorted);
-        xfree((char *) pRects);
+        free((char *) pRects);
       }
 
       break;
@@ -770,7 +770,7 @@ void nxagentChangeClip(GCPtr pGC, int type, void * pValue, int nRects)
 
       pGC->clientClip = (void *) RegionFromRects(nRects,
                                                   (xRectangle *)pValue, type);
-      xfree(pValue);
+      free(pValue);
 
       pValue = pGC->clientClip;
 
@@ -904,7 +904,7 @@ static void nxagentFreeGCRec(struct nxagentGCRec *t)
               (void *) t, (void *) t -> gc);
   #endif
 
-  xfree(t -> gc);
+  free(t -> gc);
 
   free(t);
 }
@@ -918,7 +918,7 @@ static void nxagentRestoreGCRec(struct nxagentGCRec *t)
 
   if (nxagentGC(t -> pGC))
   {
-    xfree(nxagentGC(t -> pGC));
+    free(nxagentGC(t -> pGC));
   }
 
   nxagentGC(t -> pGC) = t -> gc;
@@ -1298,7 +1298,7 @@ static void nxagentReconnectClip(GCPtr pGC, int type, void * pValue, int nRects)
 
         XSetClipRectangles(nxagentDisplay, nxagentGC(pGC), pGC -> clipOrg.x, pGC -> clipOrg.y,
                            pRects, nRects, Unsorted);
-        xfree((char *) pRects);
+        free((char *) pRects);
       }
       else
       {
@@ -1369,7 +1369,7 @@ static void nxagentReconnectClip(GCPtr pGC, int type, void * pValue, int nRects)
 
       pGC->clientClip = (void *) RegionFromRects(nRects,
                                                   (xRectangle *)pValue, type);
-      xfree(pValue);
+      free(pValue);
       pValue = pGC->clientClip;
       type = CT_REGION;
 
diff --git a/nx-X11/programs/Xserver/hw/nxagent/GCOps.c b/nx-X11/programs/Xserver/hw/nxagent/GCOps.c
index 634bbf2ce..01a3f6a93 100644
--- a/nx-X11/programs/Xserver/hw/nxagent/GCOps.c
+++ b/nx-X11/programs/Xserver/hw/nxagent/GCOps.c
@@ -779,7 +779,7 @@ RegionPtr nxagentCopyArea(DrawablePtr pSrcDrawable, DrawablePtr pDstDrawable,
                    srcx, srcy, width, height);
     #endif
 
-    xfree(data);
+    free(data);
 
     /*
      * If the source is a shared memory pixmap, the
@@ -999,7 +999,7 @@ RegionPtr nxagentCopyPlane(DrawablePtr pSrcDrawable, DrawablePtr pDstDrawable,
                    srcx, srcy, width, height);
     #endif
 
-    xfree(data);
+    free(data);
 
     /*
      * If the source is a shared memory pixmap, the
@@ -1539,7 +1539,7 @@ void nxagentFillPolygon(DrawablePtr pDrawable, GCPtr pGC, int shape,
 
   if (newPoints != NULL)
   {
-    xfree(newPoints);
+    free(newPoints);
   }
 }
 
diff --git a/nx-X11/programs/Xserver/hw/nxagent/Image.c b/nx-X11/programs/Xserver/hw/nxagent/Image.c
index a158a11db..b7c3135d0 100644
--- a/nx-X11/programs/Xserver/hw/nxagent/Image.c
+++ b/nx-X11/programs/Xserver/hw/nxagent/Image.c
@@ -447,7 +447,7 @@ FIXME: Here the split trap is always set and so the caching of
 
     if (nxagentUnpackAlpha[resource] != NULL)
     {
-      Xfree(nxagentUnpackAlpha[resource] -> data);
+      free(nxagentUnpackAlpha[resource] -> data);
     }
     else if ((nxagentUnpackAlpha[resource] = Xmalloc(sizeof(UnpackAlphaRec))) == NULL)
     {
@@ -455,7 +455,7 @@ FIXME: Here the split trap is always set and so the caching of
       fprintf(stderr, "nxagentSetUnpackAlpha: PANIC! Can't allocate data for the alpha structure.\n");
       #endif
 
-      Xfree(data);
+      free(data);
 
       return;
     }
@@ -475,7 +475,7 @@ FIXME: Here the split trap is always set and so the caching of
                 resource, size);
     #endif
 
-    Xfree(data);
+    free(data);
   }
 }
 
@@ -1561,7 +1561,7 @@ nxagentPutSubImageEnd:
 
   if (packedChecksum != NULL)
   {
-    Xfree(packedChecksum);
+    free(packedChecksum);
   }
 
   if (packedImage != NULL)
@@ -1569,13 +1569,13 @@ nxagentPutSubImageEnd:
     if (packedImage -> data != NULL &&
             packedImage -> data != plainImage -> data)
     {
-      Xfree(packedImage -> data);
+      free(packedImage -> data);
     }
 
-    Xfree(packedImage);
+    free(packedImage);
   }
 
-  Xfree(plainImage);
+  free(plainImage);
 }
 
 void nxagentGetImage(DrawablePtr pDrawable, int x, int y, int w, int h,
@@ -1629,9 +1629,9 @@ void nxagentResetAlphaCache()
   {
     if (nxagentUnpackAlpha[i])
     {
-      Xfree(nxagentUnpackAlpha[i] -> data);
+      free(nxagentUnpackAlpha[i] -> data);
 
-      Xfree(nxagentUnpackAlpha[i]);
+      free(nxagentUnpackAlpha[i]);
 
       nxagentUnpackAlpha[i] = NULL;
     }
@@ -1711,7 +1711,7 @@ int nxagentScaleImage(int x, int y, unsigned xRatio, unsigned yRatio,
 
   if (newImage -> data == NULL)
   {
-    Xfree(newImage);
+    free(newImage);
     
     #ifdef PANIC
     fprintf(stderr, "nxagentScaleImage: PANIC! Failed to create the target image data.\n");
@@ -1781,10 +1781,10 @@ int nxagentScaleImage(int x, int y, unsigned xRatio, unsigned yRatio,
 
   if (image -> obdata != NULL)
   {
-    Xfree((char *) image -> obdata);
+    free((char *) image -> obdata);
   }
 
-  Xfree((char *) image);
+  free((char *) image);
 
   *pImage = newImage;
 
diff --git a/nx-X11/programs/Xserver/hw/nxagent/Keyboard.c b/nx-X11/programs/Xserver/hw/nxagent/Keyboard.c
index 852771492..6bd201d70 100644
--- a/nx-X11/programs/Xserver/hw/nxagent/Keyboard.c
+++ b/nx-X11/programs/Xserver/hw/nxagent/Keyboard.c
@@ -1138,7 +1138,7 @@ Reply   Total	Cached	Bits In			Bits Out		Bits/Reply	  Ratio
       #endif
 
 #ifdef _XSERVER64
-      xfree(keymap);
+      free(keymap);
 #else
       XFree(keymap);
 #endif
@@ -1473,17 +1473,17 @@ static int nxagentFreeKeyboardDeviceData(DeviceIntPtr dev)
       }
       #endif
 
-      xfree(dev->key->curKeySyms.map);
-      xfree(dev->key->modifierKeyMap);
-      xfree(dev->key);
+      free(dev->key->curKeySyms.map);
+      free(dev->key->modifierKeyMap);
+      free(dev->key);
 
       dev->key=NULL;
   }
 
   if (dev->focus)
   {
-      xfree(dev->focus->trace);
-      xfree(dev->focus);
+      free(dev->focus->trace);
+      free(dev->focus);
       dev->focus=NULL;
   }
 
@@ -1494,7 +1494,7 @@ static int nxagentFreeKeyboardDeviceData(DeviceIntPtr dev)
       if (k->xkb_sli)
           XkbFreeSrvLedInfo(k->xkb_sli);
       #endif
-      xfree(k);
+      free(k);
   }
 
   #ifdef DEBUG
diff --git a/nx-X11/programs/Xserver/hw/nxagent/NXdispatch.c b/nx-X11/programs/Xserver/hw/nxagent/NXdispatch.c
index b68f01b8d..d1923106d 100644
--- a/nx-X11/programs/Xserver/hw/nxagent/NXdispatch.c
+++ b/nx-X11/programs/Xserver/hw/nxagent/NXdispatch.c
@@ -197,7 +197,7 @@ void
 InitSelections()
 {
     if (CurrentSelections)
-	xfree(CurrentSelections);
+	free(CurrentSelections);
     CurrentSelections = (Selection *)NULL;
     NumCurrentSelections = 0;
 
@@ -1316,7 +1316,7 @@ CloseDownClient(register ClientPtr client)
 #ifdef SMART_SCHEDULE
 	SmartLastClient = NullClient;
 #endif
-	xfree(client);
+	free(client);
 
 	while (!clients[currentMaxClients-1])
 	    currentMaxClients--;
diff --git a/nx-X11/programs/Xserver/hw/nxagent/NXdixfonts.c b/nx-X11/programs/Xserver/hw/nxagent/NXdixfonts.c
index 77f21e495..d15df9513 100644
--- a/nx-X11/programs/Xserver/hw/nxagent/NXdixfonts.c
+++ b/nx-X11/programs/Xserver/hw/nxagent/NXdixfonts.c
@@ -326,9 +326,9 @@ bail:
     for (i = 0; i < c->num_fpes; i++) {
 	FreeFPE(c->fpe_list[i]);
     }
-    xfree(c->fpe_list);
-    xfree(c->fontname);
-    xfree(c);
+    free(c->fpe_list);
+    free(c->fontname);
+    free(c);
     return TRUE;
 }
 
@@ -441,7 +441,7 @@ doListFontsAndAliases(ClientPtr client, LFclosurePtr c)
 		    return TRUE;
 		}
 		if (err == FontNameAlias) {
-		    if (resolved) xfree(resolved);
+		    if (resolved) free(resolved);
 		    resolved = (char *) xalloc(resolvedlen + 1);
 		    if (resolved)
 			memmove(resolved, tmpname, resolvedlen + 1);
@@ -496,7 +496,7 @@ doListFontsAndAliases(ClientPtr client, LFclosurePtr c)
 		    c->saved = c->current;
 		    c->haveSaved = TRUE;
 		    if (c->savedName)
-			xfree(c->savedName);
+			free(c->savedName);
 		    c->savedName = (char *)xalloc(namelen + 1);
 		    if (c->savedName)
 			memmove(c->savedName, name, namelen + 1);
@@ -614,11 +614,11 @@ bail:
     }
     for (i = 0; i < c->num_fpes; i++)
 	FreeFPE(c->fpe_list[i]);
-    xfree(c->fpe_list);
-    if (c->savedName) xfree(c->savedName);
+    free(c->fpe_list);
+    if (c->savedName) free(c->savedName);
     FreeFontNames(names);
-    xfree(c);
-    if (resolved) xfree(resolved);
+    free(c);
+    if (resolved) free(resolved);
     return TRUE;
 }
 
@@ -643,14 +643,14 @@ ListFonts(ClientPtr client, unsigned char *pattern, unsigned length,
     c->fpe_list = (FontPathElementPtr *)
 	xalloc(sizeof(FontPathElementPtr) * num_fpes);
     if (!c->fpe_list) {
-	xfree(c);
+	free(c);
 	return BadAlloc;
     }
     c->names = MakeFontNamesRecord(max_names < nxagentMaxFontNames ? max_names : nxagentMaxFontNames);
     if (!c->names)
     {
-	xfree(c->fpe_list);
-	xfree(c);
+	free(c->fpe_list);
+	free(c);
 	return BadAlloc;
     }
     memmove( c->current.pattern, pattern, length);
@@ -785,7 +785,7 @@ doListFontsWithInfo(ClientPtr client, LFWIclosurePtr c)
 		c->haveSaved = TRUE;
 		c->savedNumFonts = numFonts;
 		if (c->savedName)
-		  xfree(c->savedName);
+		  free(c->savedName);
 		c->savedName = (char *)xalloc(namelen + 1);
 		if (c->savedName)
 		  memmove(c->savedName, name, namelen + 1);
@@ -886,8 +886,8 @@ doListFontsWithInfo(ClientPtr client, LFWIclosurePtr c)
 	    (void) WriteToClient(client, namelen, name);
 	    if (pFontInfo == &fontInfo)
  	    {
-		xfree(fontInfo.props);
-		xfree(fontInfo.isStringProp);
+		free(fontInfo.props);
+		free(fontInfo.isStringProp);
 	    }
 	    --c->current.max_names;
 	}
@@ -910,10 +910,10 @@ bail:
     }
     for (i = 0; i < c->num_fpes; i++)
 	FreeFPE(c->fpe_list[i]);
-    xfree(c->reply);
-    xfree(c->fpe_list);
-    if (c->savedName) xfree(c->savedName);
-    xfree(c);
+    free(c->reply);
+    free(c->fpe_list);
+    if (c->savedName) free(c->savedName);
+    free(c);
     return TRUE;
 }
 
@@ -1085,7 +1085,7 @@ nxdoListFontsAndAliases(client, fss)
 		    return TRUE;
 		}
 		if (err == FontNameAlias) {
-		    if (resolved) xfree(resolved);
+		    if (resolved) free(resolved);
 		    resolved = (char *) xalloc(resolvedlen + 1);
 		    if (resolved)
                     {
@@ -1154,7 +1154,7 @@ nxdoListFontsAndAliases(client, fss)
 		    c->saved = c->current;
 		    c->haveSaved = TRUE;
 		    if (c->savedName)
-			xfree(c->savedName);
+			free(c->savedName);
 		    c->savedName = (char *)xalloc(namelen + 1);
 		    if (c->savedName)
                     {
@@ -1249,12 +1249,12 @@ finish:
     }
     for (i = 0; i < c->num_fpes; i++)
 	FreeFPE(c->fpe_list[i]);
-    xfree(c->fpe_list);
-    if (c->savedName) xfree(c->savedName);
+    free(c->fpe_list);
+    if (c->savedName) free(c->savedName);
     FreeFontNames(c->names);
-    xfree(c);
-    xfree(fss);
-    if (resolved) xfree(resolved);
+    free(c);
+    free(fss);
+    if (resolved) free(resolved);
 
     return doOpenFont(client, oc);
 }
@@ -1279,7 +1279,7 @@ nxOpenFont(client, fid, flags, lenfname, pfontname)
     memmove(f, pfontname, lenfname);
     f[lenfname] = '\0';
     ErrorF("OpenFont: fontname is \"%s\"\n", f);
-    xfree(f);
+    free(f);
 #endif
     if (!lenfname || lenfname > XLFDMAXFONTNAMELEN)
 	return BadName;
@@ -1317,22 +1317,22 @@ nxOpenFont(client, fid, flags, lenfname, pfontname)
 
     if (!(c = (LFclosurePtr) xalloc(sizeof *c)))
     {
-	xfree(fss);
+	free(fss);
 	return BadAlloc;
     }
         c->fpe_list = (FontPathElementPtr *)
 	xalloc(sizeof(FontPathElementPtr) * num_fpes);
     if (!c->fpe_list) {
-	xfree(c);
-	xfree(fss);
+	free(c);
+	free(fss);
 	return BadAlloc;
     }
     c->names = MakeFontNamesRecord(100);
     if (!c->names)
     {
-	xfree(c->fpe_list);
-	xfree(c);
-	xfree(fss);
+	free(c->fpe_list);
+	free(c);
+	free(fss);
 	return BadAlloc;
     }
     memmove( c->current.pattern, pfontname, lenfname);
@@ -1356,9 +1356,9 @@ nxOpenFont(client, fid, flags, lenfname, pfontname)
     {
       for (i = 0; i < c->num_fpes; i++)
         FreeFPE(c->fpe_list[i]);
-      xfree(c->fpe_list);
-      xfree(c);
-      xfree(fss);
+      free(c->fpe_list);
+      free(c);
+      free(fss);
       return BadAlloc;
     }
     oc->fontname = (char *) xalloc(256);/* I don't want to deal with future reallocs errors */
@@ -1367,10 +1367,10 @@ nxOpenFont(client, fid, flags, lenfname, pfontname)
     if (!oc->fontname) {
       for (i = 0; i < c->num_fpes; i++)
         FreeFPE(c->fpe_list[i]);
-      xfree(c->fpe_list);
-      xfree(c);
-      xfree(oc);
-      xfree(fss);
+      free(c->fpe_list);
+      free(c);
+      free(oc);
+      free(fss);
       return BadAlloc;
     }
     /*
@@ -1380,13 +1380,13 @@ nxOpenFont(client, fid, flags, lenfname, pfontname)
     oc->fpe_list = (FontPathElementPtr *)
 	xalloc(sizeof(FontPathElementPtr) * num_fpes);
     if (!oc->fpe_list) {
-	xfree(oc->fontname);
-	xfree(oc);
+	free(oc->fontname);
+	free(oc);
       for (i = 0; i < c->num_fpes; i++)
          FreeFPE(c->fpe_list[i]);
-       xfree(c->fpe_list);
-       xfree(c);
-       xfree(fss);
+       free(c->fpe_list);
+       free(c);
+       free(fss);
        return BadAlloc;
     }
     memmove(oc->fontname, pfontname, lenfname);
diff --git a/nx-X11/programs/Xserver/hw/nxagent/NXglyph.c b/nx-X11/programs/Xserver/hw/nxagent/NXglyph.c
index 4359a552b..f2885d39c 100644
--- a/nx-X11/programs/Xserver/hw/nxagent/NXglyph.c
+++ b/nx-X11/programs/Xserver/hw/nxagent/NXglyph.c
@@ -65,7 +65,7 @@ AddGlyph (GlyphSetPtr glyphSet, GlyphPtr glyph, Glyph id)
     gr = FindGlyphRef (&globalGlyphs[glyphSet->fdepth], hash, TRUE, glyph);
     if (gr->glyph && gr->glyph != DeletedGlyph)
     {
-	xfree (glyph);
+	free (glyph);
 	glyph = gr->glyph;
     }
     else
@@ -175,7 +175,7 @@ ResizeGlyphHash (GlyphHashPtr hash, CARD32 change, Bool global)
 		++newHash.tableEntries;
 	    }
 	}
-	xfree (hash->table);
+	free (hash->table);
     }
     *hash = newHash;
     if (global)
diff --git a/nx-X11/programs/Xserver/hw/nxagent/NXglyphcurs.c b/nx-X11/programs/Xserver/hw/nxagent/NXglyphcurs.c
index 33492a6d6..53a5a8d68 100644
--- a/nx-X11/programs/Xserver/hw/nxagent/NXglyphcurs.c
+++ b/nx-X11/programs/Xserver/hw/nxagent/NXglyphcurs.c
@@ -115,7 +115,7 @@ ServerBitsFromGlyph(FontPtr pfont, unsigned ch, register CursorMetricPtr cm, uns
 	    fbDestroyPixmap(ppix);
 	if (pGC)
 	    FreeScratchGC(pGC);
-	xfree(pbits);
+	free(pbits);
 	return BadAlloc;
     }
 
diff --git a/nx-X11/programs/Xserver/hw/nxagent/NXpicture.c b/nx-X11/programs/Xserver/hw/nxagent/NXpicture.c
index a47e158df..44248bc1b 100644
--- a/nx-X11/programs/Xserver/hw/nxagent/NXpicture.c
+++ b/nx-X11/programs/Xserver/hw/nxagent/NXpicture.c
@@ -284,7 +284,7 @@ CreateSolidPicture (Picture pid, xRenderColor *color, int *error)
     pPicture->pSourcePict = (SourcePictPtr) xalloc(sizeof(PictSolidFill));
     if (!pPicture->pSourcePict) {
         *error = BadAlloc;
-        xfree(pPicture);
+        free(pPicture);
         return 0;
     }
     pPicture->pSourcePict->type = SourcePictTypeSolidFill;
@@ -361,12 +361,12 @@ FreePicture (void *	value,
         nxagentDestroyPicture(pPicture);
 
 	if (pPicture->transform)
-	    xfree (pPicture->transform);
+	    free (pPicture->transform);
         if (!pPicture->pDrawable) {
             if (pPicture->pSourcePict) {
                 if (pPicture->pSourcePict->type != SourcePictTypeSolidFill)
-                    xfree(pPicture->pSourcePict->linear.stops);
-                xfree(pPicture->pSourcePict);
+                    free(pPicture->pSourcePict->linear.stops);
+                free(pPicture->pSourcePict);
             }
         } else {
             ScreenPtr	    pScreen = pPicture->pDrawable->pScreen;
@@ -397,7 +397,7 @@ FreePicture (void *	value,
                 (*pScreen->DestroyPixmap) ((PixmapPtr)pPicture->pDrawable);
             }
         }
-	xfree (pPicture);
+	free (pPicture);
     }
     return Success;
 }
@@ -502,7 +502,7 @@ Bool nxagentReconnectAllPictFormat(void *p)
     }
   }
 
-  xfree(formats);
+  free(formats);
 
   /* TODO: Perhaps do i have to do PictureFinishInit ?. */
   /* TODO: We have to check for new Render protocol version. */
diff --git a/nx-X11/programs/Xserver/hw/nxagent/NXproperty.c b/nx-X11/programs/Xserver/hw/nxagent/NXproperty.c
index 2458c12d0..0ace2fbd2 100644
--- a/nx-X11/programs/Xserver/hw/nxagent/NXproperty.c
+++ b/nx-X11/programs/Xserver/hw/nxagent/NXproperty.c
@@ -233,7 +233,7 @@ ChangeWindowProperty(WindowPtr pWin, Atom property, Atom type, int format,
         data = (void *)xalloc(totalSize);
 	if (!data && len)
 	{
-	    xfree(pProp);
+	    free(pProp);
 	    return(BadAlloc);
 	}
         pProp->propertyName = property;
@@ -296,7 +296,7 @@ ChangeWindowProperty(WindowPtr pWin, Atom property, Atom type, int format,
 	    memmove(&((char *)data)[totalSize], (char *)pProp->data, 
 		  (int)(pProp->size * sizeInBytes));
             memmove((char *)data, (char *)value, totalSize);
-	    xfree(pProp->data);
+	    free(pProp->data);
             pProp->data = data;
             pProp->size += len;
 	}
@@ -521,8 +521,8 @@ ProcGetProperty(ClientPtr client)
 	}
 	else
 	    prevProp->next = pProp->next;
-	xfree(pProp->data);
-	xfree(pProp);
+	free(pProp->data);
+	free(pProp);
     }
     return(client->noClientException);
 }
@@ -636,8 +636,8 @@ GetWindowProperty(pWin, property, longOffset, longLength, delete,
 	}
 	else
 	    prevProp->next = pProp->next;
-	xfree(pProp->data);
-	xfree(pProp);
+	free(pProp->data);
+	free(pProp);
     }
     return(Success);
 }
diff --git a/nx-X11/programs/Xserver/hw/nxagent/NXrender.c b/nx-X11/programs/Xserver/hw/nxagent/NXrender.c
index 93760f482..b89b835db 100644
--- a/nx-X11/programs/Xserver/hw/nxagent/NXrender.c
+++ b/nx-X11/programs/Xserver/hw/nxagent/NXrender.c
@@ -362,7 +362,7 @@ ProcRenderQueryPictFormats (ClientPtr client)
 	swapl (&reply->numSubpixel, n);
     }
     WriteToClient(client, rlength, (char *) reply);
-    xfree (reply);
+    free (reply);
     return client->noClientException;
 }
 
@@ -730,7 +730,7 @@ ProcRenderTrapezoids (ClientPtr client)
 
       if (nxagentTrapezoidExtents != NullBox)
       {
-        xfree(nxagentTrapezoidExtents);
+        free(nxagentTrapezoidExtents);
 
         nxagentTrapezoidExtents = NullBox;
       }
@@ -1132,7 +1132,7 @@ ProcRenderCompositeGlyphs (ClientPtr client)
                       glyphsBase);
     }
 
-    xfree(nxagentGlyphsExtents);
+    free(nxagentGlyphsExtents);
     nxagentGlyphsExtents = NullBox;
 
     if (glyphsBase != glyphsLocal)
@@ -1140,7 +1140,7 @@ ProcRenderCompositeGlyphs (ClientPtr client)
     if (listsBase != listsLocal)
 	DEALLOCATE_LOCAL (listsBase);
     
-    xfree(elementsBase);
+    free(elementsBase);
 
     return client->noClientException;
 }
@@ -1228,14 +1228,14 @@ ProcRenderCreateCursor (ClientPtr client)
     srcbits = (unsigned char *)xalloc(nbytes_mono);
     if (!srcbits)
     {
-	xfree (argbbits);
+	free (argbbits);
 	return (BadAlloc);
     }
     mskbits = (unsigned char *)xalloc(nbytes_mono);
     if (!mskbits)
     {
-	xfree(argbbits);
-	xfree(srcbits);
+	free(argbbits);
+	free(srcbits);
 	return (BadAlloc);
     }
     bzero ((char *) mskbits, nbytes_mono);
@@ -1257,26 +1257,26 @@ ProcRenderCreateCursor (ClientPtr client)
 	pFormat = PictureMatchFormat (pScreen, 32, PICT_a8r8g8b8);
 	if (!pFormat)
 	{
-	    xfree (argbbits);
-	    xfree (srcbits);
-	    xfree (mskbits);
+	    free (argbbits);
+	    free (srcbits);
+	    free (mskbits);
 	    return (BadImplementation);
 	}
 	pPixmap = (*pScreen->CreatePixmap) (pScreen, width, height, 32);
 	if (!pPixmap)
 	{
-	    xfree (argbbits);
-	    xfree (srcbits);
-	    xfree (mskbits);
+	    free (argbbits);
+	    free (srcbits);
+	    free (mskbits);
 	    return (BadAlloc);
 	}
 	pPicture = CreatePicture (0, &pPixmap->drawable, pFormat, 0, 0, 
 				  client, &error);
 	if (!pPicture)
 	{
-	    xfree (argbbits);
-	    xfree (srcbits);
-	    xfree (mskbits);
+	    free (argbbits);
+	    free (srcbits);
+	    free (mskbits);
 	    return error;
 	}
 	(*pScreen->DestroyPixmap) (pPixmap);
@@ -1360,7 +1360,7 @@ ProcRenderCreateCursor (ClientPtr client)
     }
     else
     {
-	xfree (argbbits);
+	free (argbbits);
 	argbbits = 0;
     }
     
@@ -1488,7 +1488,7 @@ ProcRenderCreateAnimCursor (ClientPtr client)
 						       RT_CURSOR, SecurityReadAccess);
 	if (!cursors[i])
 	{
-	    xfree (cursors);
+	    free (cursors);
 	    client->errorValue = elt->cursor;
 	    return BadCursor;
 	}
@@ -1496,7 +1496,7 @@ ProcRenderCreateAnimCursor (ClientPtr client)
 	elt++;
     }
     ret = AnimCursorCreate (cursors, deltas, ncursor, &pCursor);
-    xfree (cursors);
+    free (cursors);
     if (ret != Success)
 	return ret;
 
diff --git a/nx-X11/programs/Xserver/hw/nxagent/NXresource.c b/nx-X11/programs/Xserver/hw/nxagent/NXresource.c
index 38bc05e51..4226a4435 100644
--- a/nx-X11/programs/Xserver/hw/nxagent/NXresource.c
+++ b/nx-X11/programs/Xserver/hw/nxagent/NXresource.c
@@ -313,7 +313,7 @@ FreeResource(XID id, RESTYPE skipDeleteFuncType)
                 #endif
 		if (rtype != skipDeleteFuncType)
 		    (*DeleteFuncs[rtype & TypeMask])(res->value, res->id);
-		xfree(res);
+		free(res);
 		if (*eltptr != elements)
 		    prev = head; /* prev may no longer be valid */
 		gotOne = TRUE;
@@ -349,7 +349,7 @@ FreeResourceByType(XID id, RESTYPE type, Bool skipFree)
                 #endif
 		if (!skipFree)
 		    (*DeleteFuncs[type & TypeMask])(res->value, res->id);
-		xfree(res);
+		free(res);
 		break;
 	    }
 	    else
diff --git a/nx-X11/programs/Xserver/hw/nxagent/NXshm.c b/nx-X11/programs/Xserver/hw/nxagent/NXshm.c
index 1ce72cbbe..08237440f 100644
--- a/nx-X11/programs/Xserver/hw/nxagent/NXshm.c
+++ b/nx-X11/programs/Xserver/hw/nxagent/NXshm.c
@@ -239,7 +239,7 @@ fbShmPutImage(dst, pGC, depth, format, w, h, sx, sy, sw, sh, dx, dy, data)
           fbGetImage((DrawablePtr) pPixmap, sx, sy, sw, sh, format, AllPlanes, newdata);
           (*pGC->ops->PutImage)(dst, pGC, depth, dx, dy, sw, sh, 0, format, newdata);
 
-          xfree(newdata);
+          free(newdata);
         }
         else
         {
diff --git a/nx-X11/programs/Xserver/hw/nxagent/NXwindow.c b/nx-X11/programs/Xserver/hw/nxagent/NXwindow.c
index 28aafd644..0071a15d0 100644
--- a/nx-X11/programs/Xserver/hw/nxagent/NXwindow.c
+++ b/nx-X11/programs/Xserver/hw/nxagent/NXwindow.c
@@ -336,7 +336,7 @@ DeleteWindow(void * value, XID wid)
       nxagentSetInstalledColormapWindows(pWin -> drawable.pScreen);
     }
 
-    xfree(pWin);
+    free(pWin);
     return Success;
 }
 
diff --git a/nx-X11/programs/Xserver/hw/nxagent/Pixmap.c b/nx-X11/programs/Xserver/hw/nxagent/Pixmap.c
index f429f1499..0eabf1262 100644
--- a/nx-X11/programs/Xserver/hw/nxagent/Pixmap.c
+++ b/nx-X11/programs/Xserver/hw/nxagent/Pixmap.c
@@ -487,7 +487,7 @@ Bool nxagentDestroyPixmap(PixmapPtr pPixmap)
     FreeResource(pPixmapPriv -> mid, RT_NONE);
   }
 
-  xfree(pPixmap);
+  free(pPixmap);
 
   return True;
 }
@@ -1259,7 +1259,7 @@ void nxagentSynchronizeShmPixmap(DrawablePtr pDrawable, int xPict, int yPict,
       nxagentPutImage(pDrawable, pGC, depth, xPict, yPict,
                           width, height, 0, format, data);
 
-      xfree(data);
+      free(data);
     }
     #ifdef WARNING
     else
@@ -1409,7 +1409,7 @@ FIXME: If the pixmap has a different depth from the window, the
 
     if (data != NULL)
     {
-      xfree(data);
+      free(data);
     }
 
     return False;
@@ -1571,7 +1571,7 @@ Bool nxagentFbOnShadowDisplay()
 
     if (data)
     {
-      xfree(data);
+      free(data);
     }
 
     return False;
diff --git a/nx-X11/programs/Xserver/hw/nxagent/Reconnect.c b/nx-X11/programs/Xserver/hw/nxagent/Reconnect.c
index 00d434bf4..587e9a564 100644
--- a/nx-X11/programs/Xserver/hw/nxagent/Reconnect.c
+++ b/nx-X11/programs/Xserver/hw/nxagent/Reconnect.c
@@ -444,7 +444,7 @@ Bool nxagentReconnectSession(void)
 
   if (nxagentKeyboard)
   {
-    xfree(nxagentKeyboard);
+    free(nxagentKeyboard);
 
     nxagentKeyboard = NULL;
   }
@@ -609,7 +609,7 @@ Bool nxagentReconnectSession(void)
 
   if (nxagentOldKeyboard != NULL)
   {
-    xfree(nxagentOldKeyboard);
+    free(nxagentOldKeyboard);
 
     nxagentOldKeyboard = NULL;
   }
@@ -734,7 +734,7 @@ nxagentReconnectError:
 
   if (nxagentOldKeyboard != NULL)
   {
-    xfree(nxagentOldKeyboard);
+    free(nxagentOldKeyboard);
 
     nxagentOldKeyboard = NULL;
   }
diff --git a/nx-X11/programs/Xserver/hw/nxagent/Render.c b/nx-X11/programs/Xserver/hw/nxagent/Render.c
index 8c822319d..36ce6a74f 100644
--- a/nx-X11/programs/Xserver/hw/nxagent/Render.c
+++ b/nx-X11/programs/Xserver/hw/nxagent/Render.c
@@ -2284,7 +2284,7 @@ void nxagentAddGlyphs(GlyphSetPtr glyphSet, Glyph *gids, xGlyphInfo *gi,
 
   if (normalizedImages != images)
   {
-    xfree(normalizedImages);
+    free(normalizedImages);
   }
 
   #ifdef DEBUG
@@ -2392,7 +2392,7 @@ FIXME: Is this useful or just a waste of bandwidth?
                           nparams);
   #endif
 
-  Xfree(szFilter);
+  free(szFilter);
 }
 
 
diff --git a/nx-X11/programs/Xserver/hw/nxagent/Rootless.c b/nx-X11/programs/Xserver/hw/nxagent/Rootless.c
index 49877f9d7..6947371ff 100644
--- a/nx-X11/programs/Xserver/hw/nxagent/Rootless.c
+++ b/nx-X11/programs/Xserver/hw/nxagent/Rootless.c
@@ -389,7 +389,7 @@ void nxagentRootlessRestack(unsigned long children[], unsigned int nchildren)
 
   #endif
 
-  xfree(toplevel);
+  free(toplevel);
 
   return;
 }
@@ -797,7 +797,7 @@ int nxagentExportProperty(pWin, property, type, format, mode, nUnits, value)
 
   if (freeMem)
   {
-    xfree(output);
+    free(output);
   }
 
   return export;
@@ -1104,7 +1104,7 @@ void nxagentImportProperty(Window window,
 
   if (freeMem)
   {
-    xfree(output);
+    free(output);
   }
 
   return;
@@ -1156,7 +1156,7 @@ void nxagentRemovePropertyFromList()
       nxagentPropertyList.last = NULL;
     }
 
-    xfree(tmp);
+    free(tmp);
   }
 }
 
diff --git a/nx-X11/programs/Xserver/hw/nxagent/Screen.c b/nx-X11/programs/Xserver/hw/nxagent/Screen.c
index de8c97532..a4c6fc2db 100644
--- a/nx-X11/programs/Xserver/hw/nxagent/Screen.c
+++ b/nx-X11/programs/Xserver/hw/nxagent/Screen.c
@@ -1358,8 +1358,8 @@ Bool nxagentOpenScreen(int index, ScreenPtr pScreen,
      * by fbScreenInit with our own.
      */
 
-    xfree(pScreen -> visuals);
-    xfree(pScreen -> allowedDepths);
+    free(pScreen -> visuals);
+    free(pScreen -> allowedDepths);
 
     pScreen -> visuals = visuals;
     pScreen -> allowedDepths = depths;
@@ -2079,18 +2079,18 @@ Bool nxagentCloseScreen(int index, ScreenPtr pScreen)
 
   for (i = 0; i < pScreen->numDepths; i++)
   {
-    xfree(pScreen->allowedDepths[i].vids);
+    free(pScreen->allowedDepths[i].vids);
   }
 
   /*
    * Free the frame buffer.
    */
 
-  xfree(((PixmapPtr)pScreen -> devPrivate) -> devPrivate.ptr);
+  free(((PixmapPtr)pScreen -> devPrivate) -> devPrivate.ptr);
 
-  xfree(pScreen->allowedDepths);
-  xfree(pScreen->visuals);
-  xfree(pScreen->devPrivate);
+  free(pScreen->allowedDepths);
+  free(pScreen->visuals);
+  free(pScreen->devPrivate);
 
   /*
    * Reset the geometry and alpha information
@@ -3065,7 +3065,7 @@ int nxagentShadowPoll(PixmapPtr nxagentShadowPixmapPtr, GCPtr nxagentShadowGCPtr
 
       if (tBuffer)
       {
-        xfree(tBuffer);
+        free(tBuffer);
       }
 
       tBuffer = xalloc(length);
@@ -3125,7 +3125,7 @@ int nxagentShadowPoll(PixmapPtr nxagentShadowPixmapPtr, GCPtr nxagentShadowGCPtr
 
     if (tBuffer)
     {
-      xfree(tBuffer);
+      free(tBuffer);
     }
 
     RegionUninit(&updateRegion);
@@ -3346,7 +3346,7 @@ void nxagentShadowAdaptDepth(unsigned int width, unsigned int height,
 
   if (cBuffer != NULL)
   {
-    xfree(cBuffer);
+    free(cBuffer);
   }
 }
 
@@ -3529,7 +3529,7 @@ FIXME: The port information is not used at the moment and produces a
                              strlen(local_buf), local_buf, 1);
       }
 
-      xfree(local_buf);
+      free(local_buf);
     }
   }
 }
@@ -3769,7 +3769,7 @@ int nxagentAdjustRandRXinerama(ScreenPtr pScreen)
       number = 1;
 
       if (screeninfo) {
-	xfree(screeninfo);
+	free(screeninfo);
       }
       if (!(screeninfo = xalloc(sizeof(XineramaScreenInfo)))) {
 	return FALSE;
@@ -4061,7 +4061,7 @@ int nxagentAdjustRandRXinerama(ScreenPtr pScreen)
 
     /* release allocated memory */
     if (screeninfo) {
-      xfree(screeninfo);
+      free(screeninfo);
       screeninfo = NULL;
     }
 
@@ -4170,7 +4170,7 @@ void nxagentSaveAreas(PixmapPtr pPixmap, RegionPtr prgnSave, int xorg, int yorg,
 
   XSetClipRectangles(nxagentDisplay, gc, 0, 0, pRects, nRects, Unsorted);
 
-  xfree((char *) pRects);
+  free((char *) pRects);
 
   extents = *RegionExtents(&cleanRegion);
 
@@ -4316,7 +4316,7 @@ void nxagentRestoreAreas(PixmapPtr pPixmap, RegionPtr prgnRestore, int xorg,
 
   XSetClipRectangles(nxagentDisplay, gc, 0, 0, pRects, nRects, Unsorted);
 
-  xfree(pRects);
+  free(pRects);
 
   extents = *RegionExtents(clipRegion);
 
@@ -4537,7 +4537,7 @@ FIXME
 
     if (data)
     {
-      xfree(data);
+      free(data);
     }
 
     return;
@@ -4573,7 +4573,7 @@ FIXME
 
   if (data != NULL)
   {
-    xfree(data);
+    free(data);
   }
 
 /*
@@ -4628,7 +4628,7 @@ void nxagentFbRestoreArea(PixmapPtr pPixmap, WindowPtr pWin, int xSrc, int ySrc,
 
     if (data)
     {
-      xfree(data);
+      free(data);
     }
 
     return;
@@ -4691,7 +4691,7 @@ FIXME
 FIXME
   if (data)
   {
-    xfree(data);
+    free(data);
   }
 */
 }