diff --git a/Windows/sgx/SGXOpenSSLLibrary.sln b/Windows/sgx/SGXOpenSSLLibrary.sln
index 5d05548a..e93a90f1 100644
--- a/Windows/sgx/SGXOpenSSLLibrary.sln
+++ b/Windows/sgx/SGXOpenSSLLibrary.sln
@@ -1,14 +1,20 @@
 Microsoft Visual Studio Solution File, Format Version 12.00
-# Visual Studio 15
-VisualStudioVersion = 15.0.28307.779
+# Visual Studio Version 16
+VisualStudioVersion = 16.0.36422.26
 MinimumVisualStudioVersion = 10.0.40219.1
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libsgx_tsgxssl", "libsgx_tsgxssl\libsgx_tsgxssl.vcxproj", "{CAB477F7-900D-4B9A-9F10-30A41D130C1C}"
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libsgx_usgxssl", "libsgx_usgxssl\libsgx_usgxssl.vcxproj", "{5E02F357-8A0E-4E37-96F3-DDA4ADED4E5B}"
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "TestApp", "test_app\app\TestApp.vcxproj", "{7E653C46-DAAA-4DA1-ACDA-7B477EC0307C}"
+	ProjectSection(ProjectDependencies) = postProject
+		{5E02F357-8A0E-4E37-96F3-DDA4ADED4E5B} = {5E02F357-8A0E-4E37-96F3-DDA4ADED4E5B}
+	EndProjectSection
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "TestEnclave", "test_app\enclave\TestEnclave.vcxproj", "{2D7787DF-3342-474E-AC6D-01E60D7C579E}"
+	ProjectSection(ProjectDependencies) = postProject
+		{CAB477F7-900D-4B9A-9F10-30A41D130C1C} = {CAB477F7-900D-4B9A-9F10-30A41D130C1C}
+	EndProjectSection
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
diff --git a/Windows/sgx/libsgx_tsgxssl/libsgx_tsgxssl.vcxproj b/Windows/sgx/libsgx_tsgxssl/libsgx_tsgxssl.vcxproj
index 4170f9c9..077508f2 100644
--- a/Windows/sgx/libsgx_tsgxssl/libsgx_tsgxssl.vcxproj
+++ b/Windows/sgx/libsgx_tsgxssl/libsgx_tsgxssl.vcxproj
@@ -207,7 +207,7 @@
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
     <ClCompile>
       <BasicRuntimeChecks>Default</BasicRuntimeChecks>
-      <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
+      <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
       <Optimization>Disabled</Optimization>
       <WarningLevel>Level3</WarningLevel>
       <AdditionalIncludeDirectories>$(SolutionDir)\..\package\include;$(SolutionDir)..\..\..\..\common\inc\;$(SolutionDir)..\..\..\..\common\inc\tlibc;$(SolutionDir)..\..\..\..\sdk\tlibstdcxx\stlport;$(SGXSDKInstallPath)include;$(SGXSDKInstallPath)include\libc++;$(SGXSDKInstallPath)include\tlibc;$(SGXSDKInstallPath)include\stlport;%(AdditionalIncludeDirectories);$(VCInstallDir)include;$(IncludePath)</AdditionalIncludeDirectories>
@@ -226,7 +226,7 @@
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
     <ClCompile>
       <BasicRuntimeChecks>Default</BasicRuntimeChecks>
-      <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
+      <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
       <Optimization>Disabled</Optimization>
       <WarningLevel>Level3</WarningLevel>
       <AdditionalIncludeDirectories>$(SolutionDir)\..\package\include;$(SolutionDir)..\..\..\..\common\inc\;$(SolutionDir)..\..\..\..\common\inc\tlibc;$(SolutionDir)..\..\..\..\sdk\tlibstdcxx\stlport;$(SGXSDKInstallPath)include;$(SGXSDKInstallPath)include\libc++;$(SGXSDKInstallPath)include\tlibc;$(SGXSDKInstallPath)include\stlport;%(AdditionalIncludeDirectories);$(VCInstallDir)include;$(IncludePath)</AdditionalIncludeDirectories>
diff --git a/Windows/sgx/libsgx_usgxssl/libsgx_usgxssl.vcxproj b/Windows/sgx/libsgx_usgxssl/libsgx_usgxssl.vcxproj
index 36a039a9..0e8d7800 100644
--- a/Windows/sgx/libsgx_usgxssl/libsgx_usgxssl.vcxproj
+++ b/Windows/sgx/libsgx_usgxssl/libsgx_usgxssl.vcxproj
@@ -207,7 +207,7 @@
       <Optimization>Disabled</Optimization>
       <PreprocessorDefinitions>WIN32;_DEBUG;_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <ProgramDataBaseFileName>$(IntDir)$(TargetName).pdb</ProgramDataBaseFileName>
-      <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
+      <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
       <OmitDefaultLibName>true</OmitDefaultLibName>
       <AdditionalIncludeDirectories>
       </AdditionalIncludeDirectories>
@@ -249,7 +249,7 @@
       <PreprocessorDefinitions>WIN32;_DEBUG;_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <ProgramDataBaseFileName>$(IntDir)$(TargetName).pdb</ProgramDataBaseFileName>
       <OmitDefaultLibName>true</OmitDefaultLibName>
-      <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
+      <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
     </ClCompile>
     <Link>
       <SubSystem>Windows</SubSystem>
diff --git a/Windows/sgx/test_app/app/TestApp.vcxproj b/Windows/sgx/test_app/app/TestApp.vcxproj
index 67a55ae7..c5aa4994 100644
--- a/Windows/sgx/test_app/app/TestApp.vcxproj
+++ b/Windows/sgx/test_app/app/TestApp.vcxproj
@@ -246,7 +246,7 @@
       <SubSystem>Console</SubSystem>
       <GenerateDebugInformation>true</GenerateDebugInformation>
       <AdditionalLibraryDirectories>$(SolutionDir)$(Platform)\$(Configuration)\;$(SGXSDKInstallPath)\bin\$(Platform)\Debug;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
-      <AdditionalDependencies>libsgx_usgxssl.lib;sgx_urts.lib;Ws2_32.lib;user32.lib</AdditionalDependencies>
+      <AdditionalDependencies>libsgx_usgxssl.lib;sgx_urtsd.lib;Ws2_32.lib;user32.lib</AdditionalDependencies>
     </Link>
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Simulation|Win32'">
@@ -280,7 +280,7 @@
       <SubSystem>Console</SubSystem>
       <GenerateDebugInformation>true</GenerateDebugInformation>
       <AdditionalLibraryDirectories>$(SolutionDir)$(Platform)\$(Configuration)\;$(SGXSDKInstallPath)\bin\$(Platform)\Debug;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
-      <AdditionalDependencies>libsgx_usgxssl.lib;sgx_urts.lib;sgx_uae_service.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalDependencies>libsgx_usgxssl.lib;sgx_urtsd.lib;sgx_uae_service.lib;%(AdditionalDependencies)</AdditionalDependencies>
     </Link>
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Simulation|x64'">
diff --git a/Windows/sgx/test_app/enclave/TestEnclave.vcxproj b/Windows/sgx/test_app/enclave/TestEnclave.vcxproj
index 801d1766..614ea125 100644
--- a/Windows/sgx/test_app/enclave/TestEnclave.vcxproj
+++ b/Windows/sgx/test_app/enclave/TestEnclave.vcxproj
@@ -237,7 +237,7 @@
       <GenerateDebugInformation>true</GenerateDebugInformation>
     </Link>
     <PostBuildEvent>
-      <Command>"$(SGXSDKInstallPath)bin\win32\release\sgx_sign.exe" sign -key "$(ProjectDir)TestEnclave_private.pem" -enclave "$(OutDir)TestEnclave.dll" -out "$(OutDir)TestEnclave.signed.dll" -config "$(ProjectDir)TestEnclave.config.xml"
+      <Command>"$(SGXSDKInstallPath)bin\win32\release\sgx_sign.exe" sign -key "$(ProjectDir)TestEnclave_private.pem" -enclave "$(OutDir)TestEnclave.dll" -out "$(OutDir)TestEnclave.signed.dll" -config "$(ProjectDir)TestEnclave.config.xml"
 </Command>
       <Message>sign the enclave</Message>
     </PostBuildEvent>
@@ -283,7 +283,7 @@
       <EnableCOMDATFolding>true</EnableCOMDATFolding>
     </Link>
     <PostBuildEvent>
-      <Command>"$(SGXSDKInstallPath)bin\win32\release\sgx_sign.exe" sign -key "$(ProjectDir)TestEnclave_private.pem" -enclave "$(OutDir)TestEnclave.dll" -out "$(OutDir)TestEnclave.signed.dll" -config "$(ProjectDir)TestEnclave.config.xml"
+      <Command>"$(SGXSDKInstallPath)bin\win32\release\sgx_sign.exe" sign -key "$(ProjectDir)TestEnclave_private.pem" -enclave "$(OutDir)TestEnclave.dll" -out "$(OutDir)TestEnclave.signed.dll" -config "$(ProjectDir)TestEnclave.config.xml"
 </Command>
       <Message>generate the enclave signing material</Message>
     </PostBuildEvent>
@@ -308,7 +308,7 @@
       <EnableCOMDATFolding>true</EnableCOMDATFolding>
     </Link>
     <PostBuildEvent>
-      <Command>"$(SGXSDKInstallPath)bin\win32\release\sgx_sign.exe" sign -key "$(ProjectDir)TestEnclave_private.pem" -enclave "$(OutDir)TestEnclave.dll" -out "$(OutDir)TestEnclave.signed.dll" -config "$(ProjectDir)TestEnclave.config.xml"
+      <Command>"$(SGXSDKInstallPath)bin\win32\release\sgx_sign.exe" sign -key "$(ProjectDir)TestEnclave_private.pem" -enclave "$(OutDir)TestEnclave.dll" -out "$(OutDir)TestEnclave.signed.dll" -config "$(ProjectDir)TestEnclave.config.xml"
 </Command>
       <Message>generate the enclave signing material</Message>
     </PostBuildEvent>
@@ -333,7 +333,7 @@
       <EnableCOMDATFolding>true</EnableCOMDATFolding>
     </Link>
     <PostBuildEvent>
-      <Command>"$(SGXSDKInstallPath)bin\win32\release\sgx_sign.exe" sign -key "$(ProjectDir)TestEnclave_private.pem" -enclave "$(OutDir)TestEnclave.dll" -out "$(OutDir)TestEnclave.signed.dll" -config "$(ProjectDir)TestEnclave.config.xml"
+      <Command>"$(SGXSDKInstallPath)bin\win32\release\sgx_sign.exe" sign -key "$(ProjectDir)TestEnclave_private.pem" -enclave "$(OutDir)TestEnclave.dll" -out "$(OutDir)TestEnclave.signed.dll" -config "$(ProjectDir)TestEnclave.config.xml"
 </Command>
       <Message>generate the enclave signing material</Message>
     </PostBuildEvent>
@@ -358,7 +358,7 @@
       <EnableCOMDATFolding>true</EnableCOMDATFolding>
     </Link>
     <PostBuildEvent>
-      <Command>"$(SGXSDKInstallPath)bin\win32\release\sgx_sign.exe" sign -key "$(ProjectDir)TestEnclave_private.pem" -enclave "$(OutDir)TestEnclave.dll" -out "$(OutDir)TestEnclave.signed.dll" -config "$(ProjectDir)TestEnclave.config.xml"
+      <Command>"$(SGXSDKInstallPath)bin\win32\release\sgx_sign.exe" sign -key "$(ProjectDir)TestEnclave_private.pem" -enclave "$(OutDir)TestEnclave.dll" -out "$(OutDir)TestEnclave.signed.dll" -config "$(ProjectDir)TestEnclave.config.xml"
 </Command>
       <Message>sign the enclave</Message>
     </PostBuildEvent>
@@ -381,7 +381,7 @@
       <GenerateDebugInformation>true</GenerateDebugInformation>
     </Link>
     <PostBuildEvent>
-      <Command>"$(SGXSDKInstallPath)bin\win32\release\sgx_sign.exe" sign -key "$(ProjectDir)TestEnclave_private.pem" -enclave "$(OutDir)TestEnclave.dll" -out "$(OutDir)TestEnclave.signed.dll" -config "$(ProjectDir)TestEnclave.config.xml"
+      <Command>"$(SGXSDKInstallPath)bin\win32\release\sgx_sign.exe" sign -key "$(ProjectDir)TestEnclave_private.pem" -enclave "$(OutDir)TestEnclave.dll" -out "$(OutDir)TestEnclave.signed.dll" -config "$(ProjectDir)TestEnclave.config.xml"
 </Command>
       <Message>sign the enclave</Message>
     </PostBuildEvent>
@@ -429,7 +429,7 @@
       <EnableCOMDATFolding>true</EnableCOMDATFolding>
     </Link>
     <PostBuildEvent>
-      <Command>"$(SGXSDKInstallPath)bin\win32\release\sgx_sign.exe" sign -key "$(ProjectDir)TestEnclave_private.pem" -enclave "$(OutDir)TestEnclave.dll" -out "$(OutDir)TestEnclave.signed.dll" -config "$(ProjectDir)TestEnclave.config.xml"
+      <Command>"$(SGXSDKInstallPath)bin\win32\release\sgx_sign.exe" sign -key "$(ProjectDir)TestEnclave_private.pem" -enclave "$(OutDir)TestEnclave.dll" -out "$(OutDir)TestEnclave.signed.dll" -config "$(ProjectDir)TestEnclave.config.xml"
 </Command>
       <Message>generate the enclave signing material</Message>
     </PostBuildEvent>
@@ -455,7 +455,7 @@
       <EnableCOMDATFolding>true</EnableCOMDATFolding>
     </Link>
     <PostBuildEvent>
-      <Command>"$(SGXSDKInstallPath)bin\win32\release\sgx_sign.exe" sign -key "$(ProjectDir)TestEnclave_private.pem" -enclave "$(OutDir)TestEnclave.dll" -out "$(OutDir)TestEnclave.signed.dll" -config "$(ProjectDir)TestEnclave.config.xml"
+      <Command>"$(SGXSDKInstallPath)bin\win32\release\sgx_sign.exe" sign -key "$(ProjectDir)TestEnclave_private.pem" -enclave "$(OutDir)TestEnclave.dll" -out "$(OutDir)TestEnclave.signed.dll" -config "$(ProjectDir)TestEnclave.config.xml"
 </Command>
       <Message>generate the enclave signing material</Message>
     </PostBuildEvent>
@@ -481,7 +481,7 @@
       <EnableCOMDATFolding>true</EnableCOMDATFolding>
     </Link>
     <PostBuildEvent>
-      <Command>"$(SGXSDKInstallPath)bin\win32\release\sgx_sign.exe" sign -key "$(ProjectDir)TestEnclave_private.pem" -enclave "$(OutDir)TestEnclave.dll" -out "$(OutDir)TestEnclave.signed.dll" -config "$(ProjectDir)TestEnclave.config.xml"
+      <Command>"$(SGXSDKInstallPath)bin\win32\release\sgx_sign.exe" sign -key "$(ProjectDir)TestEnclave_private.pem" -enclave "$(OutDir)TestEnclave.dll" -out "$(OutDir)TestEnclave.signed.dll" -config "$(ProjectDir)TestEnclave.config.xml"
 </Command>
       <Message>generate the enclave signing material</Message>
     </PostBuildEvent>
@@ -507,7 +507,7 @@
       <EnableCOMDATFolding>true</EnableCOMDATFolding>
     </Link>
     <PostBuildEvent>
-      <Command>"$(SGXSDKInstallPath)bin\win32\release\sgx_sign.exe" sign -key "$(ProjectDir)TestEnclave_private.pem" -enclave "$(OutDir)TestEnclave.dll" -out "$(OutDir)TestEnclave.signed.dll" -config "$(ProjectDir)TestEnclave.config.xml"
+      <Command>"$(SGXSDKInstallPath)bin\win32\release\sgx_sign.exe" sign -key "$(ProjectDir)TestEnclave_private.pem" -enclave "$(OutDir)TestEnclave.dll" -out "$(OutDir)TestEnclave.signed.dll" -config "$(ProjectDir)TestEnclave.config.xml"
 </Command>
       <Message>sign the enclave</Message>
     </PostBuildEvent>
@@ -605,4 +605,4 @@
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
   <ImportGroup Label="ExtensionTargets">
   </ImportGroup>
-</Project>
\ No newline at end of file
+</Project>