@@ -223,17 +223,10 @@
 struct objc_libc {
 	void *_Nullable (*_Nonnull malloc)(size_t);
 	void *_Nullable (*_Nonnull calloc)(size_t, size_t);
 	void *_Nullable (*_Nonnull realloc)(void *_Nullable, size_t);
 	void (*_Nonnull free)(void *_Nullable);
-	int (*_Nonnull vfprintf)(FILE *_Nonnull, const char *_Nonnull, va_list);
-	int (*_Nonnull fflush)(FILE *_Nonnull);
-# ifdef OF_AMIGAOS_M68K
-	int (*_Nonnull vsnprintf)(char *restrict _Nonnull str, size_t size,
-	    const char *_Nonnull restrict fmt, va_list args);
-# endif
-	void (*_Nonnull abort)(void);
 # ifdef HAVE_SJLJ_EXCEPTIONS
 	int (*_Nonnull _Unwind_SjLj_RaiseException)(void *_Nonnull);
 # else
 	int (*_Nonnull _Unwind_RaiseException)(void *_Nonnull);
 # endif
@@ -260,10 +253,15 @@
 # ifdef OF_MORPHOS
 	void (*_Nonnull __register_frame)(void *_Nonnull);
 	void (*_Nonnull __deregister_frame)(void *_Nonnull);
 # endif
 	int *_Nonnull (*_Nonnull get_errno)(void);
+# ifdef OF_AMIGAOS_M68K
+	int (*_Nonnull vsnprintf)(char *restrict _Nonnull str, size_t size,
+	    const char *_Nonnull restrict fmt, va_list args);
+# endif
+	void (*_Nonnull abort)(void);
 };
 #endif
 
 #ifdef OBJC_COMPILING_AMIGA_LIBRARY
 # if defined(__MORPHOS__)
@@ -351,11 +349,11 @@
 #endif
 }
 
 extern void OF_NO_RETURN_FUNC objc_error(const char *file, unsigned int line,
     const char *format, ...);
-#define OBJC_ERROR(...) objc_error(__FILE__, __LINE__, __VA_ARGS__);
+#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) || \
     defined(OF_MIPS64_N64) || defined(OF_MIPS) || \