diff --git a/Xext/xaverius/device.c b/Xext/xaverius/device.c
index 478287d218..b3f85e5d50 100644
--- a/Xext/xaverius/device.c
+++ b/Xext/xaverius/device.c
@@ -372,8 +372,7 @@ xaverius_device_init(void)
     XaveriusFenceType = CreateNewResourceType(NULL, "XAveriusFence");
 }
 
-void
-xaverius_device_fini(void)
+void XaveriusDevicesFini(void)
 {
     if (XaveriusLogicalDeviceType)
         FreeResourceByType(0, XaveriusLogicalDeviceType, TRUE);
diff --git a/Xext/xaverius/init.c b/Xext/xaverius/init.c
index b630a859d9..91d7301ca1 100644
--- a/Xext/xaverius/init.c
+++ b/Xext/xaverius/init.c
@@ -25,6 +25,7 @@ Atom xaverius_atom_timeline_semaphore = 0;
 static void XaveriusExtensionFini(ExtensionEntry *extEntry)
 {
     XaveriusRegistryFini();
+    XaveriusDevicesFini();
 }
 
 void XaveriusExtensionInit(void)
diff --git a/Xext/xaverius/xaverius.c b/Xext/xaverius/xaverius.c
index ece77ae4aa..aa99986ad9 100644
--- a/Xext/xaverius/xaverius.c
+++ b/Xext/xaverius/xaverius.c
@@ -49,6 +49,6 @@ xaverius_extension_init(void)
 void
 xaverius_extension_fini(void)
 {
+    XaveriusDevicesFini();
     XaveriusRegistryFini();
-    xaverius_device_fini();
 }
diff --git a/Xext/xaverius/xaverius.h b/Xext/xaverius/xaverius.h
index dbdb939fb5..b6179f5bfe 100644
--- a/Xext/xaverius/xaverius.h
+++ b/Xext/xaverius/xaverius.h
@@ -314,7 +314,6 @@ int ProcXAveriusShaderModuleData(ClientPtr client);
 int ProcXAveriusCreateCommandPool(ClientPtr client);
 
 void xaverius_device_init(void);
-void xaverius_device_fini(void);
 
 extern RESTYPE XaveriusPhysicalDeviceType;
 extern RESTYPE XaveriusLogicalDeviceType;
diff --git a/Xext/xaverius/xaverius_intern.h b/Xext/xaverius/xaverius_intern.h
index 17a28efbed..11af71a317 100644
--- a/Xext/xaverius/xaverius_intern.h
+++ b/Xext/xaverius/xaverius_intern.h
@@ -45,6 +45,10 @@ int ProcXaveriusEnumeratePhysicalDevices(ClientPtr client);
 int ProcXaveriusGetPhysicalDeviceProperty(ClientPtr client);
 int ProcXaveriusGetPhysicalDeviceQueueFamilyProperties(ClientPtr client);
 
+/* Device resources */
+void XaveriusDevicesInit(void);
+void XaveriusDevicesFini(void);
+
 /* Registry functions */
 void XaveriusRegistryInit(void);
 void XaveriusRegistryFini(void);