diff --git a/glx/glxscreens.c b/glx/glxscreens.c
index e766e2579..2daa7e7ce 100644
--- a/glx/glxscreens.c
+++ b/glx/glxscreens.c
@@ -326,7 +326,7 @@ __glXScreenInit(__GLXscreen * pGlxScreen, ScreenPtr pScreen)
         return;
 
     pGlxScreen->pScreen = pScreen;
-    pGlxScreen->GLextensions = strdup(GLServerExtensions);
+    pGlxScreen->GLextensions = XNFstrdup(GLServerExtensions);
     pGlxScreen->GLXextensions = NULL;
 
     pGlxScreen->CloseScreen = pScreen->CloseScreen;
@@ -341,7 +341,7 @@ __glXScreenInit(__GLXscreen * pGlxScreen, ScreenPtr pScreen)
     pGlxScreen->numFBConfigs = i;
 
     pGlxScreen->visuals =
-        calloc(pGlxScreen->numFBConfigs, sizeof(__GLXconfig *));
+        XNFcallocarray(pGlxScreen->numFBConfigs, sizeof(__GLXconfig *));
 
     /* First, try to choose featureful FBconfigs for the existing X visuals.
      * Note that if multiple X visuals end up with the same FBconfig being