@@ -28,45 +28,18 @@
 #import "OFInvalidArgumentException.h"
 #import "OFInvalidEncodingException.h"
 #import "OFOpenItemFailedException.h"
 
 #ifdef OF_AMIGAOS
-# ifdef OF_AMIGAOS4
-#  define __NOLIBBASE__
-#  define __NOGLOBALIFACE__
-#  define __USE_INLINE__
-# endif
+# define __USE_INLINE__
 # include <proto/dos.h>
 # include <proto/exec.h>
 # include <proto/locale.h>
 #endif
 
 static OFLocale *currentLocale = nil;
 
-#ifdef OF_AMIGAOS4
-extern struct ExecIFace *IExec;
-static struct Library *DOSBase = NULL;
-static struct DOSIFace *IDOS = NULL;
-static struct Library *LocaleBase = NULL;
-static struct LocaleIFace *ILocale = NULL;
-
-OF_DESTRUCTOR()
-{
-	if (ILocale != NULL)
-		DropInterface(ILocale);
-
-	if (LocaleBase != NULL)
-		CloseLibrary(LocaleBase);
-
-	if (IDOS != NULL)
-		DropInterface(IDOS);
-
-	if (DOSBase != NULL)
-		CloseLibrary(DOSBase);
-}
-#endif
-
 #ifndef OF_AMIGAOS
 static void
 parseLocale(char *locale, of_string_encoding_t *encoding,
     OFString **language, OFString **territory)
 {