@@ -33,11 +33,11 @@
 #import "OFRunLoop.h"
 #import "OFRunLoop+Private.h"
 #import "OFThread.h"
 #import "OFThread+Private.h"
 #import "OFSandbox.h"
-#if defined(OF_MORPHOS) && !defined(OF_IXEMUL)
+#ifdef OF_MORPHOS
 # import "OFFile.h"
 # import "OFFileManager.h"
 #endif
 
 #import "OFOutOfMemoryException.h"
@@ -49,11 +49,11 @@
 #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) && !defined(OF_IXEMUL)
+#elif defined(OF_MORPHOS)
 # define BOOL EXEC_BOOL
 # include <proto/exec.h>
 # include <proto/dos.h>
 # undef BOOL
 #elif !defined(OF_IOS)
@@ -265,11 +265,11 @@
 
 			objc_autoreleasePoolPop(pool);
 		}
 
 		FreeEnvironmentStringsW(env0);
-#elif defined(OF_MORPHOS) && !defined(OF_IXEMUL)
+#elif defined(OF_MORPHOS)
 		void *pool = objc_autoreleasePoolPush();
 		OFFileManager *fileManager = [OFFileManager defaultManager];
 		OFArray *envContents =
 		    [fileManager contentsOfDirectoryAtPath: @"ENV:"];
 		const of_string_encoding_t encoding = [OFLocalization encoding];