Index: src/OFDNSResolver.m
==================================================================
--- src/OFDNSResolver.m
+++ src/OFDNSResolver.m
@@ -105,11 +105,11 @@
 static struct SocketIFace *ISocket = NULL;
 
 OF_DESTRUCTOR()
 {
 	if (ISocket != NULL)
-		DropInterface(ISocket);
+		DropInterface((struct Interface *)ISocket);
 
 	if (SocketBase != NULL)
 		CloseLibrary(SocketBase);
 }
 #endif

Index: src/OFFile.m
==================================================================
--- src/OFFile.m
+++ src/OFFile.m
@@ -117,11 +117,11 @@
 	    iter = iter->next)
 		Close(iter->handle);
 
 # ifdef OF_AMIGAOS4
 	if (IDOS != NULL)
-		DropInterface(IDOS);
+		DropInterface((struct Interface *)IDOS);
 
 	if (DOSBase != NULL)
 		CloseLibrary(DOSBase);
 # endif
 }

Index: src/OFFileManager.m
==================================================================
--- src/OFFileManager.m
+++ src/OFFileManager.m
@@ -110,10 +110,11 @@
     @"of_file_type_character_special";
 const of_file_type_t of_file_type_block_special = @"of_file_type_block_special";
 const of_file_type_t of_file_type_socket = @"of_file_type_socket";
 
 #ifdef OF_AMIGAOS4
+# define CurrentDir(lock) SetCurrentDir(lock)
 extern struct ExecIFace *IExec;
 static struct Library *DOSBase = NULL;
 static struct DOSIFace *IDOS = NULL;
 #endif
 
@@ -128,11 +129,11 @@
 	if (dirChanged)
 		UnLock(CurrentDir(originalDirLock));
 
 # ifdef OF_AMIGAOS4
 	if (IDOS != NULL)
-		DropInterface(IDOS);
+		DropInterface((struct Interface *)IDOS);
 
 	if (DOSBase != NULL)
 		CloseLibrary(DOSBase);
 # endif
 }

Index: src/OFLocale.m
==================================================================
--- src/OFLocale.m
+++ src/OFLocale.m
@@ -50,17 +50,17 @@
 static struct LocaleIFace *ILocale = NULL;
 
 OF_DESTRUCTOR()
 {
 	if (ILocale != NULL)
-		DropInterface(ILocale);
+		DropInterface((struct Interface *)ILocale);
 
 	if (LocaleBase != NULL)
 		CloseLibrary(LocaleBase);
 
 	if (IDOS != NULL)
-		DropInterface(IDOS);
+		DropInterface((struct Interface *)IDOS);
 
 	if (DOSBase != NULL)
 		CloseLibrary(DOSBase);
 }
 #endif

Index: src/OFStdIOStream.m
==================================================================
--- src/OFStdIOStream.m
+++ src/OFStdIOStream.m
@@ -78,11 +78,11 @@
 	[of_stdout dealloc];
 	[of_stderr dealloc];
 
 # ifdef OF_AMIGAOS4
 	if (IDOS != NULL)
-		DropInterface(IDOS);
+		DropInterface((struct Interface *)IDOS);
 
 	if (DOSBase != NULL)
 		CloseLibrary(DOSBase);
 # endif
 }

Index: src/OFThread.m
==================================================================
--- src/OFThread.m
+++ src/OFThread.m
@@ -99,11 +99,11 @@
 static struct DOSIFace *IDOS = NULL;
 
 OF_DESTRUCTOR()
 {
 	if (IDOS != NULL)
-		DropInterface(IDOS);
+		DropInterface((struct Interface *)IDOS);
 
 	if (DOSBase != NULL)
 		CloseLibrary(DOSBase);
 }
 #endif

Index: src/OFURLHandler_file.m
==================================================================
--- src/OFURLHandler_file.m
+++ src/OFURLHandler_file.m
@@ -124,17 +124,17 @@
 static struct LocaleIFace *ILocale = NULL;
 
 OF_DESTRUCTOR()
 {
 	if (ILocale != NULL)
-		DropInterface(ILocale);
+		DropInterface((struct Interface *)ILocale);
 
 	if (LocaleBase != NULL)
 		CloseLibrary(LocaleBase);
 
 	if (IDOS != NULL)
-		DropInterface(IDOS);
+		DropInterface((struct Interface *)IDOS);
 
 	if (DOSBase != NULL)
 		CloseLibrary(DOSBase);
 }
 #endif