@@ -214,16 +214,10 @@
 		IMP _Nullable buckets[256];
 #endif
 	} *_Nonnull buckets[256];
 };
 
-#ifdef OBJC_COMPILING_AMIGA_LIBRARY
-# undef errno
-extern int *_Nonnull objc_get_errno(void);
-# define errno (*objc_get_errno())
-#endif
-
 extern void objc_register_all_categories(struct objc_symtab *_Nonnull);
 extern struct objc_category *_Nullable *_Nullable
     objc_categories_for_class(Class _Nonnull);
 extern void objc_unregister_all_categories(void);
 extern void objc_initialize_class(Class _Nonnull);
@@ -289,12 +283,12 @@
 
 	return dtable->buckets[i]->buckets[j];
 #endif
 }
 
-extern void OF_NO_RETURN_FUNC objc_error(const char *file, unsigned int line,
-    const char *format, ...);
+extern void OF_NO_RETURN_FUNC objc_error(const char *_Nonnull file,
+    unsigned int line, const char *_Nonnull format, ...);
 #define OBJC_ERROR(...) objc_error(__FILE__, __LINE__, __VA_ARGS__)
 
 #if defined(OF_ELF)
 # if defined(OF_X86_64) || defined(OF_X86) || defined(OF_POWERPC) || \
     defined(OF_ARM64) || defined(OF_ARM) || \