@@ -34,11 +34,11 @@
 #import "OFRunLoop.h"
 #import "OFRunLoop+Private.h"
 #import "OFThread.h"
 #import "OFThread+Private.h"
 #import "OFSandbox.h"
-#ifdef OF_MORPHOS
+#ifdef OF_AMIGAOS
 # import "OFFile.h"
 # import "OFFileManager.h"
 #endif
 
 #import "OFOutOfMemoryException.h"
@@ -50,11 +50,14 @@
 #elif defined(OF_WINDOWS)
 # include <windows.h>
 
 extern int _CRT_glob;
 extern void __wgetmainargs(int *, wchar_t ***, wchar_t ***, int, int *);
-#elif defined(OF_MORPHOS)
+#elif defined(OF_AMIGAOS)
+# ifdef OF_AMIGAOS3
+#  define INTUITION_CLASSES_H
+# endif
 # include <proto/exec.h>
 # include <proto/dos.h>
 #elif !defined(OF_IOS)
 extern char **environ;
 #endif
@@ -177,10 +180,12 @@
 
 + (void)terminateWithStatus: (int)status
 {
 #ifndef OF_PSP
 	exit(status);
+
+	OF_UNREACHABLE
 #else
 	sceKernelExitGame();
 
 	OF_UNREACHABLE
 #endif
@@ -247,11 +252,11 @@
 
 			objc_autoreleasePoolPop(pool);
 		}
 
 		FreeEnvironmentStringsW(env0);
-#elif defined(OF_MORPHOS)
+#elif defined(OF_AMIGAOS)
 		void *pool = objc_autoreleasePoolPush();
 		OFFileManager *fileManager = [OFFileManager defaultManager];
 		OFArray *envContents =
 		    [fileManager contentsOfDirectoryAtPath: @"ENV:"];
 		const of_string_encoding_t encoding = [OFLocalization encoding];