@@ -62,18 +62,12 @@
 # include <direct.h>
 # include <ntdef.h>
 #endif
 
 #ifdef OF_AMIGAOS
-# ifdef OF_AMIGAOS4
-#  define __USE_INLINE__
-#  define __NOLIBBASE__
-#  define __NOGLOBALIFACE__
-# endif
 # include <proto/exec.h>
 # include <proto/dos.h>
-# include <proto/locale.h>
 #endif
 
 @interface OFDefaultFileManager: OFFileManager
 @end
 
@@ -111,13 +105,10 @@
 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
 
 static OFFileManager *defaultManager;
 
 #ifdef OF_AMIGAOS
@@ -126,18 +117,10 @@
 
 OF_DESTRUCTOR()
 {
 	if (dirChanged)
 		UnLock(CurrentDir(originalDirLock));
-
-# ifdef OF_AMIGAOS4
-	if (IDOS != NULL)
-		DropInterface((struct Interface *)IDOS);
-
-	if (DOSBase != NULL)
-		CloseLibrary(DOSBase);
-# endif
 }
 #endif
 
 static id
 attributeForKeyOrException(of_file_attributes_t attributes,
@@ -157,21 +140,10 @@
 {
 	if (self != [OFFileManager class])
 		return;
 
 #ifdef OF_HAVE_FILES
-# ifdef OF_AMIGAOS4
-	if ((DOSBase = OpenLibrary("dos.library", 36)) == NULL)
-		@throw [OFInitializationFailedException
-		    exceptionWithClass: self];
-
-	if ((IDOS = (struct DOSIFace *)
-	    GetInterface(DOSBase, "main", 1, NULL)) == NULL)
-		@throw [OFInitializationFailedException
-		    exceptionWithClass: self];
-# endif
-
 	/*
 	 * Make sure OFFile is initialized.
 	 * On some systems, this is needed to initialize the file system driver.
 	 */
 	[OFFile class];