@@ -36,13 +36,13 @@
        OFCharacterSet.m			\
        OFColor.m			\
        OFConstantString.m		\
        OFCountedSet.m			\
        OFData.m				\
-       OFData+ASN1DERValue.m		\
+       OFData+ASN1DERParsing.m		\
        OFData+CryptoHashing.m		\
-       OFData+MessagePackValue.m	\
+       OFData+MessagePackParsing.m	\
        OFDate.m				\
        OFDictionary.m			\
        OFEnumerator.m			\
        OFFileManager.m			\
        OFGZIPStream.m			\
@@ -93,12 +93,12 @@
        OFSortedList.m			\
        OFStdIOStream.m			\
        OFStream.m			\
        OFString.m			\
        OFString+CryptoHashing.m		\
-       OFString+JSONValue.m		\
-       OFString+PropertyListValue.m	\
+       OFString+JSONParsing.m		\
+       OFString+PropertyListParsing.m	\
        OFString+Serialization.m		\
        OFString+URLEncoding.m		\
        OFString+XMLEscaping.m		\
        OFString+XMLUnescaping.m		\
        OFSystemInfo.m			\
@@ -221,11 +221,13 @@
 	OFRangeCharacterSet.m		\
 	OFRangeValue.m			\
 	OFRectangleValue.m		\
 	OFSubarray.m			\
 	OFUTF8String.m			\
-	${LIBBASES_M}
+	${LIBBASES_M}			\
+	${RUNTIME_AUTORELEASE_M}	\
+	${RUNTIME_INSTANCE_M}
 SRCS_FILES += OFFileURLHandler.m	\
 	      OFINIFileSettings.m
 SRCS_SOCKETS += OFDNSResolverSettings.m			\
 		OFHTTPURLHandler.m			\
 		OFHostAddressResolver.m			\