@@ -1,7 +1,7 @@
 /*
- * Copyright (c) 2008-2021 Jonathan Schleifer <js@nil.im>
+ * Copyright (c) 2008-2022 Jonathan Schleifer <js@nil.im>
  *
  * All rights reserved.
  *
  * This file is part of ObjFW. It may be distributed under the terms of the
  * Q Public License 1.0, which can be found in the file LICENSE.QPL included in
@@ -11,11 +11,11 @@
  * Public License, either version 2 or 3, which can be found in the file
  * LICENSE.GPLv2 or LICENSE.GPLv3 respectively included in the packaging of this
  * file.
  */
 
-/* This file is automatically generated from library.xml */
+/* This file is automatically generated from amiga-library.xml */
 
 #include "config.h"
 
 #import "amiga-glue.h"
 
@@ -556,14 +556,14 @@
 	M68K_ARG(Protocol *_Nonnull, protocol2, a1)
 
 	return protocol_conformsToProtocol(protocol1, protocol2);
 }
 
-_Nullable objc_uncaught_exception_handler_t __saveds
-glue_objc_setUncaughtExceptionHandler PPC_PARAMS(objc_uncaught_exception_handler_t _Nullable handler)
+_Nullable objc_uncaught_exception_handler __saveds
+glue_objc_setUncaughtExceptionHandler PPC_PARAMS(objc_uncaught_exception_handler _Nullable handler)
 {
-	M68K_ARG(objc_uncaught_exception_handler_t _Nullable, handler, a0)
+	M68K_ARG(objc_uncaught_exception_handler _Nullable, handler, a0)
 
 	return objc_setUncaughtExceptionHandler(handler);
 }
 
 void __saveds
@@ -574,13 +574,13 @@
 
 	objc_setForwardHandler(forward, stretForward);
 }
 
 void __saveds
-glue_objc_setEnumerationMutationHandler PPC_PARAMS(objc_enumeration_mutation_handler_t _Nullable hadler)
+glue_objc_setEnumerationMutationHandler PPC_PARAMS(objc_enumeration_mutation_handler _Nullable hadler)
 {
-	M68K_ARG(objc_enumeration_mutation_handler_t _Nullable, hadler, a0)
+	M68K_ARG(objc_enumeration_mutation_handler _Nullable, hadler, a0)
 
 	objc_setEnumerationMutationHandler(hadler);
 }
 
 id _Nullable __saveds
@@ -591,13 +591,13 @@
 
 	return objc_constructInstance(class, bytes);
 }
 
 void __saveds
-glue_objc_exit(void)
+glue_objc_deinit(void)
 {
-	objc_exit();
+	objc_deinit();
 }
 
 Ivar _Nullable *_Nullable __saveds
 glue_class_copyIvarList PPC_PARAMS(Class _Nullable class, unsigned int *_Nullable outCount)
 {