@@ -29,18 +29,16 @@
        OFData.m				\
        OFData+CryptographicHashing.m	\
        OFData+MessagePackParsing.m	\
        OFDate.m				\
        OFDictionary.m			\
-       OFEmbeddedFileURLHandler.m	\
        OFEnumerator.m			\
        OFFileManager.m			\
        OFGZIPStream.m			\
        OFHMAC.m				\
        OFINICategory.m			\
        OFINIFile.m			\
-       OFINIFileSettings.m		\
        OFInflate64Stream.m		\
        OFInflateStream.m		\
        OFInvocation.m			\
        OFLHAArchive.m			\
        OFLHAArchiveEntry.m		\
@@ -58,11 +56,11 @@
        OFMutablePair.m			\
        OFMutableSet.m			\
        OFMutableString.m		\
        OFMutableTarArchiveEntry.m	\
        OFMutableTriple.m		\
-       OFMutableURL.m			\
+       OFMutableURI.m			\
        OFMutableZIPArchiveEntry.m	\
        OFNotification.m			\
        OFNotificationCenter.m		\
        OFNull.m				\
        OFNumber.m			\
@@ -91,13 +89,13 @@
        OFStdIOStream.m			\
        OFStream.m			\
        OFString.m			\
        OFString+CryptographicHashing.m	\
        OFString+JSONParsing.m		\
+       OFString+PercentEncoding.m	\
        OFString+PropertyListParsing.m	\
        OFString+Serialization.m		\
-       OFString+URLEncoding.m		\
        OFString+XMLEscaping.m		\
        OFString+XMLUnescaping.m		\
        ${OF_SUBPROCESS_M}		\
        OFSettings.m			\
        OFSystemInfo.m			\
@@ -104,12 +102,12 @@
        OFTarArchive.m			\
        OFTarArchiveEntry.m		\
        OFThread.m			\
        OFTimer.m			\
        OFTriple.m			\
-       OFURL.m				\
-       OFURLHandler.m			\
+       OFURI.m				\
+       OFURIHandler.m			\
        OFUUID.m				\
        OFValue.m			\
        OFXMLAttribute.m			\
        OFXMLCDATA.m			\
        OFXMLCharacters.m		\
@@ -159,43 +157,47 @@
 	       OFPlainCondition.m	\
 	       OFPlainMutex.m		\
 	       OFPlainThread.m		\
 	       OFRecursiveMutex.m	\
 	       OFTLSKey.m
-SRCS_WINDOWS = OFWin32ConsoleStdIOStream.m	\
-	       OFWindowsRegistryKey.m
+SRCS_WINDOWS = OFWindowsRegistryKey.m
 
 INCLUDES_ATOMIC = OFAtomic.h			\
 		  platform/GCC4/OFAtomic.h	\
 		  platform/GCC4.7/OFAtomic.h	\
 		  platform/PowerPC/OFAtomic.h	\
 		  platform/macOS/OFAtomic.h	\
 		  platform/x86/OFAtomic.h
 INCLUDES := ${SRCS:.m=.h}			\
+	    OFArchiveEntry.h			\
 	    OFCollection.h			\
 	    OFCryptographicHash.h		\
 	    OFJSONRepresentation.h		\
 	    OFKernelEventObserver.h		\
 	    OFKeyValueCoding.h			\
 	    OFLocking.h				\
 	    OFMessagePackRepresentation.h	\
+	    OFMutableArchiveEntry.h		\
 	    ObjFW.h				\
 	    macros.h				\
 	    objfw-defs.h			\
 	    platform.h				\
 	    ${USE_INCLUDES_ATOMIC}
 
 SRCS += OFASPrintF.m			\
 	OFAdjacentArray.m		\
 	OFAdjacentSubarray.m		\
+	OFArchiveURIHandler.m		\
 	OFBase64.m			\
 	OFBitSetCharacterSet.m		\
 	OFBytesValue.m			\
 	OFCRC16.m			\
 	OFCRC32.m			\
 	OFCountedMapTableSet.m		\
+	OFEmbeddedURIHandler.m		\
 	OFHuffmanTree.m			\
+	OFINIFileSettings.m		\
 	OFInvertedCharacterSet.m	\
 	OFLHADecompressingStream.m	\
 	OFMapTableDictionary.m		\
 	OFMapTableSet.m			\
 	OFMutableAdjacentArray.m	\
@@ -214,22 +216,24 @@
 	OFSubarray.m			\
 	OFUTF8String.m			\
 	${LIBBASES_M}			\
 	${RUNTIME_AUTORELEASE_M}	\
 	${RUNTIME_INSTANCE_M}		\
-       ${UNICODE_M}
-SRCS_FILES += OFFileURLHandler.m
+	${UNICODE_M}
+SRCS_FILES += OFFileURIHandler.m
 SRCS_SOCKETS += OFDNSResolverSettings.m			\
 		${OF_EPOLL_KERNEL_EVENT_OBSERVER_M}	\
-		OFHTTPURLHandler.m			\
+		OFHTTPURIHandler.m			\
 		OFHostAddressResolver.m			\
 		OFIPSocketAsyncConnector.m		\
 		OFKernelEventObserver.m			\
 		${OF_KQUEUE_KERNEL_EVENT_OBSERVER_M}	\
 		${OF_POLL_KERNEL_EVENT_OBSERVER_M}	\
 		${OF_SELECT_KERNEL_EVENT_OBSERVER_M}	\
 		OFTCPSocketSOCKS5Connector.m
+SRCS_WINDOWS += platform/Windows/OFWin32ConsoleStdIOStream.m	\
+		versioninfo.rc
 
 OBJS_EXTRA = exceptions/exceptions.a	\
 	     encodings/encodings.a	\
 	     forwarding/forwarding.a
 LIB_OBJS_EXTRA = exceptions/exceptions.lib.a	\
@@ -254,5 +258,10 @@
 		  ${RUNTIME_FRAMEWORK_LIBS}		\
 		  ${REEXPORT_RUNTIME_FRAMEWORK}		\
 		  ${LIBS}
 LIBS := -Lruntime -Lruntime/linklib ${RUNTIME_LIBS} ${REEXPORT_RUNTIME} ${LIBS}
 AMIGA_LIB_LIBS = ${LIBS}
+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}\"