@@ -108,19 +108,21 @@
 #endif
 
 #if defined(OF_FILE_MANAGER_SUPPORTS_OWNER) && defined(OF_HAVE_THREADS)
 static OFMutex *passwdMutex;
 
-OF_DESTRUCTOR()
+void
+releasePasswdMutex(void)
 {
 	[passwdMutex release];
 }
 #endif
 #if !defined(HAVE_READDIR_R) && defined(OF_HAVE_THREADS) && !defined(OF_WINDOWS)
 static OFMutex *readdirMutex;
 
-OF_DESTRUCTOR()
+void
+releaseReaddirMutex(void)
 {
 	[readdirMutex release];
 }
 #endif
 
@@ -543,13 +545,15 @@
 	if (self != [OFFileURLHandler class])
 		return;
 
 #if defined(OF_FILE_MANAGER_SUPPORTS_OWNER) && defined(OF_HAVE_THREADS)
 	passwdMutex = [[OFMutex alloc] init];
+	atexit(releasePasswdMutex);
 #endif
 #if !defined(HAVE_READDIR_R) && !defined(OF_WINDOWS) && defined(OF_HAVE_THREADS)
 	readdirMutex = [[OFMutex alloc] init];
+	atexit(releaseReaddirMutex);
 #endif
 
 #ifdef OF_WINDOWS
 	if ((module = LoadLibrary("msvcrt.dll")) != NULL)
 		func__wutime64 = (int (*)(const wchar_t *,