diff --git a/src/compat-api.h b/src/compat-api.h
index 88589e2..62d9481 100644
--- a/src/compat-api.h
+++ b/src/compat-api.h
@@ -28,10 +28,6 @@
 #ifndef COMPAT_API_H
 #define COMPAT_API_H
 
-#ifndef XNFcalloc
-#define XNFcalloc(n) XNFcallocarray(n, 1)
-#endif
-
 #ifndef GLYPH_HAS_GLYPH_PICTURE_ACCESSOR
 #define GetGlyphPicture(g, s) GlyphPicture((g))[(s)->myNum]
 #define SetGlyphPicture(g, s, p) GlyphPicture((g))[(s)->myNum] = p
diff --git a/src/g80_dac.c b/src/g80_dac.c
index 7a85bcb..8f55781 100644
--- a/src/g80_dac.c
+++ b/src/g80_dac.c
@@ -194,7 +194,10 @@ static const xf86OutputFuncsRec G80DacOutputFuncs = {
 xf86OutputPtr
 G80CreateDac(ScrnInfoPtr pScrn, ORNum or)
 {
-    G80OutputPrivPtr pPriv = XNFcalloc(sizeof(*pPriv));
+    G80OutputPrivPtr pPriv = calloc(1, sizeof(*pPriv));
+    if (!pPriv)
+        return NULL;
+
     xf86OutputPtr output;
     char orName[5];
 
diff --git a/src/g80_display.c b/src/g80_display.c
index 10202ec..553b260 100644
--- a/src/g80_display.c
+++ b/src/g80_display.c
@@ -780,7 +780,7 @@ G80DispCreateCrtcs(ScrnInfoPtr pScrn)
         crtc = xf86CrtcCreate(pScrn, &g80_crtc_funcs);
         if(!crtc) return;
 
-        g80_crtc = XNFcalloc(sizeof(*g80_crtc));
+        g80_crtc = calloc(1, sizeof(*g80_crtc));
         g80_crtc->head = head;
         g80_crtc->dither = pNv->Dither;
         crtc->driver_private = g80_crtc;
diff --git a/src/g80_sor.c b/src/g80_sor.c
index 7fbabc4..b7b45ad 100644
--- a/src/g80_sor.c
+++ b/src/g80_sor.c
@@ -442,7 +442,9 @@ static const xf86OutputFuncsRec G80SorLVDSOutputFuncs = {
 static DisplayModePtr
 ReadLVDSNativeMode(G80Ptr pNv, const int off)
 {
-    DisplayModePtr mode = XNFcalloc(sizeof(DisplayModeRec));
+    DisplayModePtr mode = calloc(1, sizeof(DisplayModeRec));
+    if (!mode)
+        return NULL;
     const CARD32 size = pNv->reg[(0x00610B4C+off)/4];
     const int width = size & 0x3fff;
     const int height = (size >> 16) & 0x3fff;
@@ -481,7 +483,9 @@ xf86OutputPtr
 G80CreateSor(ScrnInfoPtr pScrn, ORNum or, PanelType panelType)
 {
     G80Ptr pNv = G80PTR(pScrn);
-    G80OutputPrivPtr pPriv = XNFcalloc(sizeof(*pPriv));
+    G80OutputPrivPtr pPriv = calloc(1, sizeof(*pPriv));
+    if (!pPriv)
+        return NULL;
     const int off = 0x800 * or;
     xf86OutputPtr output;
     char orName[5];
diff --git a/src/nv_driver.c b/src/nv_driver.c
index 7400b26..de42ba4 100644
--- a/src/nv_driver.c
+++ b/src/nv_driver.c
@@ -695,7 +695,10 @@ NVGetRec(ScrnInfoPtr pScrn)
     if (pScrn->driverPrivate != NULL)
         return TRUE;
 
-    pScrn->driverPrivate = XNFcalloc(sizeof(NVRec));
+    pScrn->driverPrivate = calloc(1, sizeof(NVRec));
+    if (!(pScrn->driverPrivate))
+        return FALSE;
+
     /* Initialise it */
 
     return TRUE;
@@ -1929,7 +1932,9 @@ NVPreInit(ScrnInfoPtr pScrn, int flags)
      * and what sort of modes they can be used for.
      */
 
-    clockRanges = XNFcalloc(sizeof(ClockRange));
+    clockRanges = calloc(1, sizeof(ClockRange));
+    if (!clockRanges)
+        return FALSE;
     clockRanges->next = NULL;
     clockRanges->minClock = pNv->MinVClockFreqKHz;
     clockRanges->maxClock = pNv->MaxVClockFreqKHz;
diff --git a/src/riva_driver.c b/src/riva_driver.c
index 70adf26..7f4f556 100644
--- a/src/riva_driver.c
+++ b/src/riva_driver.c
@@ -108,7 +108,7 @@ RivaGetRec(ScrnInfoPtr pScrn)
     if (pScrn->driverPrivate != NULL)
         return TRUE;
 
-    pScrn->driverPrivate = XNFcalloc(sizeof(RivaRec));
+    pScrn->driverPrivate = calloc(1, sizeof(RivaRec));
     /* Initialise it */
 
     RivaPTR(pScrn)->Dac = DacInit;
@@ -695,7 +695,9 @@ RivaPreInit(ScrnInfoPtr pScrn, int flags)
     pRiva->MinClock = 12000;
     pRiva->MaxClock = pRiva->riva.MaxVClockFreqKHz;
 
-    clockRanges = XNFcalloc(sizeof(ClockRange));
+    clockRanges = calloc(1, sizeof(ClockRange));
+    if (!clockRanges)
+        return FALSE;
     clockRanges->next = NULL;
     clockRanges->minClock = pRiva->MinClock;
     clockRanges->maxClock = pRiva->MaxClock;