diff --git a/Xi/extinit.c b/Xi/extinit.c
index 4dad0b5e9..c2306669c 100644
--- a/Xi/extinit.c
+++ b/Xi/extinit.c
@@ -1207,7 +1207,7 @@ void
 AssignTypeAndName(DeviceIntPtr dev, Atom type, const char *name)
 {
     dev->xinput_type = type;
-    dev->name = strdup(name);
+    dev->name = XNFstrdup(name);
 }
 
 /***********************************************************************
@@ -1356,9 +1356,9 @@ XInputExtensionInit(void)
         memset(&xi_all_devices, 0, sizeof(xi_all_devices));
         memset(&xi_all_master_devices, 0, sizeof(xi_all_master_devices));
         xi_all_devices.id = XIAllDevices;
-        xi_all_devices.name = strdup("XIAllDevices");
+        xi_all_devices.name = XNFstrdup("XIAllDevices");
         xi_all_master_devices.id = XIAllMasterDevices;
-        xi_all_master_devices.name = strdup("XIAllMasterDevices");
+        xi_all_master_devices.name = XNFstrdup("XIAllMasterDevices");
 
         inputInfo.all_devices = &xi_all_devices;
         inputInfo.all_master_devices = &xi_all_master_devices;