Index: src/amiga-glue.h
==================================================================
--- src/amiga-glue.h
+++ src/amiga-glue.h
@@ -19,11 +19,11 @@
 #import "OFObject.h"
 #import "OFStdIOStream.h"
 #import "OFApplication.h"
 #import "OFBlock.h"
 #import "OFDNSResourceRecord.h"
-#import "OFEmbeddedURIHandler.h"
+#import "OFEmbeddedIRIHandler.h"
 #import "OFHTTPRequest.h"
 #import "OFHTTPResponse.h"
 #import "OFList.h"
 #import "OFMethodSignature.h"
 #import "OFOnce.h"

Index: src/amiga-library.m
==================================================================
--- src/amiga-library.m
+++ src/amiga-library.m
@@ -24,14 +24,16 @@
 #import "macros.h"
 
 #import "amiga-glue.h"
 #import "amiga-library.h"
 
+#define Class IntuitionClass
 #include <exec/libraries.h>
 #include <exec/nodes.h>
 #include <exec/resident.h>
 #include <proto/exec.h>
+#undef Class
 
 #define CONCAT_VERSION2(major, minor) #major "." #minor
 #define CONCAT_VERSION(major, minor) CONCAT_VERSION2(major, minor)
 #define VERSION_STRING CONCAT_VERSION(OBJFW_LIB_MAJOR, OBJFW_LIB_MINOR)
 

Index: src/amiga-library.xml
==================================================================
--- src/amiga-library.xml
+++ src/amiga-library.xml
@@ -66,11 +66,11 @@
     <argument name='string' type='OFString *_Nonnull' m68k-reg='a0'/>
   </function>
   <function name='OFDNSRecordTypeParseName' return-type='OFDNSRecordType'>
     <argument name='string' type='OFString *_Nonnull' m68k-reg='a0'/>
   </function>
-  <include>OFEmbeddedURIHandler.h</include>
+  <include>OFEmbeddedIRIHandler.h</include>
   <function name='OFRegisterEmbeddedFile'>
     <argument name='name' type='OFString *_Nonnull' m68k-reg='a0'/>
     <argument name='bytes' type='const uint8_t *_Nonnull' m68k-reg='a1'/>
     <argument name='size' type='size_t' m68k-reg='d0'/>
   </function>

Index: src/linklib/init.m
==================================================================
--- src/linklib/init.m
+++ src/linklib/init.m
@@ -71,10 +71,11 @@
 extern int _Unwind_Backtrace(int (*)(void *, void *), void *);
 
 struct Library *ObjFWBase;
 void *__objc_class_name_OFApplication;
 void *__objc_class_name_OFArray;
+void *__objc_class_name_OFBlock;
 void *__objc_class_name_OFCharacterSet;
 void *__objc_class_name_OFColor;
 void *__objc_class_name_OFConstantString;
 void *__objc_class_name_OFCountedSet;
 void *__objc_class_name_OFData;
@@ -84,10 +85,12 @@
 void *__objc_class_name_OFFileManager;
 void *__objc_class_name_OFGZIPStream;
 void *__objc_class_name_OFHMAC;
 void *__objc_class_name_OFINICategory;
 void *__objc_class_name_OFINIFile;
+void *__objc_class_name_OFIRI;
+void *__objc_class_name_OFIRIHandler;
 void *__objc_class_name_OFInflate64Stream;
 void *__objc_class_name_OFInflateStream;
 void *__objc_class_name_OFInvocation;
 void *__objc_class_name_OFLHAArchive;
 void *__objc_class_name_OFLHAArchiveEntry;
@@ -94,23 +97,24 @@
 void *__objc_class_name_OFList;
 void *__objc_class_name_OFLocale;
 void *__objc_class_name_OFMD5Hash;
 void *__objc_class_name_OFMapTable;
 void *__objc_class_name_OFMapTableEnumerator;
+void *__objc_class_name_OFMatrix4x4;
 void *__objc_class_name_OFMemoryStream;
 void *__objc_class_name_OFMessagePackExtension;
 void *__objc_class_name_OFMethodSignature;
 void *__objc_class_name_OFMutableArray;
 void *__objc_class_name_OFMutableData;
 void *__objc_class_name_OFMutableDictionary;
+void *__objc_class_name_OFMutableIRI;
 void *__objc_class_name_OFMutableLHAArchiveEntry;
 void *__objc_class_name_OFMutablePair;
 void *__objc_class_name_OFMutableSet;
 void *__objc_class_name_OFMutableString;
 void *__objc_class_name_OFMutableTarArchiveEntry;
 void *__objc_class_name_OFMutableTriple;
-void *__objc_class_name_OFMutableURI;
 void *__objc_class_name_OFMutableZIPArchiveEntry;
 void *__objc_class_name_OFNotification;
 void *__objc_class_name_OFNotificationCenter;
 void *__objc_class_name_OFNull;
 void *__objc_class_name_OFNumber;
@@ -124,11 +128,10 @@
 void *__objc_class_name_OFSHA224Or256Hash;
 void *__objc_class_name_OFSHA256Hash;
 void *__objc_class_name_OFSHA384Hash;
 void *__objc_class_name_OFSHA384Or512Hash;
 void *__objc_class_name_OFSHA512Hash;
-void *__objc_class_name_OFSandbox;
 void *__objc_class_name_OFSecureData;
 void *__objc_class_name_OFSeekableStream;
 void *__objc_class_name_OFSet;
 void *__objc_class_name_OFSettings;
 void *__objc_class_name_OFSortedList;
@@ -139,12 +142,10 @@
 void *__objc_class_name_OFTarArchive;
 void *__objc_class_name_OFTarArchiveEntry;
 void *__objc_class_name_OFThread;
 void *__objc_class_name_OFTimer;
 void *__objc_class_name_OFTriple;
-void *__objc_class_name_OFURI;
-void *__objc_class_name_OFURIHandler;
 void *__objc_class_name_OFUUID;
 void *__objc_class_name_OFValue;
 void *__objc_class_name_OFXMLAttribute;
 void *__objc_class_name_OFXMLCDATA;
 void *__objc_class_name_OFXMLCharacters;
@@ -193,10 +194,11 @@
 void *__objc_class_name_OFCondition;
 void *__objc_class_name_OFMutex;
 void *__objc_class_name_OFRecursiveMutex;
 #endif
 void *__objc_class_name_OFAllocFailedException;
+void *__objc_class_name_OFAlreadyOpenException;
 void *__objc_class_name_OFChecksumMismatchException;
 void *__objc_class_name_OFCopyItemFailedException;
 void *__objc_class_name_OFCreateDirectoryFailedException;
 void *__objc_class_name_OFCreateSymbolicLinkFailedException;
 void *__objc_class_name_OFEnumerationMutationException;
@@ -240,11 +242,10 @@
 void *__objc_class_name_OFChangeCurrentDirectoryFailedException;
 void *__objc_class_name_OFGetCurrentDirectoryFailedException;
 #endif
 #ifdef OF_HAVE_SOCKETS
 void *__objc_class_name_OFAcceptSocketFailedException;
-void *__objc_class_name_OFAlreadyConnectedException;
 void *__objc_class_name_OFBindIPSocketFailedException;
 void *__objc_class_name_OFBindSocketFailedException;
 void *__objc_class_name_OFConnectIPSocketFailedException;
 void *__objc_class_name_OFConnectSocketFailedException;
 void *__objc_class_name_OFDNSQueryFailedException;
@@ -263,14 +264,14 @@
 void *__objc_class_name_OFThreadStillRunningException;
 void *__objc_class_name_OFWaitForConditionFailedException;
 #endif
 #include "OFFileManagerConstants.inc"
 #include "OFRunLoopConstants.inc"
-/* The following __objc_class_name_* are only required for the tests. */
+/* The following __objc_class_name_* are only for the tests. */
 void *__objc_class_name_OFBitSetCharacterSet;
-void *__objc_class_name_OFMapTableSet;
-void *__objc_class_name_OFMutableMapTableSet;
+void *__objc_class_name_OFConcreteMutableSet;
+void *__objc_class_name_OFConcreteSet;
 void *__objc_class_name_OFMutableUTF8String;
 void *__objc_class_name_OFRangeCharacterSet;
 void *__objc_class_name_OFSelectKernelEventObserver;
 void *__objc_class_name_OFUTF8String;
 

Index: src/linklib/linklib.m
==================================================================
--- src/linklib/linklib.m
+++ src/linklib/linklib.m
@@ -21,11 +21,11 @@
 #import "OFObject.h"
 #import "OFStdIOStream.h"
 #import "OFApplication.h"
 #import "OFBlock.h"
 #import "OFDNSResourceRecord.h"
-#import "OFEmbeddedURIHandler.h"
+#import "OFEmbeddedIRIHandler.h"
 #import "OFHTTPRequest.h"
 #import "OFHTTPResponse.h"
 #import "OFList.h"
 #import "OFMethodSignature.h"
 #import "OFOnce.h"