diff --git a/Encodings/Encodings_vs140.vcxproj b/Encodings/Encodings_vs140.vcxproj
index 139f706c5..52d34aa1f 100644
--- a/Encodings/Encodings_vs140.vcxproj
+++ b/Encodings/Encodings_vs140.vcxproj
@@ -555,6 +555,13 @@
     <ClInclude Include="include\Poco\ISO8859_7Encoding.h"/>
     <ClInclude Include="include\Poco\ISO8859_8Encoding.h"/>
     <ClInclude Include="include\Poco\ISO8859_9Encoding.h"/>
+    <ClInclude Include="include\Poco\MacCentralEurRomanEncoding.h"/>
+    <ClInclude Include="include\Poco\MacChineseSimpEncoding.h"/>
+    <ClInclude Include="include\Poco\MacChineseTradEncoding.h"/>
+    <ClInclude Include="include\Poco\MacCyrillicEncoding.h"/>
+    <ClInclude Include="include\Poco\MacJapaneseEncoding.h"/>
+    <ClInclude Include="include\Poco\MacKoreanEncoding.h"/>
+    <ClInclude Include="include\Poco\MacRomanEncoding.h"/>
     <ClInclude Include="include\Poco\Windows1253Encoding.h"/>
     <ClInclude Include="include\Poco\Windows1254Encoding.h"/>
     <ClInclude Include="include\Poco\Windows1255Encoding.h"/>
@@ -610,6 +617,27 @@
     <ClCompile Include="src\ISO8859_9Encoding.cpp">
       <MultiProcessorCompilation>true</MultiProcessorCompilation>
     </ClCompile>
+    <ClCompile Include="src\MacCentralEurRomanEncoding.cpp">
+      <MultiProcessorCompilation>true</MultiProcessorCompilation>
+    </ClCompile>
+    <ClCompile Include="src\MacChineseSimpEncoding.cpp">
+      <MultiProcessorCompilation>true</MultiProcessorCompilation>
+    </ClCompile>
+    <ClCompile Include="src\MacChineseTradEncoding.cpp">
+      <MultiProcessorCompilation>true</MultiProcessorCompilation>
+    </ClCompile>
+    <ClCompile Include="src\MacCyrillicEncoding.cpp">
+      <MultiProcessorCompilation>true</MultiProcessorCompilation>
+    </ClCompile>
+    <ClCompile Include="src\MacJapaneseEncoding.cpp">
+      <MultiProcessorCompilation>true</MultiProcessorCompilation>
+    </ClCompile>
+    <ClCompile Include="src\MacKoreanEncoding.cpp">
+      <MultiProcessorCompilation>true</MultiProcessorCompilation>
+    </ClCompile>
+    <ClCompile Include="src\MacRomanEncoding.cpp">
+      <MultiProcessorCompilation>true</MultiProcessorCompilation>
+    </ClCompile>
     <ClCompile Include="src\Windows1253Encoding.cpp">
       <MultiProcessorCompilation>true</MultiProcessorCompilation>
     </ClCompile>
diff --git a/Encodings/Encodings_vs140.vcxproj.filters b/Encodings/Encodings_vs140.vcxproj.filters
index 071064d2b..da98e80fd 100644
--- a/Encodings/Encodings_vs140.vcxproj.filters
+++ b/Encodings/Encodings_vs140.vcxproj.filters
@@ -2,13 +2,13 @@
 <Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <ItemGroup>
     <Filter Include="Encodings">
-      <UniqueIdentifier>{58b191ff-154a-4063-ad01-b07863dd1cc5}</UniqueIdentifier>
+      <UniqueIdentifier>{2ac0c7b3-1706-4a76-895c-f3d4d3867af6}</UniqueIdentifier>
     </Filter>
     <Filter Include="Encodings\Header Files">
-      <UniqueIdentifier>{dcda7a77-ed5e-4a20-ade1-10854f25a93e}</UniqueIdentifier>
+      <UniqueIdentifier>{8e7ce3c1-f21d-42d1-9963-13ccbad20fb9}</UniqueIdentifier>
     </Filter>
     <Filter Include="Encodings\Source Files">
-      <UniqueIdentifier>{014c6981-a0a7-4866-a4c5-aa31aeba6ed1}</UniqueIdentifier>
+      <UniqueIdentifier>{2d656b8f-d362-4626-9ffb-7c9ee3bf0d7c}</UniqueIdentifier>
     </Filter>
   </ItemGroup>
   <ItemGroup>
@@ -54,6 +54,27 @@
     <ClInclude Include="include\Poco\ISO8859_9Encoding.h">
       <Filter>Encodings\Header Files</Filter>
     </ClInclude>
+    <ClInclude Include="include\Poco\MacCentralEurRomanEncoding.h">
+      <Filter>Encodings\Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="include\Poco\MacChineseSimpEncoding.h">
+      <Filter>Encodings\Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="include\Poco\MacChineseTradEncoding.h">
+      <Filter>Encodings\Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="include\Poco\MacCyrillicEncoding.h">
+      <Filter>Encodings\Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="include\Poco\MacJapaneseEncoding.h">
+      <Filter>Encodings\Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="include\Poco\MacKoreanEncoding.h">
+      <Filter>Encodings\Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="include\Poco\MacRomanEncoding.h">
+      <Filter>Encodings\Header Files</Filter>
+    </ClInclude>
     <ClInclude Include="include\Poco\Windows1253Encoding.h">
       <Filter>Encodings\Header Files</Filter>
     </ClInclude>
@@ -131,6 +152,27 @@
     <ClCompile Include="src\ISO8859_9Encoding.cpp">
       <Filter>Encodings\Source Files</Filter>
     </ClCompile>
+    <ClCompile Include="src\MacCentralEurRomanEncoding.cpp">
+      <Filter>Encodings\Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="src\MacChineseSimpEncoding.cpp">
+      <Filter>Encodings\Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="src\MacChineseTradEncoding.cpp">
+      <Filter>Encodings\Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="src\MacCyrillicEncoding.cpp">
+      <Filter>Encodings\Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="src\MacJapaneseEncoding.cpp">
+      <Filter>Encodings\Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="src\MacKoreanEncoding.cpp">
+      <Filter>Encodings\Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="src\MacRomanEncoding.cpp">
+      <Filter>Encodings\Source Files</Filter>
+    </ClCompile>
     <ClCompile Include="src\Windows1253Encoding.cpp">
       <Filter>Encodings\Source Files</Filter>
     </ClCompile>
diff --git a/Encodings/Encodings_vs150.vcxproj b/Encodings/Encodings_vs150.vcxproj
index c37eaea01..1bd627af6 100644
--- a/Encodings/Encodings_vs150.vcxproj
+++ b/Encodings/Encodings_vs150.vcxproj
@@ -555,6 +555,13 @@
     <ClInclude Include="include\Poco\ISO8859_7Encoding.h"/>
     <ClInclude Include="include\Poco\ISO8859_8Encoding.h"/>
     <ClInclude Include="include\Poco\ISO8859_9Encoding.h"/>
+    <ClInclude Include="include\Poco\MacCentralEurRomanEncoding.h"/>
+    <ClInclude Include="include\Poco\MacChineseSimpEncoding.h"/>
+    <ClInclude Include="include\Poco\MacChineseTradEncoding.h"/>
+    <ClInclude Include="include\Poco\MacCyrillicEncoding.h"/>
+    <ClInclude Include="include\Poco\MacJapaneseEncoding.h"/>
+    <ClInclude Include="include\Poco\MacKoreanEncoding.h"/>
+    <ClInclude Include="include\Poco\MacRomanEncoding.h"/>
     <ClInclude Include="include\Poco\Windows1253Encoding.h"/>
     <ClInclude Include="include\Poco\Windows1254Encoding.h"/>
     <ClInclude Include="include\Poco\Windows1255Encoding.h"/>
@@ -610,6 +617,27 @@
     <ClCompile Include="src\ISO8859_9Encoding.cpp">
       <MultiProcessorCompilation>true</MultiProcessorCompilation>
     </ClCompile>
+    <ClCompile Include="src\MacCentralEurRomanEncoding.cpp">
+      <MultiProcessorCompilation>true</MultiProcessorCompilation>
+    </ClCompile>
+    <ClCompile Include="src\MacChineseSimpEncoding.cpp">
+      <MultiProcessorCompilation>true</MultiProcessorCompilation>
+    </ClCompile>
+    <ClCompile Include="src\MacChineseTradEncoding.cpp">
+      <MultiProcessorCompilation>true</MultiProcessorCompilation>
+    </ClCompile>
+    <ClCompile Include="src\MacCyrillicEncoding.cpp">
+      <MultiProcessorCompilation>true</MultiProcessorCompilation>
+    </ClCompile>
+    <ClCompile Include="src\MacJapaneseEncoding.cpp">
+      <MultiProcessorCompilation>true</MultiProcessorCompilation>
+    </ClCompile>
+    <ClCompile Include="src\MacKoreanEncoding.cpp">
+      <MultiProcessorCompilation>true</MultiProcessorCompilation>
+    </ClCompile>
+    <ClCompile Include="src\MacRomanEncoding.cpp">
+      <MultiProcessorCompilation>true</MultiProcessorCompilation>
+    </ClCompile>
     <ClCompile Include="src\Windows1253Encoding.cpp">
       <MultiProcessorCompilation>true</MultiProcessorCompilation>
     </ClCompile>
diff --git a/Encodings/Encodings_vs150.vcxproj.filters b/Encodings/Encodings_vs150.vcxproj.filters
index 9cc732233..756b7c2f4 100644
--- a/Encodings/Encodings_vs150.vcxproj.filters
+++ b/Encodings/Encodings_vs150.vcxproj.filters
@@ -2,13 +2,13 @@
 <Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <ItemGroup>
     <Filter Include="Encodings">
-      <UniqueIdentifier>{c0d9c3b6-9378-44c7-a21a-929edee5dd7f}</UniqueIdentifier>
+      <UniqueIdentifier>{059be2e2-58fd-4d6e-a62f-54b17f0b1844}</UniqueIdentifier>
     </Filter>
     <Filter Include="Encodings\Header Files">
-      <UniqueIdentifier>{b9a983be-7c7f-4eec-9dcf-eb7b7b2f86fb}</UniqueIdentifier>
+      <UniqueIdentifier>{273f8676-5623-4cd9-af43-21034e4198ba}</UniqueIdentifier>
     </Filter>
     <Filter Include="Encodings\Source Files">
-      <UniqueIdentifier>{72afe60a-e118-457c-81bf-0ddb945bc776}</UniqueIdentifier>
+      <UniqueIdentifier>{2dafa9e2-18b7-42e1-acfb-befdc79fad72}</UniqueIdentifier>
     </Filter>
   </ItemGroup>
   <ItemGroup>
@@ -54,6 +54,27 @@
     <ClInclude Include="include\Poco\ISO8859_9Encoding.h">
       <Filter>Encodings\Header Files</Filter>
     </ClInclude>
+    <ClInclude Include="include\Poco\MacCentralEurRomanEncoding.h">
+      <Filter>Encodings\Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="include\Poco\MacChineseSimpEncoding.h">
+      <Filter>Encodings\Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="include\Poco\MacChineseTradEncoding.h">
+      <Filter>Encodings\Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="include\Poco\MacCyrillicEncoding.h">
+      <Filter>Encodings\Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="include\Poco\MacJapaneseEncoding.h">
+      <Filter>Encodings\Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="include\Poco\MacKoreanEncoding.h">
+      <Filter>Encodings\Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="include\Poco\MacRomanEncoding.h">
+      <Filter>Encodings\Header Files</Filter>
+    </ClInclude>
     <ClInclude Include="include\Poco\Windows1253Encoding.h">
       <Filter>Encodings\Header Files</Filter>
     </ClInclude>
@@ -131,6 +152,27 @@
     <ClCompile Include="src\ISO8859_9Encoding.cpp">
       <Filter>Encodings\Source Files</Filter>
     </ClCompile>
+    <ClCompile Include="src\MacCentralEurRomanEncoding.cpp">
+      <Filter>Encodings\Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="src\MacChineseSimpEncoding.cpp">
+      <Filter>Encodings\Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="src\MacChineseTradEncoding.cpp">
+      <Filter>Encodings\Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="src\MacCyrillicEncoding.cpp">
+      <Filter>Encodings\Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="src\MacJapaneseEncoding.cpp">
+      <Filter>Encodings\Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="src\MacKoreanEncoding.cpp">
+      <Filter>Encodings\Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="src\MacRomanEncoding.cpp">
+      <Filter>Encodings\Source Files</Filter>
+    </ClCompile>
     <ClCompile Include="src\Windows1253Encoding.cpp">
       <Filter>Encodings\Source Files</Filter>
     </ClCompile>
diff --git a/Encodings/Encodings_vs160.vcxproj b/Encodings/Encodings_vs160.vcxproj
index c2ea1924b..8af93886f 100644
--- a/Encodings/Encodings_vs160.vcxproj
+++ b/Encodings/Encodings_vs160.vcxproj
@@ -555,6 +555,13 @@
     <ClInclude Include="include\Poco\ISO8859_7Encoding.h"/>
     <ClInclude Include="include\Poco\ISO8859_8Encoding.h"/>
     <ClInclude Include="include\Poco\ISO8859_9Encoding.h"/>
+    <ClInclude Include="include\Poco\MacCentralEurRomanEncoding.h"/>
+    <ClInclude Include="include\Poco\MacChineseSimpEncoding.h"/>
+    <ClInclude Include="include\Poco\MacChineseTradEncoding.h"/>
+    <ClInclude Include="include\Poco\MacCyrillicEncoding.h"/>
+    <ClInclude Include="include\Poco\MacJapaneseEncoding.h"/>
+    <ClInclude Include="include\Poco\MacKoreanEncoding.h"/>
+    <ClInclude Include="include\Poco\MacRomanEncoding.h"/>
     <ClInclude Include="include\Poco\Windows1253Encoding.h"/>
     <ClInclude Include="include\Poco\Windows1254Encoding.h"/>
     <ClInclude Include="include\Poco\Windows1255Encoding.h"/>
@@ -610,6 +617,27 @@
     <ClCompile Include="src\ISO8859_9Encoding.cpp">
       <MultiProcessorCompilation>true</MultiProcessorCompilation>
     </ClCompile>
+    <ClCompile Include="src\MacCentralEurRomanEncoding.cpp">
+      <MultiProcessorCompilation>true</MultiProcessorCompilation>
+    </ClCompile>
+    <ClCompile Include="src\MacChineseSimpEncoding.cpp">
+      <MultiProcessorCompilation>true</MultiProcessorCompilation>
+    </ClCompile>
+    <ClCompile Include="src\MacChineseTradEncoding.cpp">
+      <MultiProcessorCompilation>true</MultiProcessorCompilation>
+    </ClCompile>
+    <ClCompile Include="src\MacCyrillicEncoding.cpp">
+      <MultiProcessorCompilation>true</MultiProcessorCompilation>
+    </ClCompile>
+    <ClCompile Include="src\MacJapaneseEncoding.cpp">
+      <MultiProcessorCompilation>true</MultiProcessorCompilation>
+    </ClCompile>
+    <ClCompile Include="src\MacKoreanEncoding.cpp">
+      <MultiProcessorCompilation>true</MultiProcessorCompilation>
+    </ClCompile>
+    <ClCompile Include="src\MacRomanEncoding.cpp">
+      <MultiProcessorCompilation>true</MultiProcessorCompilation>
+    </ClCompile>
     <ClCompile Include="src\Windows1253Encoding.cpp">
       <MultiProcessorCompilation>true</MultiProcessorCompilation>
     </ClCompile>
diff --git a/Encodings/Encodings_vs160.vcxproj.filters b/Encodings/Encodings_vs160.vcxproj.filters
index 958c0b469..19648d734 100644
--- a/Encodings/Encodings_vs160.vcxproj.filters
+++ b/Encodings/Encodings_vs160.vcxproj.filters
@@ -2,13 +2,13 @@
 <Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <ItemGroup>
     <Filter Include="Encodings">
-      <UniqueIdentifier>{771c4676-654f-44d3-a24c-7d31745bcd04}</UniqueIdentifier>
+      <UniqueIdentifier>{55103894-3f7d-468d-8f72-02dfb1f682c4}</UniqueIdentifier>
     </Filter>
     <Filter Include="Encodings\Header Files">
-      <UniqueIdentifier>{2eee337f-d34c-42e3-8cdd-a82de9eb348e}</UniqueIdentifier>
+      <UniqueIdentifier>{8309e362-b466-4aaf-8e25-bdb584f77382}</UniqueIdentifier>
     </Filter>
     <Filter Include="Encodings\Source Files">
-      <UniqueIdentifier>{b859645a-894c-49c5-97f2-1d2141dd2922}</UniqueIdentifier>
+      <UniqueIdentifier>{fbc64e7d-d8ff-43a9-86e1-9193e72d9317}</UniqueIdentifier>
     </Filter>
   </ItemGroup>
   <ItemGroup>
@@ -54,6 +54,27 @@
     <ClInclude Include="include\Poco\ISO8859_9Encoding.h">
       <Filter>Encodings\Header Files</Filter>
     </ClInclude>
+    <ClInclude Include="include\Poco\MacCentralEurRomanEncoding.h">
+      <Filter>Encodings\Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="include\Poco\MacChineseSimpEncoding.h">
+      <Filter>Encodings\Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="include\Poco\MacChineseTradEncoding.h">
+      <Filter>Encodings\Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="include\Poco\MacCyrillicEncoding.h">
+      <Filter>Encodings\Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="include\Poco\MacJapaneseEncoding.h">
+      <Filter>Encodings\Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="include\Poco\MacKoreanEncoding.h">
+      <Filter>Encodings\Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="include\Poco\MacRomanEncoding.h">
+      <Filter>Encodings\Header Files</Filter>
+    </ClInclude>
     <ClInclude Include="include\Poco\Windows1253Encoding.h">
       <Filter>Encodings\Header Files</Filter>
     </ClInclude>
@@ -131,6 +152,27 @@
     <ClCompile Include="src\ISO8859_9Encoding.cpp">
       <Filter>Encodings\Source Files</Filter>
     </ClCompile>
+    <ClCompile Include="src\MacCentralEurRomanEncoding.cpp">
+      <Filter>Encodings\Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="src\MacChineseSimpEncoding.cpp">
+      <Filter>Encodings\Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="src\MacChineseTradEncoding.cpp">
+      <Filter>Encodings\Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="src\MacCyrillicEncoding.cpp">
+      <Filter>Encodings\Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="src\MacJapaneseEncoding.cpp">
+      <Filter>Encodings\Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="src\MacKoreanEncoding.cpp">
+      <Filter>Encodings\Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="src\MacRomanEncoding.cpp">
+      <Filter>Encodings\Source Files</Filter>
+    </ClCompile>
     <ClCompile Include="src\Windows1253Encoding.cpp">
       <Filter>Encodings\Source Files</Filter>
     </ClCompile>
diff --git a/Encodings/Encodings_vs90.vcproj b/Encodings/Encodings_vs90.vcproj
index 941c5e597..98cdf3cb1 100644
--- a/Encodings/Encodings_vs90.vcproj
+++ b/Encodings/Encodings_vs90.vcproj
@@ -556,6 +556,34 @@
 					RelativePath=".\include\Poco\ISO8859_9Encoding.h"
 					>
 				</File>
+				<File
+					RelativePath=".\include\Poco\MacCentralEurRomanEncoding.h"
+					>
+				</File>
+				<File
+					RelativePath=".\include\Poco\MacChineseSimpEncoding.h"
+					>
+				</File>
+				<File
+					RelativePath=".\include\Poco\MacChineseTradEncoding.h"
+					>
+				</File>
+				<File
+					RelativePath=".\include\Poco\MacCyrillicEncoding.h"
+					>
+				</File>
+				<File
+					RelativePath=".\include\Poco\MacJapaneseEncoding.h"
+					>
+				</File>
+				<File
+					RelativePath=".\include\Poco\MacKoreanEncoding.h"
+					>
+				</File>
+				<File
+					RelativePath=".\include\Poco\MacRomanEncoding.h"
+					>
+				</File>
 				<File
 					RelativePath=".\include\Poco\Windows1253Encoding.h"
 					>
@@ -660,6 +688,34 @@
 					RelativePath=".\src\ISO8859_9Encoding.cpp"
 					>
 				</File>
+				<File
+					RelativePath=".\src\MacCentralEurRomanEncoding.cpp"
+					>
+				</File>
+				<File
+					RelativePath=".\src\MacChineseSimpEncoding.cpp"
+					>
+				</File>
+				<File
+					RelativePath=".\src\MacChineseTradEncoding.cpp"
+					>
+				</File>
+				<File
+					RelativePath=".\src\MacCyrillicEncoding.cpp"
+					>
+				</File>
+				<File
+					RelativePath=".\src\MacJapaneseEncoding.cpp"
+					>
+				</File>
+				<File
+					RelativePath=".\src\MacKoreanEncoding.cpp"
+					>
+				</File>
+				<File
+					RelativePath=".\src\MacRomanEncoding.cpp"
+					>
+				</File>
 				<File
 					RelativePath=".\src\Windows1253Encoding.cpp"
 					>
@@ -709,20 +765,6 @@
 		<File
 			RelativePath="..\DLLVersion.rc"
 			>
-			<FileConfiguration
-				Name="debug_shared|Win32"
-				>
-				<Tool
-					Name="VCResourceCompilerTool"
-				/>
-			</FileConfiguration>
-			<FileConfiguration
-				Name="release_shared|Win32"
-				>
-				<Tool
-					Name="VCResourceCompilerTool"
-				/>
-			</FileConfiguration>
 			<FileConfiguration
 				Name="debug_static_mt|Win32"
 				ExcludedFromBuild="true"