diff --git a/Xext/xaverius/xaverius.c b/Xext/xaverius/xaverius.c
index 0b54a1f7e3..ece77ae4aa 100644
--- a/Xext/xaverius/xaverius.c
+++ b/Xext/xaverius/xaverius.c
@@ -50,4 +50,5 @@ void
 xaverius_extension_fini(void)
 {
     XaveriusRegistryFini();
+    xaverius_device_fini();
 }
diff --git a/Xext/xaverius/xaverius.h b/Xext/xaverius/xaverius.h
index f18076e36f..dbdb939fb5 100644
--- a/Xext/xaverius/xaverius.h
+++ b/Xext/xaverius/xaverius.h
@@ -280,6 +280,8 @@ typedef struct _XaveriusMemoryRec {
 void xaverius_extension_init(void);
 void xaverius_extension_fini(void);
 
+void XaveriusExtensionInit(void);
+
 int ProcXAveriusDispatch(ClientPtr client);
 int SProcXAveriusDispatch(ClientPtr client);