diff --git a/CppParser/CppParser_vs100.vcxproj b/CppParser/CppParser_vs100.vcxproj
index 9f4daf60c..a744d8f00 100644
--- a/CppParser/CppParser_vs100.vcxproj
+++ b/CppParser/CppParser_vs100.vcxproj
@@ -315,10 +315,8 @@
   </ItemGroup>
   <ItemGroup>
     <ResourceCompile Include="..\DLLVersion.rc">
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='debug_shared|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='debug_static_md|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='debug_static_mt|Win32'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='release_shared|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='release_static_md|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='release_static_mt|Win32'">true</ExcludedFromBuild>
     </ResourceCompile>
diff --git a/CppParser/CppParser_vs100.vcxproj.filters b/CppParser/CppParser_vs100.vcxproj.filters
index eb7f5e142..feb1657cf 100644
--- a/CppParser/CppParser_vs100.vcxproj.filters
+++ b/CppParser/CppParser_vs100.vcxproj.filters
@@ -2,31 +2,31 @@
 <Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <ItemGroup>
     <Filter Include="CppParser">
-      <UniqueIdentifier>{9441dbc8-0742-4ace-9181-63c0675708ff}</UniqueIdentifier>
+      <UniqueIdentifier>{b503baf7-5c2f-4311-a053-c624cb75fea0}</UniqueIdentifier>
     </Filter>
     <Filter Include="CppParser\Header Files">
-      <UniqueIdentifier>{9ac0d454-4ab6-4ccc-a559-e0b2a2ecf91c}</UniqueIdentifier>
+      <UniqueIdentifier>{0a1d3bb0-867f-488d-af16-5c86ec591bc4}</UniqueIdentifier>
     </Filter>
     <Filter Include="CppParser\Source Files">
-      <UniqueIdentifier>{2209ad26-12ad-46f0-be32-5080b6ad9670}</UniqueIdentifier>
+      <UniqueIdentifier>{e2d675b6-a501-4f36-8f23-fd672e96794e}</UniqueIdentifier>
     </Filter>
     <Filter Include="Symbol Table">
-      <UniqueIdentifier>{2d6265cc-2a75-4fca-a728-6ca30eea21d8}</UniqueIdentifier>
+      <UniqueIdentifier>{fb5ff752-0955-4aea-ba74-c82ff205d47e}</UniqueIdentifier>
     </Filter>
     <Filter Include="Symbol Table\Header Files">
-      <UniqueIdentifier>{25e9ba39-fe2b-4e68-935e-a6a3bbe0e80b}</UniqueIdentifier>
+      <UniqueIdentifier>{73702653-52a3-4df7-86fe-123819391188}</UniqueIdentifier>
     </Filter>
     <Filter Include="Symbol Table\Source Files">
-      <UniqueIdentifier>{870e027e-ec84-4480-9d61-429b7cd85e98}</UniqueIdentifier>
+      <UniqueIdentifier>{261e5b2a-3fbd-4cae-9d23-34c77ed62ac0}</UniqueIdentifier>
     </Filter>
     <Filter Include="Attributes">
-      <UniqueIdentifier>{f0c25274-7f36-44d9-aadf-de89699bc751}</UniqueIdentifier>
+      <UniqueIdentifier>{d59567eb-2f25-4bbf-bb3a-637a66e2801d}</UniqueIdentifier>
     </Filter>
     <Filter Include="Attributes\Header Files">
-      <UniqueIdentifier>{8bc55c6d-4459-4322-9beb-b911be6c15a5}</UniqueIdentifier>
+      <UniqueIdentifier>{ec337fb7-2b99-4631-baa1-de952e23a45e}</UniqueIdentifier>
     </Filter>
     <Filter Include="Attributes\Source Files">
-      <UniqueIdentifier>{cc254f6e-3918-4f57-bccb-38aadd7b8cf8}</UniqueIdentifier>
+      <UniqueIdentifier>{a61fa26c-91e4-4b0d-8bc8-b321d7980473}</UniqueIdentifier>
     </Filter>
   </ItemGroup>
   <ItemGroup>
diff --git a/CppParser/CppParser_vs110.vcxproj b/CppParser/CppParser_vs110.vcxproj
index 7c1588c21..54a5eea28 100644
--- a/CppParser/CppParser_vs110.vcxproj
+++ b/CppParser/CppParser_vs110.vcxproj
@@ -316,10 +316,8 @@
   </ItemGroup>
   <ItemGroup>
     <ResourceCompile Include="..\DLLVersion.rc">
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='debug_shared|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='debug_static_md|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='debug_static_mt|Win32'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='release_shared|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='release_static_md|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='release_static_mt|Win32'">true</ExcludedFromBuild>
     </ResourceCompile>
diff --git a/CppParser/CppParser_vs110.vcxproj.filters b/CppParser/CppParser_vs110.vcxproj.filters
index 6224e2dbf..2856660bd 100644
--- a/CppParser/CppParser_vs110.vcxproj.filters
+++ b/CppParser/CppParser_vs110.vcxproj.filters
@@ -2,31 +2,31 @@
 <Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <ItemGroup>
     <Filter Include="CppParser">
-      <UniqueIdentifier>{d703780c-f778-4c2e-8b00-adb2b36ff606}</UniqueIdentifier>
+      <UniqueIdentifier>{09cd02f3-e2ab-41a7-b85d-a3f3504a8951}</UniqueIdentifier>
     </Filter>
     <Filter Include="CppParser\Header Files">
-      <UniqueIdentifier>{b6e3ea05-ac58-424c-8555-f391cebe26c7}</UniqueIdentifier>
+      <UniqueIdentifier>{fba2e1f0-02c3-44b0-b195-4bd21cd3f6ff}</UniqueIdentifier>
     </Filter>
     <Filter Include="CppParser\Source Files">
-      <UniqueIdentifier>{a02c279d-d401-4b18-8056-733c080f914c}</UniqueIdentifier>
+      <UniqueIdentifier>{47da6b06-4ea6-4668-9981-679709a532eb}</UniqueIdentifier>
     </Filter>
     <Filter Include="Symbol Table">
-      <UniqueIdentifier>{e7435206-b40c-48cf-92a6-7b2ab208aeec}</UniqueIdentifier>
+      <UniqueIdentifier>{cb010759-ba33-4fb5-894f-cc6a8a009cc0}</UniqueIdentifier>
     </Filter>
     <Filter Include="Symbol Table\Header Files">
-      <UniqueIdentifier>{dd4eceeb-ddf9-451b-b9fa-14631546fbfe}</UniqueIdentifier>
+      <UniqueIdentifier>{982f3d2d-b95d-489f-b7ab-7f236d1098a7}</UniqueIdentifier>
     </Filter>
     <Filter Include="Symbol Table\Source Files">
-      <UniqueIdentifier>{24658f72-e276-480a-99a3-b3ede1b6f12a}</UniqueIdentifier>
+      <UniqueIdentifier>{27b6c99e-519d-436f-b909-4088ed7e31c0}</UniqueIdentifier>
     </Filter>
     <Filter Include="Attributes">
-      <UniqueIdentifier>{4bc8910d-6af1-475c-a79b-710c26c4eceb}</UniqueIdentifier>
+      <UniqueIdentifier>{68ce39fc-c5b0-441f-8a89-0db8e24a9274}</UniqueIdentifier>
     </Filter>
     <Filter Include="Attributes\Header Files">
-      <UniqueIdentifier>{eb0d626d-1ba9-4f13-859a-33f717a774ab}</UniqueIdentifier>
+      <UniqueIdentifier>{ac24169e-d159-43fc-b2e0-bb51f088b5ba}</UniqueIdentifier>
     </Filter>
     <Filter Include="Attributes\Source Files">
-      <UniqueIdentifier>{ced11c1d-8646-4ecd-add6-d313e143c34b}</UniqueIdentifier>
+      <UniqueIdentifier>{02c0bdf9-3bee-471b-ab31-763f0a5543a4}</UniqueIdentifier>
     </Filter>
   </ItemGroup>
   <ItemGroup>
diff --git a/CppParser/CppParser_vs120.vcxproj b/CppParser/CppParser_vs120.vcxproj
index afa3e2978..1461bc69a 100644
--- a/CppParser/CppParser_vs120.vcxproj
+++ b/CppParser/CppParser_vs120.vcxproj
@@ -316,10 +316,8 @@
   </ItemGroup>
   <ItemGroup>
     <ResourceCompile Include="..\DLLVersion.rc">
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='debug_shared|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='debug_static_md|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='debug_static_mt|Win32'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='release_shared|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='release_static_md|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='release_static_mt|Win32'">true</ExcludedFromBuild>
     </ResourceCompile>
diff --git a/CppParser/CppParser_vs120.vcxproj.filters b/CppParser/CppParser_vs120.vcxproj.filters
index 35731a5a9..03a19527e 100644
--- a/CppParser/CppParser_vs120.vcxproj.filters
+++ b/CppParser/CppParser_vs120.vcxproj.filters
@@ -2,31 +2,31 @@
 <Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <ItemGroup>
     <Filter Include="CppParser">
-      <UniqueIdentifier>{e90daff2-4464-43a8-b1dd-dc0f53dbbb14}</UniqueIdentifier>
+      <UniqueIdentifier>{48880665-9357-484b-ab30-754954ce76fe}</UniqueIdentifier>
     </Filter>
     <Filter Include="CppParser\Header Files">
-      <UniqueIdentifier>{e4308296-0da3-4bca-abae-6450895f40ac}</UniqueIdentifier>
+      <UniqueIdentifier>{49981f1c-bf0d-43c8-be31-eedbc80fe04c}</UniqueIdentifier>
     </Filter>
     <Filter Include="CppParser\Source Files">
-      <UniqueIdentifier>{bec0c906-eb50-4b60-bf41-72080247b883}</UniqueIdentifier>
+      <UniqueIdentifier>{98843600-d61d-4986-b4d5-dabba9b6fe94}</UniqueIdentifier>
     </Filter>
     <Filter Include="Symbol Table">
-      <UniqueIdentifier>{f86a876c-cc50-4422-816f-5e37be08d6a1}</UniqueIdentifier>
+      <UniqueIdentifier>{8531e24a-1906-4576-b25e-205f806a1676}</UniqueIdentifier>
     </Filter>
     <Filter Include="Symbol Table\Header Files">
-      <UniqueIdentifier>{5bf98ee5-b3a5-417c-86cc-70f58f8392b3}</UniqueIdentifier>
+      <UniqueIdentifier>{f8720f12-5517-4b95-86e6-425ed0d6305a}</UniqueIdentifier>
     </Filter>
     <Filter Include="Symbol Table\Source Files">
-      <UniqueIdentifier>{4078d357-2558-4b9f-8e30-614cbc2368e2}</UniqueIdentifier>
+      <UniqueIdentifier>{5bf53221-f010-40f9-95c7-63d6eaed91e9}</UniqueIdentifier>
     </Filter>
     <Filter Include="Attributes">
-      <UniqueIdentifier>{e05bd5ab-c020-4e78-9d36-f8d047437e1a}</UniqueIdentifier>
+      <UniqueIdentifier>{9f7989c1-571d-44bd-adf8-22284ec0ae1d}</UniqueIdentifier>
     </Filter>
     <Filter Include="Attributes\Header Files">
-      <UniqueIdentifier>{d005a889-b8c4-44c4-b280-aeb3038a09dc}</UniqueIdentifier>
+      <UniqueIdentifier>{c70960e3-4289-4988-aeec-a7f4f6e4f5fd}</UniqueIdentifier>
     </Filter>
     <Filter Include="Attributes\Source Files">
-      <UniqueIdentifier>{54faf944-dd0c-49da-9648-03debcd708fc}</UniqueIdentifier>
+      <UniqueIdentifier>{3cb7d765-c186-4e8e-a548-4a7ff3610090}</UniqueIdentifier>
     </Filter>
   </ItemGroup>
   <ItemGroup>
diff --git a/CppParser/CppParser_vs140.vcxproj b/CppParser/CppParser_vs140.vcxproj
index be714f7bd..1d17f59db 100644
--- a/CppParser/CppParser_vs140.vcxproj
+++ b/CppParser/CppParser_vs140.vcxproj
@@ -316,10 +316,8 @@
   </ItemGroup>
   <ItemGroup>
     <ResourceCompile Include="..\DLLVersion.rc">
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='debug_shared|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='debug_static_md|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='debug_static_mt|Win32'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='release_shared|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='release_static_md|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='release_static_mt|Win32'">true</ExcludedFromBuild>
     </ResourceCompile>
diff --git a/CppParser/CppParser_vs140.vcxproj.filters b/CppParser/CppParser_vs140.vcxproj.filters
index b7000ff64..0dc9d69c4 100644
--- a/CppParser/CppParser_vs140.vcxproj.filters
+++ b/CppParser/CppParser_vs140.vcxproj.filters
@@ -2,31 +2,31 @@
 <Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <ItemGroup>
     <Filter Include="CppParser">
-      <UniqueIdentifier>{5bb7de66-7748-48cf-9742-146dfebaa00e}</UniqueIdentifier>
+      <UniqueIdentifier>{0562ba3b-7e83-4402-af4e-e669b5ce8145}</UniqueIdentifier>
     </Filter>
     <Filter Include="CppParser\Header Files">
-      <UniqueIdentifier>{45e5765a-bd06-4ce7-8a59-7d535f16746c}</UniqueIdentifier>
+      <UniqueIdentifier>{562ec776-346a-42c2-8827-cadbedf7818f}</UniqueIdentifier>
     </Filter>
     <Filter Include="CppParser\Source Files">
-      <UniqueIdentifier>{486fb907-2562-4d9d-a243-be73adb86c09}</UniqueIdentifier>
+      <UniqueIdentifier>{80fb837a-2477-4f78-bed9-503b7cd26286}</UniqueIdentifier>
     </Filter>
     <Filter Include="Symbol Table">
-      <UniqueIdentifier>{09c3bfe1-796a-4837-a8e9-eaca51b35415}</UniqueIdentifier>
+      <UniqueIdentifier>{61843947-2aff-4b3c-9fa4-8083b5b6ca71}</UniqueIdentifier>
     </Filter>
     <Filter Include="Symbol Table\Header Files">
-      <UniqueIdentifier>{27d005ce-4457-4583-ac6e-80f506c56dc1}</UniqueIdentifier>
+      <UniqueIdentifier>{a76ff884-8f54-46ca-9ce5-04ae71a2454a}</UniqueIdentifier>
     </Filter>
     <Filter Include="Symbol Table\Source Files">
-      <UniqueIdentifier>{c504d43c-1679-4182-935f-a0806646faad}</UniqueIdentifier>
+      <UniqueIdentifier>{a6c7677a-ea51-4f14-bb29-3e62f24e9b49}</UniqueIdentifier>
     </Filter>
     <Filter Include="Attributes">
-      <UniqueIdentifier>{56421158-514e-42df-a819-b81d75ef6436}</UniqueIdentifier>
+      <UniqueIdentifier>{9e9e62b7-0160-4afc-b7e2-e49307bb4589}</UniqueIdentifier>
     </Filter>
     <Filter Include="Attributes\Header Files">
-      <UniqueIdentifier>{f24940ad-e8bf-4d51-8bd1-5d66bb0dccd9}</UniqueIdentifier>
+      <UniqueIdentifier>{e8020dc2-1ee2-46c3-9a79-f92f2512f9bd}</UniqueIdentifier>
     </Filter>
     <Filter Include="Attributes\Source Files">
-      <UniqueIdentifier>{31a66cd7-d3ab-4069-bd38-1f340498564f}</UniqueIdentifier>
+      <UniqueIdentifier>{38fd5468-d14d-4790-9f26-e42f086cfbea}</UniqueIdentifier>
     </Filter>
   </ItemGroup>
   <ItemGroup>
diff --git a/CppParser/CppParser_vs150.vcxproj b/CppParser/CppParser_vs150.vcxproj
index c62a4622a..bd71bc6e0 100644
--- a/CppParser/CppParser_vs150.vcxproj
+++ b/CppParser/CppParser_vs150.vcxproj
@@ -316,10 +316,8 @@
   </ItemGroup>
   <ItemGroup>
     <ResourceCompile Include="..\DLLVersion.rc">
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='debug_shared|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='debug_static_md|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='debug_static_mt|Win32'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='release_shared|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='release_static_md|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='release_static_mt|Win32'">true</ExcludedFromBuild>
     </ResourceCompile>
diff --git a/CppParser/CppParser_vs150.vcxproj.filters b/CppParser/CppParser_vs150.vcxproj.filters
index 75b7a5c80..414c28f82 100644
--- a/CppParser/CppParser_vs150.vcxproj.filters
+++ b/CppParser/CppParser_vs150.vcxproj.filters
@@ -2,31 +2,31 @@
 <Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <ItemGroup>
     <Filter Include="CppParser">
-      <UniqueIdentifier>{a1833b69-a48b-4622-969e-59e0e527d6fa}</UniqueIdentifier>
+      <UniqueIdentifier>{404d9a93-b587-460c-ac45-812af58279ce}</UniqueIdentifier>
     </Filter>
     <Filter Include="CppParser\Header Files">
-      <UniqueIdentifier>{cf17f0da-b0eb-4c14-bd64-57e6b97e9293}</UniqueIdentifier>
+      <UniqueIdentifier>{7c82da71-77b7-4ce0-a94b-9ae2582de88d}</UniqueIdentifier>
     </Filter>
     <Filter Include="CppParser\Source Files">
-      <UniqueIdentifier>{e4c5db0b-8e92-4de9-8ce9-5d766845266a}</UniqueIdentifier>
+      <UniqueIdentifier>{400d448b-b74f-4841-b2bc-ed0f166a28b4}</UniqueIdentifier>
     </Filter>
     <Filter Include="Symbol Table">
-      <UniqueIdentifier>{11d5299f-4e74-4199-a819-8a02a9d3a284}</UniqueIdentifier>
+      <UniqueIdentifier>{4f6f3e8d-7501-4003-a48c-e73a747e7182}</UniqueIdentifier>
     </Filter>
     <Filter Include="Symbol Table\Header Files">
-      <UniqueIdentifier>{4827323d-b328-4079-bc63-7a80b5fa1f6e}</UniqueIdentifier>
+      <UniqueIdentifier>{abf5a8d7-6ad9-4fc3-b65a-165cbd90df4c}</UniqueIdentifier>
     </Filter>
     <Filter Include="Symbol Table\Source Files">
-      <UniqueIdentifier>{3d459803-a1f0-4687-895a-edfc84b6014e}</UniqueIdentifier>
+      <UniqueIdentifier>{780690ed-8624-4d4b-bb02-262682b69e76}</UniqueIdentifier>
     </Filter>
     <Filter Include="Attributes">
-      <UniqueIdentifier>{30d3b666-4d14-4d49-b51f-bbe33afc5409}</UniqueIdentifier>
+      <UniqueIdentifier>{d436905f-911d-4e71-a8e3-213431dd53b4}</UniqueIdentifier>
     </Filter>
     <Filter Include="Attributes\Header Files">
-      <UniqueIdentifier>{cd5ec479-6d25-4fe1-b343-beaa54d61048}</UniqueIdentifier>
+      <UniqueIdentifier>{309223a2-523c-438a-ace9-cbc5d63c9ff9}</UniqueIdentifier>
     </Filter>
     <Filter Include="Attributes\Source Files">
-      <UniqueIdentifier>{cb68fc50-fd6e-4c2b-9576-151be7c1ae8e}</UniqueIdentifier>
+      <UniqueIdentifier>{26eb62c7-4027-496a-96e9-0367edcc2b8a}</UniqueIdentifier>
     </Filter>
   </ItemGroup>
   <ItemGroup>
diff --git a/CppParser/CppParser_vs160.vcxproj b/CppParser/CppParser_vs160.vcxproj
index 66d30d3e6..d713ac33a 100644
--- a/CppParser/CppParser_vs160.vcxproj
+++ b/CppParser/CppParser_vs160.vcxproj
@@ -316,10 +316,8 @@
   </ItemGroup>
   <ItemGroup>
     <ResourceCompile Include="..\DLLVersion.rc">
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='debug_shared|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='debug_static_md|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='debug_static_mt|Win32'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='release_shared|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='release_static_md|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='release_static_mt|Win32'">true</ExcludedFromBuild>
     </ResourceCompile>
diff --git a/CppParser/CppParser_vs160.vcxproj.filters b/CppParser/CppParser_vs160.vcxproj.filters
index 581e5637e..88f7bc179 100644
--- a/CppParser/CppParser_vs160.vcxproj.filters
+++ b/CppParser/CppParser_vs160.vcxproj.filters
@@ -2,31 +2,31 @@
 <Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <ItemGroup>
     <Filter Include="CppParser">
-      <UniqueIdentifier>{ef433e97-066c-45f4-9a1d-f806d8b5d280}</UniqueIdentifier>
+      <UniqueIdentifier>{1b1af46f-c2bd-4181-abc2-da36dc34a199}</UniqueIdentifier>
     </Filter>
     <Filter Include="CppParser\Header Files">
-      <UniqueIdentifier>{1386086a-fb9d-4f1c-8379-620bf0912f2e}</UniqueIdentifier>
+      <UniqueIdentifier>{6eadc33e-34ee-451a-ae53-df0abe795b06}</UniqueIdentifier>
     </Filter>
     <Filter Include="CppParser\Source Files">
-      <UniqueIdentifier>{2e3b5d35-5036-496c-8052-03f8bb88cd05}</UniqueIdentifier>
+      <UniqueIdentifier>{369fcaa3-6563-4ef4-92d3-9fe8c7fe5e1e}</UniqueIdentifier>
     </Filter>
     <Filter Include="Symbol Table">
-      <UniqueIdentifier>{57047c36-bbcc-444d-9f07-99e0d1f2c461}</UniqueIdentifier>
+      <UniqueIdentifier>{19601543-b0c2-46d0-b808-0c4d58191f40}</UniqueIdentifier>
     </Filter>
     <Filter Include="Symbol Table\Header Files">
-      <UniqueIdentifier>{64a3a8fa-bdbc-40b6-8280-71fdda375aff}</UniqueIdentifier>
+      <UniqueIdentifier>{eb33952d-bf93-4108-b3e5-6941dda08699}</UniqueIdentifier>
     </Filter>
     <Filter Include="Symbol Table\Source Files">
-      <UniqueIdentifier>{2bf3217c-3b04-4844-b40a-14dd8172e1b2}</UniqueIdentifier>
+      <UniqueIdentifier>{c2ca216b-7bc5-4c28-8560-91c289eddde5}</UniqueIdentifier>
     </Filter>
     <Filter Include="Attributes">
-      <UniqueIdentifier>{b80e5a59-1ddb-466e-b66a-69b3c1d596c0}</UniqueIdentifier>
+      <UniqueIdentifier>{10a57204-2faa-48af-b36a-2661a934eccc}</UniqueIdentifier>
     </Filter>
     <Filter Include="Attributes\Header Files">
-      <UniqueIdentifier>{ce552792-3b1e-46ce-b6de-4bdc70963b44}</UniqueIdentifier>
+      <UniqueIdentifier>{53095b42-e709-4096-a609-309a79796bd5}</UniqueIdentifier>
     </Filter>
     <Filter Include="Attributes\Source Files">
-      <UniqueIdentifier>{d78ca5ec-2552-4c5e-b55b-cd8c09df568b}</UniqueIdentifier>
+      <UniqueIdentifier>{0c506e34-8a40-4776-94e7-06233aca0fcf}</UniqueIdentifier>
     </Filter>
   </ItemGroup>
   <ItemGroup>
diff --git a/CppParser/CppParser_vs90.vcproj b/CppParser/CppParser_vs90.vcproj
index 1d3bf165c..f83165240 100644
--- a/CppParser/CppParser_vs90.vcproj
+++ b/CppParser/CppParser_vs90.vcproj
@@ -488,14 +488,12 @@
 		<File
 			RelativePath="..\DLLVersion.rc">
 			<FileConfiguration
-				Name="debug_shared|Win32"
-				ExcludedFromBuild="true">
+				Name="debug_shared|Win32">
 				<Tool
 					Name="VCResourceCompilerTool"/>
 			</FileConfiguration>
 			<FileConfiguration
-				Name="release_shared|Win32"
-				ExcludedFromBuild="true">
+				Name="release_shared|Win32">
 				<Tool
 					Name="VCResourceCompilerTool"/>
 			</FileConfiguration>
diff --git a/CppParser/CppParser_x64_vs100.vcxproj b/CppParser/CppParser_x64_vs100.vcxproj
index 983a01e22..add34e024 100644
--- a/CppParser/CppParser_x64_vs100.vcxproj
+++ b/CppParser/CppParser_x64_vs100.vcxproj
@@ -313,10 +313,8 @@
   </ItemGroup>
   <ItemGroup>
     <ResourceCompile Include="..\DLLVersion.rc">
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='debug_shared|x64'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='debug_static_md|x64'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='debug_static_mt|x64'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='release_shared|x64'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='release_static_md|x64'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='release_static_mt|x64'">true</ExcludedFromBuild>
     </ResourceCompile>
diff --git a/CppParser/CppParser_x64_vs100.vcxproj.filters b/CppParser/CppParser_x64_vs100.vcxproj.filters
index 436c8aa2a..f076dcb69 100644
--- a/CppParser/CppParser_x64_vs100.vcxproj.filters
+++ b/CppParser/CppParser_x64_vs100.vcxproj.filters
@@ -2,31 +2,31 @@
 <Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <ItemGroup>
     <Filter Include="CppParser">
-      <UniqueIdentifier>{2f6423a8-1fbd-4d51-8056-eb8326a0942c}</UniqueIdentifier>
+      <UniqueIdentifier>{3d960260-d605-4a86-8ba0-fd49858434d0}</UniqueIdentifier>
     </Filter>
     <Filter Include="CppParser\Header Files">
-      <UniqueIdentifier>{cdb8cfc4-3a44-4c48-950e-b52d57ddd6b1}</UniqueIdentifier>
+      <UniqueIdentifier>{7aa1e53b-a451-4172-86c3-0391dd0a8c0d}</UniqueIdentifier>
     </Filter>
     <Filter Include="CppParser\Source Files">
-      <UniqueIdentifier>{465a91b1-28c1-4b42-b178-4b9956a6ff3c}</UniqueIdentifier>
+      <UniqueIdentifier>{76644252-a130-4010-a004-7afb072c9469}</UniqueIdentifier>
     </Filter>
     <Filter Include="Symbol Table">
-      <UniqueIdentifier>{3f310c65-fde4-4dd9-b260-557603e68877}</UniqueIdentifier>
+      <UniqueIdentifier>{1fc388f4-bfc0-4a9b-836c-12f548f9e87b}</UniqueIdentifier>
     </Filter>
     <Filter Include="Symbol Table\Header Files">
-      <UniqueIdentifier>{28feb37c-c01e-4569-bf63-10860dcb64d7}</UniqueIdentifier>
+      <UniqueIdentifier>{b2cb30f0-5922-498f-8cd5-a332f9eb5b5e}</UniqueIdentifier>
     </Filter>
     <Filter Include="Symbol Table\Source Files">
-      <UniqueIdentifier>{007df162-8283-4d52-9439-f2856194e0cc}</UniqueIdentifier>
+      <UniqueIdentifier>{ed8a5ff7-0d81-44c8-a9ab-4f38b0955e57}</UniqueIdentifier>
     </Filter>
     <Filter Include="Attributes">
-      <UniqueIdentifier>{380180be-53b2-4ca2-8283-7fb9d9283980}</UniqueIdentifier>
+      <UniqueIdentifier>{98eea81e-4935-4f70-931c-e24a75dd89b0}</UniqueIdentifier>
     </Filter>
     <Filter Include="Attributes\Header Files">
-      <UniqueIdentifier>{19471cc0-4c6a-4c0a-949c-e9d30de0d837}</UniqueIdentifier>
+      <UniqueIdentifier>{215f37da-2375-4a5f-b94c-201b5b2ca444}</UniqueIdentifier>
     </Filter>
     <Filter Include="Attributes\Source Files">
-      <UniqueIdentifier>{9872da4f-0514-46d7-a227-3dfc808a10a6}</UniqueIdentifier>
+      <UniqueIdentifier>{0dec876b-7695-42f7-b311-9dcb62fa8019}</UniqueIdentifier>
     </Filter>
   </ItemGroup>
   <ItemGroup>
diff --git a/CppParser/CppParser_x64_vs110.vcxproj b/CppParser/CppParser_x64_vs110.vcxproj
index 09365d4d5..c9a1d5f82 100644
--- a/CppParser/CppParser_x64_vs110.vcxproj
+++ b/CppParser/CppParser_x64_vs110.vcxproj
@@ -315,10 +315,8 @@
   </ItemGroup>
   <ItemGroup>
     <ResourceCompile Include="..\DLLVersion.rc">
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='debug_shared|x64'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='debug_static_md|x64'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='debug_static_mt|x64'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='release_shared|x64'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='release_static_md|x64'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='release_static_mt|x64'">true</ExcludedFromBuild>
     </ResourceCompile>
diff --git a/CppParser/CppParser_x64_vs110.vcxproj.filters b/CppParser/CppParser_x64_vs110.vcxproj.filters
index 9b6125758..7674feae1 100644
--- a/CppParser/CppParser_x64_vs110.vcxproj.filters
+++ b/CppParser/CppParser_x64_vs110.vcxproj.filters
@@ -2,31 +2,31 @@
 <Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <ItemGroup>
     <Filter Include="CppParser">
-      <UniqueIdentifier>{2807980a-d672-42f5-ba8f-d21d95242beb}</UniqueIdentifier>
+      <UniqueIdentifier>{3f3986a6-d96c-4a04-853a-58600e150a82}</UniqueIdentifier>
     </Filter>
     <Filter Include="CppParser\Header Files">
-      <UniqueIdentifier>{51f1bad8-c039-4cd2-834c-d22aa7b2ba16}</UniqueIdentifier>
+      <UniqueIdentifier>{61d6976a-70fe-4af5-8ff1-11cffe9e3c97}</UniqueIdentifier>
     </Filter>
     <Filter Include="CppParser\Source Files">
-      <UniqueIdentifier>{c1bf5a69-b566-4084-b434-ddd6cc4d0c4f}</UniqueIdentifier>
+      <UniqueIdentifier>{55a72a48-099f-42f9-8b54-45ea7e493926}</UniqueIdentifier>
     </Filter>
     <Filter Include="Symbol Table">
-      <UniqueIdentifier>{3d310396-6051-4801-9a4b-a87dffec6aa6}</UniqueIdentifier>
+      <UniqueIdentifier>{08b83360-44ee-48e7-9ac0-0a72af9a80d7}</UniqueIdentifier>
     </Filter>
     <Filter Include="Symbol Table\Header Files">
-      <UniqueIdentifier>{ec549c60-566f-4e76-8acd-1a30e7161904}</UniqueIdentifier>
+      <UniqueIdentifier>{4bfda3c3-d06b-47b9-bb80-59f5607d9a94}</UniqueIdentifier>
     </Filter>
     <Filter Include="Symbol Table\Source Files">
-      <UniqueIdentifier>{9328c36a-f17a-4a98-b32c-b951dd5b148b}</UniqueIdentifier>
+      <UniqueIdentifier>{4b1d5cdd-694f-49c5-95c3-b8c4af16ae72}</UniqueIdentifier>
     </Filter>
     <Filter Include="Attributes">
-      <UniqueIdentifier>{b9ba80fc-ed9f-4a4d-b659-ac8e55363755}</UniqueIdentifier>
+      <UniqueIdentifier>{a18a8f8d-3b28-4455-b3a6-f35f88c3a67b}</UniqueIdentifier>
     </Filter>
     <Filter Include="Attributes\Header Files">
-      <UniqueIdentifier>{a380ca14-3afd-4bbb-91d6-39570b7f9601}</UniqueIdentifier>
+      <UniqueIdentifier>{2fc9ed93-d300-496e-a4d8-4ae51fe471f8}</UniqueIdentifier>
     </Filter>
     <Filter Include="Attributes\Source Files">
-      <UniqueIdentifier>{fbd0a426-8efd-4b41-a5fc-2c8f3709e282}</UniqueIdentifier>
+      <UniqueIdentifier>{d1c5e057-7d3e-480d-8af2-09f3ddcf2b9e}</UniqueIdentifier>
     </Filter>
   </ItemGroup>
   <ItemGroup>
diff --git a/CppParser/CppParser_x64_vs120.vcxproj b/CppParser/CppParser_x64_vs120.vcxproj
index b79bff550..b718b0bd8 100644
--- a/CppParser/CppParser_x64_vs120.vcxproj
+++ b/CppParser/CppParser_x64_vs120.vcxproj
@@ -315,10 +315,8 @@
   </ItemGroup>
   <ItemGroup>
     <ResourceCompile Include="..\DLLVersion.rc">
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='debug_shared|x64'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='debug_static_md|x64'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='debug_static_mt|x64'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='release_shared|x64'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='release_static_md|x64'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='release_static_mt|x64'">true</ExcludedFromBuild>
     </ResourceCompile>
diff --git a/CppParser/CppParser_x64_vs120.vcxproj.filters b/CppParser/CppParser_x64_vs120.vcxproj.filters
index 44bd5fa4b..fe1880791 100644
--- a/CppParser/CppParser_x64_vs120.vcxproj.filters
+++ b/CppParser/CppParser_x64_vs120.vcxproj.filters
@@ -2,31 +2,31 @@
 <Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <ItemGroup>
     <Filter Include="CppParser">
-      <UniqueIdentifier>{f8fe85a1-01b1-430b-991f-5a23caf5d421}</UniqueIdentifier>
+      <UniqueIdentifier>{ae0244d4-ad20-4fd7-a16c-a99429b0690c}</UniqueIdentifier>
     </Filter>
     <Filter Include="CppParser\Header Files">
-      <UniqueIdentifier>{aed9e45a-09fc-40e2-9064-56e2f6e04684}</UniqueIdentifier>
+      <UniqueIdentifier>{b37f2468-24d1-4f5e-a054-310781c0aba6}</UniqueIdentifier>
     </Filter>
     <Filter Include="CppParser\Source Files">
-      <UniqueIdentifier>{6f66f05b-f975-4909-ac2f-8b6d9f8bb53e}</UniqueIdentifier>
+      <UniqueIdentifier>{3cf9f67c-8780-4654-af9a-c5cfd2b569c9}</UniqueIdentifier>
     </Filter>
     <Filter Include="Symbol Table">
-      <UniqueIdentifier>{310837c5-2cf6-435d-88df-c5a05021a588}</UniqueIdentifier>
+      <UniqueIdentifier>{d7c99be0-ef21-42e4-8184-e2f56c33d4ee}</UniqueIdentifier>
     </Filter>
     <Filter Include="Symbol Table\Header Files">
-      <UniqueIdentifier>{ce4d523e-e416-439c-ba2e-a1c9f67f0b88}</UniqueIdentifier>
+      <UniqueIdentifier>{91bad859-fada-4196-b84a-7ff1666189fe}</UniqueIdentifier>
     </Filter>
     <Filter Include="Symbol Table\Source Files">
-      <UniqueIdentifier>{a02d5d98-4eac-4179-a235-90be619feb88}</UniqueIdentifier>
+      <UniqueIdentifier>{d65b0fc5-fc77-44b3-94fa-d68e9fddd4f9}</UniqueIdentifier>
     </Filter>
     <Filter Include="Attributes">
-      <UniqueIdentifier>{fa5debe2-dfe1-416c-a2a5-5f218cf07098}</UniqueIdentifier>
+      <UniqueIdentifier>{b7ca7161-5d45-44f3-acda-d069d5afbb23}</UniqueIdentifier>
     </Filter>
     <Filter Include="Attributes\Header Files">
-      <UniqueIdentifier>{5d31d4c8-ab72-4c20-86fa-219c99ffd517}</UniqueIdentifier>
+      <UniqueIdentifier>{85648546-28aa-4fb8-8793-2ad4ccfb901c}</UniqueIdentifier>
     </Filter>
     <Filter Include="Attributes\Source Files">
-      <UniqueIdentifier>{412cd5ea-88e4-4c22-aecf-00cbe3f14c8d}</UniqueIdentifier>
+      <UniqueIdentifier>{fb409b27-cdbe-4c27-a88a-0721801b94e6}</UniqueIdentifier>
     </Filter>
   </ItemGroup>
   <ItemGroup>
diff --git a/CppParser/CppParser_x64_vs140.vcxproj b/CppParser/CppParser_x64_vs140.vcxproj
index 3054d5889..a80cac4c1 100644
--- a/CppParser/CppParser_x64_vs140.vcxproj
+++ b/CppParser/CppParser_x64_vs140.vcxproj
@@ -315,10 +315,8 @@
   </ItemGroup>
   <ItemGroup>
     <ResourceCompile Include="..\DLLVersion.rc">
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='debug_shared|x64'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='debug_static_md|x64'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='debug_static_mt|x64'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='release_shared|x64'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='release_static_md|x64'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='release_static_mt|x64'">true</ExcludedFromBuild>
     </ResourceCompile>
diff --git a/CppParser/CppParser_x64_vs140.vcxproj.filters b/CppParser/CppParser_x64_vs140.vcxproj.filters
index e086455b7..6377bb930 100644
--- a/CppParser/CppParser_x64_vs140.vcxproj.filters
+++ b/CppParser/CppParser_x64_vs140.vcxproj.filters
@@ -2,31 +2,31 @@
 <Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <ItemGroup>
     <Filter Include="CppParser">
-      <UniqueIdentifier>{1852fffa-5571-48b0-beb4-e57c1ff828cf}</UniqueIdentifier>
+      <UniqueIdentifier>{1aa9aee9-3751-478f-821d-2360b6041aff}</UniqueIdentifier>
     </Filter>
     <Filter Include="CppParser\Header Files">
-      <UniqueIdentifier>{229bcfc0-fcf7-4068-af5b-c2f89c6e71e2}</UniqueIdentifier>
+      <UniqueIdentifier>{9a3b1fdd-a48e-463b-b908-d9c7234db595}</UniqueIdentifier>
     </Filter>
     <Filter Include="CppParser\Source Files">
-      <UniqueIdentifier>{608caab5-b09b-4344-9a77-8221c6eb4f7d}</UniqueIdentifier>
+      <UniqueIdentifier>{3f20aa8f-3590-42b1-b374-19e70f9ad5cc}</UniqueIdentifier>
     </Filter>
     <Filter Include="Symbol Table">
-      <UniqueIdentifier>{c4eeba55-c24c-4069-9031-5e7a00fbf141}</UniqueIdentifier>
+      <UniqueIdentifier>{85e39b11-a371-47d6-8a1b-280cb717159c}</UniqueIdentifier>
     </Filter>
     <Filter Include="Symbol Table\Header Files">
-      <UniqueIdentifier>{bab3fb65-b7c3-4678-8eb3-c70727643ba5}</UniqueIdentifier>
+      <UniqueIdentifier>{366ba9fe-5bac-499d-ba43-9e1b04284f44}</UniqueIdentifier>
     </Filter>
     <Filter Include="Symbol Table\Source Files">
-      <UniqueIdentifier>{776cfcbd-b1bc-4ca0-9701-4dcaa6273d53}</UniqueIdentifier>
+      <UniqueIdentifier>{456b5519-6f5d-48e9-9207-a9ea5b12fb24}</UniqueIdentifier>
     </Filter>
     <Filter Include="Attributes">
-      <UniqueIdentifier>{f618c26f-5e5e-4c11-b921-56f733ac50db}</UniqueIdentifier>
+      <UniqueIdentifier>{df8ca970-ea79-4162-94ac-59d0d056f003}</UniqueIdentifier>
     </Filter>
     <Filter Include="Attributes\Header Files">
-      <UniqueIdentifier>{badc05a9-7cd1-488d-8660-54eb66d9e80d}</UniqueIdentifier>
+      <UniqueIdentifier>{26c2e2d1-9f16-4d4b-9d7f-4046e214e41c}</UniqueIdentifier>
     </Filter>
     <Filter Include="Attributes\Source Files">
-      <UniqueIdentifier>{8bf820f8-892d-456b-a428-0f11a5b742c4}</UniqueIdentifier>
+      <UniqueIdentifier>{134e261f-90b1-41ce-800f-f9aaac5a1b2b}</UniqueIdentifier>
     </Filter>
   </ItemGroup>
   <ItemGroup>
diff --git a/CppParser/CppParser_x64_vs150.vcxproj b/CppParser/CppParser_x64_vs150.vcxproj
index 5c65b1df5..8d79d3916 100644
--- a/CppParser/CppParser_x64_vs150.vcxproj
+++ b/CppParser/CppParser_x64_vs150.vcxproj
@@ -315,10 +315,8 @@
   </ItemGroup>
   <ItemGroup>
     <ResourceCompile Include="..\DLLVersion.rc">
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='debug_shared|x64'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='debug_static_md|x64'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='debug_static_mt|x64'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='release_shared|x64'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='release_static_md|x64'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='release_static_mt|x64'">true</ExcludedFromBuild>
     </ResourceCompile>
diff --git a/CppParser/CppParser_x64_vs150.vcxproj.filters b/CppParser/CppParser_x64_vs150.vcxproj.filters
index 29299a478..533b7468e 100644
--- a/CppParser/CppParser_x64_vs150.vcxproj.filters
+++ b/CppParser/CppParser_x64_vs150.vcxproj.filters
@@ -2,31 +2,31 @@
 <Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <ItemGroup>
     <Filter Include="CppParser">
-      <UniqueIdentifier>{1761599f-770b-48fd-beb7-daea9ffed974}</UniqueIdentifier>
+      <UniqueIdentifier>{2856e4c1-6e53-43ee-97d3-a7629e14a175}</UniqueIdentifier>
     </Filter>
     <Filter Include="CppParser\Header Files">
-      <UniqueIdentifier>{9161600e-2fa1-4684-8ec7-64213492fa2f}</UniqueIdentifier>
+      <UniqueIdentifier>{cd170549-ed20-4f9b-a914-4ea6fe22b836}</UniqueIdentifier>
     </Filter>
     <Filter Include="CppParser\Source Files">
-      <UniqueIdentifier>{9f430b32-aa25-408f-91f1-76a3b499312a}</UniqueIdentifier>
+      <UniqueIdentifier>{1f399c24-c961-453d-b1ef-bb269a19beb4}</UniqueIdentifier>
     </Filter>
     <Filter Include="Symbol Table">
-      <UniqueIdentifier>{0075bbd5-7562-45a6-a79a-a5c77c58d273}</UniqueIdentifier>
+      <UniqueIdentifier>{407dc957-6833-4be9-b7b5-8f1fe2a68413}</UniqueIdentifier>
     </Filter>
     <Filter Include="Symbol Table\Header Files">
-      <UniqueIdentifier>{b7efab27-c479-4371-b11e-42e6c0b5bfe1}</UniqueIdentifier>
+      <UniqueIdentifier>{a519c063-00ce-45ed-85b5-81b662ca6a5b}</UniqueIdentifier>
     </Filter>
     <Filter Include="Symbol Table\Source Files">
-      <UniqueIdentifier>{4a5fdd0c-d44a-4c45-8a88-0b97d2bc4248}</UniqueIdentifier>
+      <UniqueIdentifier>{4728dd41-be8c-40b8-afde-f904cdb82b6e}</UniqueIdentifier>
     </Filter>
     <Filter Include="Attributes">
-      <UniqueIdentifier>{14e78bd4-83d0-419e-b3fb-ec4be4bf53a7}</UniqueIdentifier>
+      <UniqueIdentifier>{c52f9a00-d601-4de9-9a42-6516630bea85}</UniqueIdentifier>
     </Filter>
     <Filter Include="Attributes\Header Files">
-      <UniqueIdentifier>{e73d70de-4de7-4b44-afc3-45199a18a70d}</UniqueIdentifier>
+      <UniqueIdentifier>{7eecf06b-3144-4271-8d27-b83565c3d67e}</UniqueIdentifier>
     </Filter>
     <Filter Include="Attributes\Source Files">
-      <UniqueIdentifier>{6d9caace-da1f-4a02-a3b3-cfccc1768d07}</UniqueIdentifier>
+      <UniqueIdentifier>{486250ec-50ea-4a4f-9f66-680d22d9bb23}</UniqueIdentifier>
     </Filter>
   </ItemGroup>
   <ItemGroup>
diff --git a/CppParser/CppParser_x64_vs160.vcxproj b/CppParser/CppParser_x64_vs160.vcxproj
index 30f9bc64d..f54041535 100644
--- a/CppParser/CppParser_x64_vs160.vcxproj
+++ b/CppParser/CppParser_x64_vs160.vcxproj
@@ -315,10 +315,8 @@
   </ItemGroup>
   <ItemGroup>
     <ResourceCompile Include="..\DLLVersion.rc">
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='debug_shared|x64'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='debug_static_md|x64'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='debug_static_mt|x64'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='release_shared|x64'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='release_static_md|x64'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='release_static_mt|x64'">true</ExcludedFromBuild>
     </ResourceCompile>
diff --git a/CppParser/CppParser_x64_vs160.vcxproj.filters b/CppParser/CppParser_x64_vs160.vcxproj.filters
index 1b473c48a..5e5ffb621 100644
--- a/CppParser/CppParser_x64_vs160.vcxproj.filters
+++ b/CppParser/CppParser_x64_vs160.vcxproj.filters
@@ -2,31 +2,31 @@
 <Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <ItemGroup>
     <Filter Include="CppParser">
-      <UniqueIdentifier>{fc7a3f84-3c52-4ddb-9b33-7d05148a67fc}</UniqueIdentifier>
+      <UniqueIdentifier>{18efdd26-bc9f-4446-a3fe-93b67123f6bb}</UniqueIdentifier>
     </Filter>
     <Filter Include="CppParser\Header Files">
-      <UniqueIdentifier>{117333d7-ed3a-4fd8-9178-4038646b588a}</UniqueIdentifier>
+      <UniqueIdentifier>{15bbc5a4-1399-4db1-93c8-958a91efc9b4}</UniqueIdentifier>
     </Filter>
     <Filter Include="CppParser\Source Files">
-      <UniqueIdentifier>{207b216d-e7ec-4290-a975-3206c7894daa}</UniqueIdentifier>
+      <UniqueIdentifier>{19d4de25-2899-4714-a9fc-a31a259f149d}</UniqueIdentifier>
     </Filter>
     <Filter Include="Symbol Table">
-      <UniqueIdentifier>{4ba72aa4-5084-4cbd-8b16-053e94c896b2}</UniqueIdentifier>
+      <UniqueIdentifier>{a920e107-2e7f-4cea-b8d1-ba0c2f3185c8}</UniqueIdentifier>
     </Filter>
     <Filter Include="Symbol Table\Header Files">
-      <UniqueIdentifier>{f66fc417-e96f-421c-8a41-5f46861c695e}</UniqueIdentifier>
+      <UniqueIdentifier>{8a4381d1-05e2-4cce-8445-0ddf0fea731a}</UniqueIdentifier>
     </Filter>
     <Filter Include="Symbol Table\Source Files">
-      <UniqueIdentifier>{dc2b8a46-92d1-453d-b97e-a429e57ace71}</UniqueIdentifier>
+      <UniqueIdentifier>{7aab72b2-d092-4411-a9d1-169f08df71f5}</UniqueIdentifier>
     </Filter>
     <Filter Include="Attributes">
-      <UniqueIdentifier>{fd81c17c-f093-434f-8f2c-c70ae63494c3}</UniqueIdentifier>
+      <UniqueIdentifier>{cf048019-176b-4b24-825f-104e2decbbb0}</UniqueIdentifier>
     </Filter>
     <Filter Include="Attributes\Header Files">
-      <UniqueIdentifier>{a404a14e-ba93-484f-84b1-a98ee91367ec}</UniqueIdentifier>
+      <UniqueIdentifier>{779027d5-2d2f-4e32-a838-1e9b9430270e}</UniqueIdentifier>
     </Filter>
     <Filter Include="Attributes\Source Files">
-      <UniqueIdentifier>{f4606647-2da7-4150-8e15-593bfd30d09d}</UniqueIdentifier>
+      <UniqueIdentifier>{8f4798fc-b345-49cc-b079-ead0d8def709}</UniqueIdentifier>
     </Filter>
   </ItemGroup>
   <ItemGroup>
diff --git a/CppParser/CppParser_x64_vs90.vcproj b/CppParser/CppParser_x64_vs90.vcproj
index e41385fd8..742df365a 100644
--- a/CppParser/CppParser_x64_vs90.vcproj
+++ b/CppParser/CppParser_x64_vs90.vcproj
@@ -493,14 +493,12 @@
 		<File
 			RelativePath="..\DLLVersion.rc">
 			<FileConfiguration
-				Name="debug_shared|x64"
-				ExcludedFromBuild="true">
+				Name="debug_shared|x64">
 				<Tool
 					Name="VCResourceCompilerTool"/>
 			</FileConfiguration>
 			<FileConfiguration
-				Name="release_shared|x64"
-				ExcludedFromBuild="true">
+				Name="release_shared|x64">
 				<Tool
 					Name="VCResourceCompilerTool"/>
 			</FileConfiguration>