diff --git a/dix/atom.c b/dix/atom.c
index 194b2baec..60147366b 100644
--- a/dix/atom.c
+++ b/dix/atom.c
@@ -199,7 +199,7 @@ InitAtoms(void)
 {
     FreeAllAtoms();
     tableLength = InitialTableSize;
-    nodeTable = xallocarray(InitialTableSize, sizeof(NodePtr));
+    nodeTable = calloc(InitialTableSize, sizeof(NodePtr));
     if (!nodeTable)
         AtomError();
     nodeTable[None] = NULL;
diff --git a/dix/colormap.c b/dix/colormap.c
index 9a8be28e2..3179a44ba 100644
--- a/dix/colormap.c
+++ b/dix/colormap.c
@@ -308,7 +308,7 @@ CreateColormap(Colormap mid, ScreenPtr pScreen, VisualPtr pVisual,
         for (pent = &pmap->red[size - 1]; pent >= pmap->red; pent--)
             pent->refcnt = AllocPrivate;
         pmap->freeRed = 0;
-        ppix = xallocarray(size, sizeof(Pixel));
+        ppix = calloc(size, sizeof(Pixel));
         if (!ppix) {
             free(pmap);
             return BadAlloc;
@@ -349,7 +349,7 @@ CreateColormap(Colormap mid, ScreenPtr pScreen, VisualPtr pVisual,
             for (pent = &pmap->green[size - 1]; pent >= pmap->green; pent--)
                 pent->refcnt = AllocPrivate;
             pmap->freeGreen = 0;
-            ppix = xallocarray(size, sizeof(Pixel));
+            ppix = calloc(size, sizeof(Pixel));
             if (!ppix) {
                 free(pmap->clientPixelsRed[client]);
                 free(pmap);
@@ -364,7 +364,7 @@ CreateColormap(Colormap mid, ScreenPtr pScreen, VisualPtr pVisual,
             for (pent = &pmap->blue[size - 1]; pent >= pmap->blue; pent--)
                 pent->refcnt = AllocPrivate;
             pmap->freeBlue = 0;
-            ppix = xallocarray(size, sizeof(Pixel));
+            ppix = calloc(size, sizeof(Pixel));
             if (!ppix) {
                 free(pmap->clientPixelsGreen[client]);
                 free(pmap->clientPixelsRed[client]);
@@ -714,7 +714,7 @@ doUpdateColors(ColormapPtr pmap)
 
     pVisual = pmap->pVisual;
     size = pVisual->ColormapEntries;
-    defs = xallocarray(size, sizeof(xColorItem));
+    defs = calloc(size, sizeof(xColorItem));
     if (!defs)
         return;
     n = 0;
@@ -1660,9 +1660,9 @@ AllocDirect(int client, ColormapPtr pmap, int c, int r, int g, int b,
     for (p = pixels; p < pixels + c; p++)
         *p = 0;
 
-    ppixRed = xallocarray(npixR, sizeof(Pixel));
-    ppixGreen = xallocarray(npixG, sizeof(Pixel));
-    ppixBlue = xallocarray(npixB, sizeof(Pixel));
+    ppixRed = calloc(npixR, sizeof(Pixel));
+    ppixGreen = calloc(npixG, sizeof(Pixel));
+    ppixBlue = calloc(npixB, sizeof(Pixel));
     if (!ppixRed || !ppixGreen || !ppixBlue) {
         free(ppixBlue);
         free(ppixGreen);
@@ -1760,7 +1760,7 @@ AllocPseudo(int client, ColormapPtr pmap, int c, int r, Bool contig,
     npix = c << r;
     if ((r >= 32) || (npix > pmap->freeRed) || (npix < c))
         return BadAlloc;
-    if (!(ppixTemp = xallocarray(npix, sizeof(Pixel))))
+    if (!(ppixTemp = calloc(npix, sizeof(Pixel))))
         return BadAlloc;
     ok = AllocCP(pmap, pmap->red, c, r, contig, ppixTemp, pmask);
 
@@ -1972,7 +1972,7 @@ AllocShared(ColormapPtr pmap, Pixel * ppix, int c, int r, int g, int b,
 
     npixClientNew = c << (r + g + b);
     npixShared = (c << r) + (c << g) + (c << b);
-    psharedList = xallocarray(npixShared, sizeof(SHAREDCOLOR *));
+    psharedList = calloc(npixShared, sizeof(SHAREDCOLOR *));
     if (!psharedList)
         return FALSE;
     ppshared = psharedList;
@@ -2481,8 +2481,8 @@ IsMapInstalled(Colormap map, WindowPtr pWin)
     Colormap *pmaps;
     int imap, nummaps, found;
 
-    pmaps = xallocarray(pWin->drawable.pScreen->maxInstalledCmaps,
-                        sizeof(Colormap));
+    pmaps = calloc(pWin->drawable.pScreen->maxInstalledCmaps,
+                   sizeof(Colormap));
     if (!pmaps)
         return FALSE;
     nummaps = (*pWin->drawable.pScreen->ListInstalledColormaps)
diff --git a/dix/devices.c b/dix/devices.c
index 310364730..b1069b066 100644
--- a/dix/devices.c
+++ b/dix/devices.c
@@ -1554,8 +1554,8 @@ InitStringFeedbackClassDeviceStruct(DeviceIntPtr dev,
     feedc->ctrl.num_symbols_displayed = 0;
     feedc->ctrl.max_symbols = max_symbols;
     feedc->ctrl.symbols_supported =
-        xallocarray(num_symbols_supported, sizeof(KeySym));
-    feedc->ctrl.symbols_displayed = xallocarray(max_symbols, sizeof(KeySym));
+        calloc(num_symbols_supported, sizeof(KeySym));
+    feedc->ctrl.symbols_displayed = calloc(max_symbols, sizeof(KeySym));
     if (!feedc->ctrl.symbols_supported || !feedc->ctrl.symbols_displayed) {
         free(feedc->ctrl.symbols_supported);
         free(feedc->ctrl.symbols_displayed);
diff --git a/dix/dispatch.c b/dix/dispatch.c
index b3e5feacc..b6b2eb6eb 100644
--- a/dix/dispatch.c
+++ b/dix/dispatch.c
@@ -1089,7 +1089,7 @@ ProcQueryTree(ClientPtr client)
     if (numChildren) {
         int curChild = 0;
 
-        childIDs = xallocarray(numChildren, sizeof(Window));
+        childIDs = calloc(numChildren, sizeof(Window));
         if (!childIDs)
             return BadAlloc;
         for (pChild = pWin->lastChild; pChild != pHead;
diff --git a/dix/dixfonts.c b/dix/dixfonts.c
index dd617d99c..f865b5c80 100644
--- a/dix/dixfonts.c
+++ b/dix/dixfonts.c
@@ -426,7 +426,7 @@ OpenFont(ClientPtr client, XID fid, Mask flags, unsigned lenfname,
      * copy the current FPE list, so that if it gets changed by another client
      * while we're blocking, the request still appears atomic
      */
-    c->fpe_list = xallocarray(num_fpes, sizeof(FontPathElementPtr));
+    c->fpe_list = calloc(num_fpes, sizeof(FontPathElementPtr));
     if (!c->fpe_list) {
         free((void *) c->fontname);
         free(c);
@@ -816,7 +816,7 @@ ListFonts(ClientPtr client, unsigned char *pattern, unsigned length,
 
     if (!(c = malloc(sizeof *c)))
         return BadAlloc;
-    c->fpe_list = xallocarray(num_fpes, sizeof(FontPathElementPtr));
+    c->fpe_list = calloc(num_fpes, sizeof(FontPathElementPtr));
     if (!c->fpe_list) {
         free(c);
         return BadAlloc;
@@ -1062,7 +1062,7 @@ StartListFontsWithInfo(ClientPtr client, int length, unsigned char *pattern,
 
     if (!(c = malloc(sizeof *c)))
         goto badAlloc;
-    c->fpe_list = xallocarray(num_fpes, sizeof(FontPathElementPtr));
+    c->fpe_list = calloc(num_fpes, sizeof(FontPathElementPtr));
     if (!c->fpe_list) {
         free(c);
         goto badAlloc;
@@ -1428,7 +1428,7 @@ doImageText(ClientPtr client, ITclosurePtr c)
             *new_closure = *c;
             c = new_closure;
 
-            data = xallocarray(c->nChars, itemSize);
+            data = calloc(c->nChars, itemSize);
             if (!data) {
                 free(c);
                 c = old_closure;
@@ -1581,7 +1581,7 @@ SetFontPathElements(int npaths, unsigned char *paths, int *bad, Bool persist)
     unsigned char *cp = paths;
     FontPathElementPtr fpe = NULL, *fplist;
 
-    fplist = xallocarray(npaths, sizeof(FontPathElementPtr));
+    fplist = calloc(npaths, sizeof(FontPathElementPtr));
     if (!fplist) {
         *bad = 0;
         return BadAlloc;
diff --git a/dix/grabs.c b/dix/grabs.c
index 8409a0bf8..bbd70bf53 100644
--- a/dix/grabs.c
+++ b/dix/grabs.c
@@ -599,10 +599,10 @@ DeletePassiveGrabFromList(GrabPtr pMinuendGrab)
         i++;
     if (!i)
         return TRUE;
-    deletes = xallocarray(i, sizeof(GrabPtr));
-    adds = xallocarray(i, sizeof(GrabPtr));
-    updates = xallocarray(i, sizeof(Mask **));
-    details = xallocarray(i, sizeof(Mask *));
+    deletes = calloc(i, sizeof(GrabPtr));
+    adds = calloc(i, sizeof(GrabPtr));
+    updates = calloc(i, sizeof(Mask **));
+    details = calloc(i, sizeof(Mask *));
     if (!deletes || !adds || !updates || !details) {
         free(details);
         free(updates);
diff --git a/dix/property.c b/dix/property.c
index e5e579f95..f8d8ce14b 100644
--- a/dix/property.c
+++ b/dix/property.c
@@ -149,8 +149,8 @@ ProcRotateProperties(ClientPtr client)
         return rc;
 
     atoms = (Atom *) &stuff[1];
-    props = xallocarray(stuff->nAtoms, sizeof(PropertyPtr));
-    saved = xallocarray(stuff->nAtoms, sizeof(PropertyRec));
+    props = calloc(stuff->nAtoms, sizeof(PropertyPtr));
+    saved = calloc(stuff->nAtoms, sizeof(PropertyRec));
     if (!props || !saved) {
         rc = BadAlloc;
         goto out;
@@ -331,7 +331,7 @@ dixChangeWindowProperty(ClientPtr pClient, WindowPtr pWin, Atom property,
             /* do nothing */
         }
         else if (mode == PropModeAppend) {
-            data = xallocarray(pProp->size + len, sizeInBytes);
+            data = calloc(pProp->size + len, sizeInBytes);
             if (!data)
                 return BadAlloc;
             memcpy(data, pProp->data, pProp->size * sizeInBytes);
@@ -340,7 +340,7 @@ dixChangeWindowProperty(ClientPtr pClient, WindowPtr pWin, Atom property,
             pProp->size += len;
         }
         else if (mode == PropModePrepend) {
-            data = xallocarray(len + pProp->size, sizeInBytes);
+            data = calloc(len + pProp->size, sizeInBytes);
             if (!data)
                 return BadAlloc;
             memcpy(data + totalSize, pProp->data, pProp->size * sizeInBytes);
@@ -592,7 +592,7 @@ ProcListProperties(ClientPtr client)
         numProps++;
 
     if (numProps) {
-        pAtoms = xallocarray(numProps, sizeof(Atom));
+        pAtoms = calloc(numProps, sizeof(Atom));
         if (!pAtoms)
             return BadAlloc;
 
diff --git a/dix/resource.c b/dix/resource.c
index 7542f0c42..f1f64792f 100644
--- a/dix/resource.c
+++ b/dix/resource.c
@@ -852,10 +852,10 @@ RebuildTable(int client)
      */
 
     j = 2 * clientTable[client].buckets;
-    tails =  xallocarray(j, sizeof(ResourcePtr *));
+    tails =  calloc(j, sizeof(ResourcePtr *));
     if (!tails)
         return;
-    resources =  xallocarray(j, sizeof(ResourcePtr));
+    resources =  calloc(j, sizeof(ResourcePtr));
     if (!resources) {
         free(tails);
         return;