Index: src/runtime/amiga-glue.m
==================================================================
--- src/runtime/amiga-glue.m
+++ src/runtime/amiga-glue.m
@@ -27,11 +27,11 @@
 #else
 # define PPC_PARAMS(...) (__VA_ARGS__)
 # define M68K_ARG(...)
 #endif
 
-extern bool objc_init(unsigned int, struct objc_libc *, FILE *, FILE *);
+extern bool objc_init(unsigned int, struct objc_libc *);
 
 #ifdef OF_MORPHOS
 /* All __saveds functions in this file need to use the SysV ABI */
 __asm__ (
     ".section .text\n"
@@ -41,19 +41,16 @@
     "	blr\n"
 );
 #endif
 
 bool __saveds
-glue_objc_init PPC_PARAMS(unsigned int version, struct objc_libc *libc,
-    FILE *stdout_, FILE *stderr_)
+glue_objc_init PPC_PARAMS(unsigned int version, struct objc_libc *libc)
 {
 	M68K_ARG(unsigned int, version, d0)
 	M68K_ARG(struct objc_libc *, libc, a0)
-	M68K_ARG(FILE *, stdout_, a1)
-	M68K_ARG(FILE *, stderr_, a2)
 
-	return objc_init(version, libc, stdout_, stderr_);
+	return objc_init(version, libc);
 }
 
 void __saveds
 glue___objc_exec_class PPC_PARAMS(struct objc_module *module)
 {

Index: src/runtime/amiga-library.m
==================================================================
--- src/runtime/amiga-library.m
+++ src/runtime/amiga-library.m
@@ -163,12 +163,10 @@
 #ifdef OF_MORPHOS
 const ULONG __abox__ = 1;
 #endif
 struct ExecBase *SysBase;
 struct objc_libc libc;
-FILE *stdout;
-FILE *stderr;
 
 #if defined(OF_AMIGAOS_M68K)
 __asm__ (
     ".text\n"
     ".globl ___restore_a4\n"
@@ -414,12 +412,11 @@
 {
 	return NULL;
 }
 
 bool
-objc_init(unsigned int version, struct objc_libc *libc_, FILE *stdout_,
-    FILE *stderr_)
+objc_init(unsigned int version, struct objc_libc *libc_)
 {
 #ifdef OF_AMIGAOS_M68K
 	OBJC_M68K_ARG(struct ObjFWRTBase *, base, a6)
 #else
 	register struct ObjFWRTBase *r12 __asm__("r12");
@@ -432,12 +429,10 @@
 
 	if (version > 1)
 		return false;
 
 	memcpy(&libc, libc_, sizeof(libc));
-	stdout = stdout_;
-	stderr = stderr_;
 
 #ifdef OF_AMIGAOS_M68K
 	if ((size_t)_EH_FRAME_BEGINS__ != (size_t)_EH_FRAME_OBJECTS__)
 		return false;
 

Index: src/runtime/amigaos3.sfd
==================================================================
--- src/runtime/amigaos3.sfd
+++ src/runtime/amigaos3.sfd
@@ -2,11 +2,11 @@
 ==basetype struct Library *
 ==libname objfwrt68k.library
 ==bias 30
 ==public
 * The following function is only for the linklib.
-bool glue_objc_init(unsigned int version, struct objc_libc *libc, FILE *stdout, FILE *stderr)(d0,a0,a1,a2)
+bool glue_objc_init(unsigned int version, struct objc_libc *libc)(d0,a0)
 void glue___objc_exec_class(struct objc_module *_Nonnull module)(a0)
 IMP _Nonnull glue_objc_msg_lookup(id _Nullable object, SEL _Nonnull selector)(a0,a1)
 IMP _Nonnull glue_objc_msg_lookup_stret(id _Nullable object, SEL _Nonnull selector)(a0,a1)
 IMP _Nonnull glue_objc_msg_lookup_super(struct objc_super *_Nonnull super, SEL _Nonnull selector)(a0,a1)
 IMP _Nonnull glue_objc_msg_lookup_super_stret(struct objc_super *_Nonnull super, SEL _Nonnull selector)(a0,a1)

Index: src/runtime/linklib/linklib.m
==================================================================
--- src/runtime/linklib/linklib.m
+++ src/runtime/linklib/linklib.m
@@ -142,11 +142,11 @@
 	if ((ObjFWRTBase = OpenLibrary(OBJFWRT_AMIGA_LIB,
 	    OBJFWRT_LIB_MINOR)) == NULL)
 		error("Failed to open " OBJFWRT_AMIGA_LIB " version %lu!",
 		    OBJFWRT_LIB_MINOR);
 
-	if (!glue_objc_init(1, &libc, stdout, stderr))
+	if (!glue_objc_init(1, &libc))
 		error("Failed to initialize " OBJFWRT_AMIGA_LIB "!", 0);
 
 	initialized = true;
 }
 

Index: src/runtime/morphos-clib.h
==================================================================
--- src/runtime/morphos-clib.h
+++ src/runtime/morphos-clib.h
@@ -1,7 +1,7 @@
 /* The following function is only for the linklib. */
-bool glue_objc_init(unsigned int, struct objc_libc *, FILE *, FILE *);
+bool glue_objc_init(unsigned int, struct objc_libc *);
 void glue___objc_exec_class(struct objc_module *);
 IMP glue_objc_msg_lookup(id, SEL);
 IMP glue_objc_msg_lookup_stret(id, SEL);
 IMP glue_objc_msg_lookup_super(struct objc_super *, SEL);
 IMP glue_objc_msg_lookup_super_stret(struct objc_super *, SEL);

Index: src/runtime/morphos.fd
==================================================================
--- src/runtime/morphos.fd
+++ src/runtime/morphos.fd
@@ -1,10 +1,10 @@
 ##base _ObjFWRTBase
 ##bias 30
 ##public
 * The following function is only for the linklib.
-glue_objc_init(version,libc,stdout,stderr)(sysv,r12base)
+glue_objc_init(version,libc)(sysv,r12base)
 glue___objc_exec_class(module)(sysv,r12base)
 glue_objc_msg_lookup(object,selector)(sysv,r12base)
 glue_objc_msg_lookup_stret(object,selector)(sysv,r12base)
 glue_objc_msg_lookup_super(super,selector)(sysv,r12base)
 glue_objc_msg_lookup_super_stret(super,selector)(sysv,r12base)

Index: src/runtime/private.h
==================================================================
--- src/runtime/private.h
+++ src/runtime/private.h
@@ -270,13 +270,10 @@
 # else
 #  define OBJC_M68K_ARG(type, name, reg)	\
 	register type reg_##name __asm__(#reg);	\
 	type name = reg_##name;
 # endif
-# undef stdout
-# undef stderr
-extern FILE *_Nonnull stdout, *_Nonnull stderr;
 #endif
 
 extern void objc_register_all_categories(struct objc_symtab *_Nonnull);
 extern struct objc_category *_Nullable *_Nullable
     objc_categories_for_class(Class _Nonnull);