@@ -27,11 +27,10 @@
 
 struct ObjFWRTBase;
 
 #import "inline.h"
 
-#include <errno.h>
 #include <stdio.h>
 #include <stdlib.h>
 
 #if defined(OF_AMIGAOS_M68K)
 # include <stabs.h>
@@ -79,13 +78,13 @@
 
 	if (IntuitionBase != NULL) {
 		struct EasyStruct easy = {
 			.es_StructSize = sizeof(easy),
 			.es_Flags = 0,
-			.es_Title = (UBYTE *)NULL,
-			.es_TextFormat = (UBYTE *)string,
-			(UBYTE *)"OK"
+			.es_Title = (void *)NULL,
+			.es_TextFormat = (void *)string,
+			(void *)"OK"
 		};
 
 		EasyRequest(NULL, &easy, NULL, arg);
 
 		CloseLibrary(IntuitionBase);
@@ -92,16 +91,10 @@
 	}
 
 	exit(EXIT_FAILURE);
 }
 
-static int *
-get_errno(void)
-{
-	return &errno;
-}
-
 static void __attribute__((__used__))
 ctor(void)
 {
 	static bool initialized = false;
 	struct objc_libc libc = {
@@ -135,11 +128,10 @@
 #endif
 #ifdef OF_MORPHOS
 		.__register_frame = __register_frame,
 		.__deregister_frame = __deregister_frame,
 #endif
-		.get_errno = get_errno,
 #ifdef OF_AMIGAOS_M68K
 		.vsnprintf = vsnprintf,
 #endif
 		.atexit = atexit,
 		.exit = exit,