diff --git a/examples/client/client.vcproj b/examples/client/client.vcproj
index d38aed0cd..4b758dcb7 100755
--- a/examples/client/client.vcproj
+++ b/examples/client/client.vcproj
@@ -184,6 +184,10 @@
 			Filter="h;hpp;hxx;hm;inl;inc;xsd"
 			UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}"
 			>
+			<File
+				RelativePath="..\..\IDE\WIN\user_settings.h"
+				>
+			</File>
 		</Filter>
 		<Filter
 			Name="Resource Files"
diff --git a/examples/client/client.vcxproj b/examples/client/client.vcxproj
index 9c8be9540..a0add0d6b 100644
--- a/examples/client/client.vcxproj
+++ b/examples/client/client.vcxproj
@@ -327,6 +327,9 @@
       <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
     </ProjectReference>
   </ItemGroup>
+  <ItemGroup>
+    <ClInclude Include="..\..\IDE\WIN\user_settings.h" />
+  </ItemGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
   <ImportGroup Label="ExtensionTargets">
   </ImportGroup>
diff --git a/examples/echoclient/echoclient.vcproj b/examples/echoclient/echoclient.vcproj
index 55f6a8b9d..55d2610cb 100755
--- a/examples/echoclient/echoclient.vcproj
+++ b/examples/echoclient/echoclient.vcproj
@@ -184,6 +184,10 @@
 			Filter="h;hpp;hxx;hm;inl;inc;xsd"
 			UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}"
 			>
+			<File
+				RelativePath="..\..\IDE\WIN\user_settings.h"
+				>
+			</File>
 		</Filter>
 		<Filter
 			Name="Resource Files"
diff --git a/examples/echoclient/echoclient.vcxproj b/examples/echoclient/echoclient.vcxproj
index 58885d512..0c56d0e86 100644
--- a/examples/echoclient/echoclient.vcxproj
+++ b/examples/echoclient/echoclient.vcxproj
@@ -327,6 +327,9 @@
       <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
     </ProjectReference>
   </ItemGroup>
+  <ItemGroup>
+    <ClInclude Include="..\..\IDE\WIN\user_settings.h" />
+  </ItemGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
   <ImportGroup Label="ExtensionTargets">
   </ImportGroup>
diff --git a/examples/echoserver/echoserver.vcproj b/examples/echoserver/echoserver.vcproj
index dbe6b7eec..2d6d58199 100755
--- a/examples/echoserver/echoserver.vcproj
+++ b/examples/echoserver/echoserver.vcproj
@@ -184,6 +184,10 @@
 			Filter="h;hpp;hxx;hm;inl;inc;xsd"
 			UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}"
 			>
+			<File
+				RelativePath="..\..\IDE\WIN\user_settings.h"
+				>
+			</File>
 		</Filter>
 		<Filter
 			Name="Resource Files"
diff --git a/examples/echoserver/echoserver.vcxproj b/examples/echoserver/echoserver.vcxproj
index b51b87450..136de4a0e 100644
--- a/examples/echoserver/echoserver.vcxproj
+++ b/examples/echoserver/echoserver.vcxproj
@@ -327,6 +327,9 @@
       <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
     </ProjectReference>
   </ItemGroup>
+  <ItemGroup>
+    <ClInclude Include="..\..\IDE\WIN\user_settings.h" />
+  </ItemGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
   <ImportGroup Label="ExtensionTargets">
   </ImportGroup>
diff --git a/examples/server/server.vcproj b/examples/server/server.vcproj
index a313bd93c..05cd28833 100755
--- a/examples/server/server.vcproj
+++ b/examples/server/server.vcproj
@@ -184,6 +184,10 @@
 			Filter="h;hpp;hxx;hm;inl;inc;xsd"
 			UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}"
 			>
+			<File
+				RelativePath="..\..\IDE\WIN\user_settings.h"
+				>
+			</File>
 		</Filter>
 		<Filter
 			Name="Resource Files"
diff --git a/examples/server/server.vcxproj b/examples/server/server.vcxproj
index 38867b7b3..d428490bd 100644
--- a/examples/server/server.vcxproj
+++ b/examples/server/server.vcxproj
@@ -327,6 +327,9 @@
       <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
     </ProjectReference>
   </ItemGroup>
+  <ItemGroup>
+    <ClInclude Include="..\..\IDE\WIN\user_settings.h" />
+  </ItemGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
   <ImportGroup Label="ExtensionTargets">
   </ImportGroup>
diff --git a/sslSniffer/sslSniffer.vcproj b/sslSniffer/sslSniffer.vcproj
index 43d9fdf3b..fced18424 100755
--- a/sslSniffer/sslSniffer.vcproj
+++ b/sslSniffer/sslSniffer.vcproj
@@ -186,7 +186,11 @@
 			UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}"
 			>
 			<File
-				RelativePath="..\include\sniffer.h"
+				RelativePath="..\wolfssl\sniffer.h"
+				>
+			</File>
+			<File
+				RelativePath="..\IDE\WIN\user_settings.h"
 				>
 			</File>
 		</Filter>
@@ -196,7 +200,7 @@
 			UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}"
 			>
 			<File
-				RelativePath="..\cyassl\sniffer_error.rc"
+				RelativePath="..\wolfssl\sniffer_error.rc"
 				>
 			</File>
 		</Filter>
diff --git a/sslSniffer/sslSniffer.vcxproj b/sslSniffer/sslSniffer.vcxproj
index fda47e2d3..fb8d5052e 100644
--- a/sslSniffer/sslSniffer.vcxproj
+++ b/sslSniffer/sslSniffer.vcxproj
@@ -171,6 +171,7 @@
   </ItemGroup>
   <ItemGroup>
     <ClInclude Include="..\wolfssl\sniffer.h" />
+    <ClInclude Include="..\IDE\WIN\user_settings.h" />
   </ItemGroup>
   <ItemGroup>
     <ResourceCompile Include="..\wolfssl\sniffer_error.rc" />
diff --git a/testsuite/testsuite.vcproj b/testsuite/testsuite.vcproj
index af8019700..294ea4b12 100755
--- a/testsuite/testsuite.vcproj
+++ b/testsuite/testsuite.vcproj
@@ -204,6 +204,10 @@
 			Filter="h;hpp;hxx;hm;inl;inc;xsd"
 			UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}"
 			>
+			<File
+				RelativePath="..\IDE\WIN\user_settings.h"
+				>
+			</File>
 		</Filter>
 		<Filter
 			Name="Resource Files"
diff --git a/testsuite/testsuite.vcxproj b/testsuite/testsuite.vcxproj
index a301663bb..6e064f43d 100644
--- a/testsuite/testsuite.vcxproj
+++ b/testsuite/testsuite.vcxproj
@@ -159,7 +159,7 @@
     <ClCompile>
       <Optimization>Disabled</Optimization>
       <AdditionalIncludeDirectories>../;../IDE/WIN;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>NO_MAIN_DRIVER;WOLFSSL_SNIFFER;WOLFSSL_USER_SETTINGS;CYASSL_USER_SETTINGS%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>NO_MAIN_DRIVER;WOLFSSL_SNIFFER;WOLFSSL_USER_SETTINGS;CYASSL_USER_SETTINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <MinimalRebuild>true</MinimalRebuild>
       <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
       <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
@@ -332,6 +332,9 @@
       <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
     </ProjectReference>
   </ItemGroup>
+  <ItemGroup>
+    <ClInclude Include="..\IDE\WIN\user_settings.h" />
+  </ItemGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
   <ImportGroup Label="ExtensionTargets">
   </ImportGroup>
diff --git a/wolfssl-ntru.vcproj b/wolfssl-ntru.vcproj
index 879bd8cf3..84a6feac8 100755
--- a/wolfssl-ntru.vcproj
+++ b/wolfssl-ntru.vcproj
@@ -177,6 +177,13 @@
 			<File
 				RelativePath=".\wolfcrypt\src\coding.c"
 				>
+			<File
+				RelativePath=".\wolfcrypt\src\chacha.c"
+				>
+			</File>
+			<File
+				RelativePath=".\wolfcrypt\src\chacha20_poly1305.c"
+				>
 			</File>
 			<File
 				RelativePath=".\src\crl.c"
@@ -254,6 +261,13 @@
 				RelativePath=".\src\ocsp.c"
 				>
 			</File>
+			<File
+				RelativePath=".\wolfcrypt\src\pkcs7.c"
+				>
+			</File>
+			<File
+				RelativePath=".\wolfcrypt\src\poly1305.c"
+				>
 			<File
 				RelativePath=".\wolfcrypt\src\wc_port.c"
 				>
diff --git a/wolfssl.vcproj b/wolfssl.vcproj
index b8f1ecf3d..801ae5984 100755
--- a/wolfssl.vcproj
+++ b/wolfssl.vcproj
@@ -175,6 +175,14 @@
 				RelativePath=".\wolfcrypt\src\coding.c"
 				>
 			</File>
+			<File
+				RelativePath=".\wolfcrypt\src\chacha.c"
+				>
+			</File>
+			<File
+				RelativePath=".\wolfcrypt\src\chacha20_poly1305.c"
+				>
+			</File>
 			<File
 				RelativePath=".\src\crl.c"
 				>
@@ -247,6 +255,14 @@
 				RelativePath=".\src\ocsp.c"
 				>
 			</File>
+			<File
+				RelativePath=".\wolfcrypt\src\pkcs7.c"
+				>
+			</File>
+			<File
+				RelativePath=".\wolfcrypt\src\poly1305.c"
+				>
+			</File>
 			<File
 				RelativePath=".\wolfcrypt\src\wc_port.c"
 				>
@@ -305,6 +321,10 @@
 			Filter="h;hpp;hxx;hm;inl;inc;xsd"
 			UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}"
 			>
+			<File
+				RelativePath="IDE\WIN\user_settings.h"
+				>
+			</File>
 		</Filter>
 		<Filter
 			Name="Resource Files"
diff --git a/wolfssl.vcxproj b/wolfssl.vcxproj
index 0532304a9..8c794f0bf 100644
--- a/wolfssl.vcxproj
+++ b/wolfssl.vcxproj
@@ -276,13 +276,21 @@
     </Link>
   </ItemDefinitionGroup>
   <ItemGroup>
+    <ClCompile Include="src\crl.c" />
+    <ClCompile Include="src\internal.c" />
+    <ClCompile Include="src\io.c" />
+    <ClCompile Include="src\keys.c" />
+    <ClCompile Include="src\ocsp.c" />
+    <ClCompile Include="src\ssl.c" />
+    <ClCompile Include="src\tls.c" />
     <ClCompile Include="wolfcrypt\src\aes.c" />
     <ClCompile Include="wolfcrypt\src\arc4.c" />
     <ClCompile Include="wolfcrypt\src\asn.c" />
     <ClCompile Include="wolfcrypt\src\blake2b.c" />
     <ClCompile Include="wolfcrypt\src\camellia.c" />
+    <ClCompile Include="wolfcrypt\src\chacha.c" />
+    <ClCompile Include="wolfcrypt\src\chacha20_poly1305.c" />
     <ClCompile Include="wolfcrypt\src\coding.c" />
-    <ClCompile Include="src\crl.c" />
     <ClCompile Include="wolfcrypt\src\des3.c" />
     <ClCompile Include="wolfcrypt\src\dh.c" />
     <ClCompile Include="wolfcrypt\src\dsa.c" />
@@ -292,15 +300,12 @@
     <ClCompile Include="wolfcrypt\src\hc128.c" />
     <ClCompile Include="wolfcrypt\src\hmac.c" />
     <ClCompile Include="wolfcrypt\src\integer.c" />
-    <ClCompile Include="src\internal.c" />
-    <ClCompile Include="src\io.c" />
-    <ClCompile Include="src\keys.c" />
     <ClCompile Include="wolfcrypt\src\logging.c" />
     <ClCompile Include="wolfcrypt\src\md4.c" />
     <ClCompile Include="wolfcrypt\src\md5.c" />
     <ClCompile Include="wolfcrypt\src\memory.c" />
-    <ClCompile Include="src\ocsp.c" />
-    <ClCompile Include="wolfcrypt\src\wc_port.c" />
+    <ClCompile Include="wolfcrypt\src\pkcs7.c" />
+    <ClCompile Include="wolfcrypt\src\poly1305.c" />
     <ClCompile Include="wolfcrypt\src\pwdbased.c" />
     <ClCompile Include="wolfcrypt\src\rabbit.c" />
     <ClCompile Include="wolfcrypt\src\random.c" />
@@ -311,8 +316,7 @@
     <ClCompile Include="wolfcrypt\src\sha512.c" />
     <ClCompile Include="wolfcrypt\src\signature.c" />
     <ClCompile Include="wolfcrypt\src\wc_encrypt.c" />
-    <ClCompile Include="src\ssl.c" />
-    <ClCompile Include="src\tls.c" />
+    <ClCompile Include="wolfcrypt\src\wc_port.c" />
   </ItemGroup>
   <ItemGroup>
     <CustomBuild Include="wolfcrypt\src\aes_asm.asm">
@@ -329,6 +333,7 @@
       <Outputs Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(OutDir)%(Filename).obj</Outputs>
       <Outputs Condition="'$(Configuration)|$(Platform)'=='DLL Release|x64'">$(IntDir)%(Filename).obj</Outputs>
     </CustomBuild>
+    <ClInclude Include="IDE\WIN\user_settings.h" />
   </ItemGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
   <ImportGroup Label="ExtensionTargets">