@@ -975,10 +975,12 @@
 		4BF48CE118A95F83000E8D04 /* OFBigDataArray.h in Headers */ = {isa = PBXBuildFile; fileRef = 4BF48CDF18A95F83000E8D04 /* OFBigDataArray.h */; settings = {ATTRIBUTES = (Public, ); }; };
 		4BF48CE218A95F83000E8D04 /* OFBigDataArray.m in Sources */ = {isa = PBXBuildFile; fileRef = 4BF48CE018A95F83000E8D04 /* OFBigDataArray.m */; };
 		4BF5CB901E2DC1D800CF7584 /* iso_8859_2.m in Sources */ = {isa = PBXBuildFile; fileRef = 4BF5CB8F1E2DC1D800CF7584 /* iso_8859_2.m */; };
 		4BF5CB911E2DC1D800CF7584 /* iso_8859_2.m in Sources */ = {isa = PBXBuildFile; fileRef = 4BF5CB8F1E2DC1D800CF7584 /* iso_8859_2.m */; };
 		4BF69CE61BD44F8B00DFFC1B /* platform.h in Headers */ = {isa = PBXBuildFile; fileRef = 4BF69CE51BD44F8B00DFFC1B /* platform.h */; settings = {ATTRIBUTES = (Public, ); }; };
+		4BFC37BD1E50E11C00EE1269 /* common.h in Headers */ = {isa = PBXBuildFile; fileRef = 4BFC37BC1E50E11C00EE1269 /* common.h */; };
+		4BFC37BE1E50E11C00EE1269 /* common.h in Headers */ = {isa = PBXBuildFile; fileRef = 4BFC37BC1E50E11C00EE1269 /* common.h */; };
 		4BFF3714177E17C100192782 /* OFRemoveItemFailedException.h in Headers */ = {isa = PBXBuildFile; fileRef = 4BFF3710177E17C100192782 /* OFRemoveItemFailedException.h */; settings = {ATTRIBUTES = (Public, ); }; };
 		4BFF3715177E17C100192782 /* OFRemoveItemFailedException.m in Sources */ = {isa = PBXBuildFile; fileRef = 4BFF3711177E17C100192782 /* OFRemoveItemFailedException.m */; };
 /* End PBXBuildFile section */
 
 /* Begin PBXContainerItemProxy section */
@@ -1605,10 +1607,11 @@
 		4BF48CDF18A95F83000E8D04 /* OFBigDataArray.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = OFBigDataArray.h; path = src/OFBigDataArray.h; sourceTree = "<group>"; };
 		4BF48CE018A95F83000E8D04 /* OFBigDataArray.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = OFBigDataArray.m; path = src/OFBigDataArray.m; sourceTree = "<group>"; };
 		4BF5CB8F1E2DC1D800CF7584 /* iso_8859_2.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = iso_8859_2.m; path = src/encodings/iso_8859_2.m; sourceTree = "<group>"; };
 		4BF69CE51BD44F8B00DFFC1B /* platform.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = platform.h; path = src/platform.h; sourceTree = "<group>"; };
 		4BFBDD1610A0724800051AFB /* unicode.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = unicode.m; path = src/unicode.m; sourceTree = "<group>"; };
+		4BFC37BC1E50E11C00EE1269 /* common.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = common.h; path = src/encodings/common.h; sourceTree = "<group>"; };
 		4BFF3710177E17C100192782 /* OFRemoveItemFailedException.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = OFRemoveItemFailedException.h; path = src/exceptions/OFRemoveItemFailedException.h; sourceTree = "<group>"; };
 		4BFF3711177E17C100192782 /* OFRemoveItemFailedException.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = OFRemoveItemFailedException.m; path = src/exceptions/OFRemoveItemFailedException.m; sourceTree = "<group>"; };
 /* End PBXFileReference section */
 
 /* Begin PBXFrameworksBuildPhase section */
@@ -1917,10 +1920,11 @@
 			isa = PBXGroup;
 			children = (
 				4BB52CC617B8EA7F00B7EBF5 /* codepage_437.m */,
 				4B5EBFB51E25A8CF004FE6A2 /* codepage_850.m */,
 				4B6736111E2B2F6F00681F2C /* codepage_858.m */,
+				4BFC37BC1E50E11C00EE1269 /* common.h */,
 				4BF5CB8F1E2DC1D800CF7584 /* iso_8859_2.m */,
 				4B276E351E493D4900E20CE4 /* iso_8859_3.m */,
 				4B6AF96F10A8D40E0003FB0A /* iso_8859_15.m */,
 				4B276E361E493D4900E20CE4 /* koi8_r.m */,
 				4B276E371E493D4900E20CE4 /* koi8_u.m */,
@@ -2537,10 +2541,11 @@
 				4B2C22891DA292BE00735907 /* OFUnknownXMLEntityException.h in Headers */,
 				4B2C228A1DA292BE00735907 /* OFUnlockFailedException.h in Headers */,
 				4B2C228B1DA292BE00735907 /* OFUnsupportedProtocolException.h in Headers */,
 				4B2C228C1DA292BE00735907 /* OFUnsupportedVersionException.h in Headers */,
 				4B2C228D1DA292BE00735907 /* OFWriteFailedException.h in Headers */,
+				4B2C22A91DA292BE00735907 /* config.h in Headers */,
 				4B2C228E1DA292BE00735907 /* OFArray_adjacent.h in Headers */,
 				4B2C228F1DA292BE00735907 /* OFArray_adjacentSubarray.h in Headers */,
 				4B2C21D91DA292BE00735907 /* OFArray_subarray.h in Headers */,
 				4B2C22901DA292BE00735907 /* OFAutoreleasePool+Private.h in Headers */,
 				4B2C22911DA292BE00735907 /* OFCountedSet_hashtable.h in Headers */,
@@ -2565,12 +2570,12 @@
 				4B2C22A41DA292BE00735907 /* OFTarArchiveEntry+Private.h in Headers */,
 				4B2C22A51DA292BE00735907 /* OFTCPSocket+SOCKS5.h in Headers */,
 				4B2C22A61DA292BE00735907 /* OFThread+Private.h in Headers */,
 				4B2C22A71DA292BE00735907 /* OFTimer+Private.h in Headers */,
 				4B2C22A81DA292BE00735907 /* OFZIPArchiveEntry+Private.h in Headers */,
-				4B2C22A91DA292BE00735907 /* config.h in Headers */,
 				4B2C22AA1DA292BE00735907 /* socket_helpers.h in Headers */,
+				4BFC37BE1E50E11C00EE1269 /* common.h in Headers */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
 		4B3D23731337FBC800DD29B8 /* Headers */ = {
 			isa = PBXHeadersBuildPhase;
@@ -2756,10 +2761,11 @@
 				4B91FD12196B4F5900C5C25E /* OFUnknownXMLEntityException.h in Headers */,
 				4B6743F5163C384A00EB1E59 /* OFUnlockFailedException.h in Headers */,
 				4B17FFB1133A3664003E6DCD /* OFUnsupportedProtocolException.h in Headers */,
 				4BA4846215CC9F1E00D75360 /* OFUnsupportedVersionException.h in Headers */,
 				4B55A116133AC24600B58A93 /* OFWriteFailedException.h in Headers */,
+				4BDF37B51338055600F9A81A /* config.h in Headers */,
 				4B2B3E7D140D430500EC2F7C /* OFArray_adjacent.h in Headers */,
 				4B9BB7BD141CDE2D000AD1CC /* OFArray_adjacentSubarray.h in Headers */,
 				4B9BB7BF141CDE2D000AD1CC /* OFArray_subarray.h in Headers */,
 				4B1473CB17E6391900B46BB8 /* OFAutoreleasePool+Private.h in Headers */,
 				4BA85BCA140ECCE800E91D51 /* OFCountedSet_hashtable.h in Headers */,
@@ -2784,12 +2790,12 @@
 				4BC176361D04963000C32718 /* OFTarArchiveEntry+Private.h in Headers */,
 				4BD653C5143B8489006182F0 /* OFTCPSocket+SOCKS5.h in Headers */,
 				4B6C8ADC17BD5C2E00B194F2 /* OFThread+Private.h in Headers */,
 				4B6C8ADD17BD5C2E00B194F2 /* OFTimer+Private.h in Headers */,
 				4B6C8ADE17BD5C2E00B194F2 /* OFZIPArchiveEntry+Private.h in Headers */,
-				4BDF37B51338055600F9A81A /* config.h in Headers */,
 				4B7DD58218942FE200990FD6 /* socket_helpers.h in Headers */,
+				4BFC37BD1E50E11C00EE1269 /* common.h in Headers */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
 		4B5D70711DA2F87A00B3B2D7 /* Headers */ = {
 			isa = PBXHeadersBuildPhase;