@@ -28,47 +28,48 @@
        OFData.m				\
        OFData+CryptographicHashing.m	\
        OFData+MessagePackParsing.m	\
        OFDate.m				\
        OFDictionary.m			\
-       OFEmbeddedURIHandler.m		\
        OFEnumerator.m			\
        OFFileManager.m			\
        OFGZIPStream.m			\
        OFHMAC.m				\
        OFINICategory.m			\
        OFINIFile.m			\
+       OFIRI.m				\
+       OFIRIHandler.m			\
        OFInflate64Stream.m		\
        OFInflateStream.m		\
        OFInvocation.m			\
        OFLHAArchive.m			\
        OFLHAArchiveEntry.m		\
        OFList.m				\
        OFLocale.m			\
        OFMD5Hash.m			\
        OFMapTable.m			\
+       OFMatrix4x4.m			\
        OFMemoryStream.m			\
        OFMessagePackExtension.m		\
        OFMethodSignature.m		\
        OFMutableArray.m			\
        OFMutableData.m			\
        OFMutableDictionary.m		\
+       OFMutableIRI.m			\
        OFMutableLHAArchiveEntry.m	\
        OFMutablePair.m			\
        OFMutableSet.m			\
        OFMutableString.m		\
        OFMutableTarArchiveEntry.m	\
        OFMutableTriple.m		\
-       OFMutableURI.m			\
        OFMutableZIPArchiveEntry.m	\
        OFNotification.m			\
        OFNotificationCenter.m		\
        OFNull.m				\
        OFNumber.m			\
        OFObject.m			\
        OFObject+KeyValueCoding.m	\
-       OFObject+Serialization.m		\
        OFOnce.m				\
        OFOptionsParser.m		\
        OFPBKDF2.m			\
        OFPair.m				\
        OFRIPEMD160Hash.m		\
@@ -81,11 +82,10 @@
        OFSHA384Or512Hash.m		\
        OFSHA512Hash.m			\
        OFScrypt.m			\
        OFSecureData.m			\
        OFSeekableStream.m		\
-       OFSerialization.m		\
        OFSet.m				\
        OFSettings.m			\
        OFSortedList.m			\
        OFStdIOStream.m			\
        OFStream.m			\
@@ -92,30 +92,26 @@
        OFString.m			\
        OFString+CryptographicHashing.m	\
        OFString+JSONParsing.m		\
        OFString+PercentEncoding.m	\
        OFString+PropertyListParsing.m	\
-       OFString+Serialization.m		\
        OFString+XMLEscaping.m		\
        OFString+XMLUnescaping.m		\
        ${OF_SUBPROCESS_M}		\
        OFSystemInfo.m			\
        OFTarArchive.m			\
        OFTarArchiveEntry.m		\
        OFThread.m			\
        OFTimer.m			\
        OFTriple.m			\
-       OFURI.m				\
-       OFURIHandler.m			\
        OFUUID.m				\
        OFValue.m			\
        OFXMLAttribute.m			\
        OFXMLCDATA.m			\
        OFXMLCharacters.m		\
        OFXMLComment.m			\
        OFXMLElement.m			\
-       OFXMLElement+Serialization.m	\
        OFXMLElementBuilder.m		\
        OFXMLNode.m			\
        OFXMLParser.m			\
        OFXMLProcessingInstruction.m	\
        OFZIPArchive.m			\
@@ -140,10 +136,11 @@
 	       OFHTTPResponse.m			\
 	       OFHTTPServer.m			\
 	       OFSequencedPacketSocket.m	\
 	       OFSocket.m			\
 	       OFStreamSocket.m			\
+	       OFSystemInfo+NetworkInterfaces.m	\
 	       OFTCPSocket.m			\
 	       OFTLSStream.m			\
 	       OFUDPSocket.m			\
 	       ${USE_SRCS_APPLETALK}		\
 	       ${USE_SRCS_IPX}			\
@@ -186,17 +183,18 @@
 	    ${USE_INCLUDES_ATOMIC}
 
 SRCS += OFASPrintF.m			\
 	OFAdjacentArray.m		\
 	OFAdjacentSubarray.m		\
-	OFArchiveURIHandler.m		\
+	OFArchiveIRIHandler.m		\
 	OFBase64.m			\
 	OFBitSetCharacterSet.m		\
 	OFBytesValue.m			\
 	OFCRC16.m			\
 	OFCRC32.m			\
 	OFCountedMapTableSet.m		\
+	OFEmbeddedIRIHandler.m		\
 	OFHuffmanTree.m			\
 	OFINIFileSettings.m		\
 	OFInvertedCharacterSet.m	\
 	OFLHADecompressingStream.m	\
 	OFMapTableDictionary.m		\
@@ -218,15 +216,15 @@
 	OFUTF8String.m			\
 	${LIBBASES_M}			\
 	${RUNTIME_AUTORELEASE_M}	\
 	${RUNTIME_INSTANCE_M}		\
 	${UNICODE_M}
-SRCS_FILES += OFFileURIHandler.m
+SRCS_FILES += OFFileIRIHandler.m
 SRCS_SOCKETS += OFAsyncIPSocketConnector.m		\
 		OFDNSResolverSettings.m			\
 		${OF_EPOLL_KERNEL_EVENT_OBSERVER_M}	\
-		OFHTTPURIHandler.m			\
+		OFHTTPIRIHandler.m			\
 		OFHostAddressResolver.m			\
 		OFKernelEventObserver.m			\
 		${OF_KQUEUE_KERNEL_EVENT_OBSERVER_M}	\
 		${OF_POLL_KERNEL_EVENT_OBSERVER_M}	\
 		${OF_SELECT_KERNEL_EVENT_OBSERVER_M}	\
@@ -264,5 +262,13 @@
 RCFLAGS = --use-temp-file						\
 	  -DOBJFW_LIB_MAJOR=${OBJFW_LIB_MAJOR}				\
 	  -DOBJFW_LIB_MINOR=${OBJFW_LIB_MINOR}				\
 	  -DOBJFW_LIB_VERSION=\"${OBJFW_LIB_MAJOR}.${OBJFW_LIB_MINOR}\" \
 	  -DOBJFW_SHARED_LIB=\"${OBJFW_SHARED_LIB}\"
+
+uninstall-extra:
+	for i in platform/GCC4 platform/GCC4.7 platform/PowerPC platform/macOS \
+	    platform/x86 platform ""; do \
+		if test -d ${DESTDIR}${includedir}/${includesubdir}/$$i; then \
+			rmdir ${DESTDIR}${includedir}/${includesubdir}/$$i; \
+		fi; \
+	done