From 6287e58ed6f5f7753f9a8ab6ebf2a14da8b2f62f Mon Sep 17 00:00:00 2001
From: Christian Paquin <cpaquin@microsoft.com>
Date: Thu, 30 Aug 2018 11:10:42 -0400
Subject: [PATCH] Fixed Visual Studio build after master's API refactoring.
 (#352)

* Fixed Visual Studio build after master's API refactoring.

* Replaced deleted kex_frodo with kex_newhope in minimal_kex_oqs.
---
 VisualStudio/liboqs.sln                       |  21 -
 .../minimal_kex_oqs/minimal_kex_oqs.vcxproj   |   4 +-
 .../minimal_kex_oqs.vcxproj.filters           |  10 +-
 .../minimal_sig_oqs/minimal_sig_oqs.vcxproj   |   8 +-
 .../minimal_sig_oqs.vcxproj.filters           |  10 +-
 VisualStudio/oqs/oqs.vcxproj                  |  66 ++-
 VisualStudio/oqs/oqs.vcxproj.filters          | 404 +++++++++---------
 VisualStudio/test_kex/test_kex.vcxproj        |   8 +-
 .../test_kex/test_kex.vcxproj.filters         |  10 +-
 VisualStudio/test_sig/test_sig.vcxproj        |   8 +-
 .../test_sig/test_sig.vcxproj.filters         |  10 +-
 appveyor.yml                                  |   2 -
 src/common/common.h                           |  10 +-
 src/common/rand.c                             |   3 +-
 tests/minimal_kex_oqs.c                       |   4 +-
 15 files changed, 291 insertions(+), 287 deletions(-)

diff --git a/VisualStudio/liboqs.sln b/VisualStudio/liboqs.sln
index 02c022ff3..eeb41b57d 100644
--- a/VisualStudio/liboqs.sln
+++ b/VisualStudio/liboqs.sln
@@ -3,11 +3,6 @@ Microsoft Visual Studio Solution File, Format Version 12.00
 # Visual Studio 15
 VisualStudioVersion = 15.0.26430.4
 MinimumVisualStudioVersion = 10.0.40219.1
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "test_rand", "test_rand\test_rand.vcxproj", "{6BB96591-0BCD-42E6-8863-4B9BFE75530C}"
-	ProjectSection(ProjectDependencies) = postProject
-		{DCFEFB81-4696-45D2-9FCA-351CCFC13C74} = {DCFEFB81-4696-45D2-9FCA-351CCFC13C74}
-	EndProjectSection
-EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "oqs", "oqs\oqs.vcxproj", "{DCFEFB81-4696-45D2-9FCA-351CCFC13C74}"
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "test_kex", "test_kex\test_kex.vcxproj", "{820B79FE-57D7-4539-A0CA-B668A0723B9B}"
@@ -42,22 +37,6 @@ Global
 		ReleaseDLL|x86 = ReleaseDLL|x86
 	EndGlobalSection
 	GlobalSection(ProjectConfigurationPlatforms) = postSolution
-		{6BB96591-0BCD-42E6-8863-4B9BFE75530C}.Debug|x64.ActiveCfg = Debug|x64
-		{6BB96591-0BCD-42E6-8863-4B9BFE75530C}.Debug|x64.Build.0 = Debug|x64
-		{6BB96591-0BCD-42E6-8863-4B9BFE75530C}.Debug|x86.ActiveCfg = Debug|Win32
-		{6BB96591-0BCD-42E6-8863-4B9BFE75530C}.Debug|x86.Build.0 = Debug|Win32
-		{6BB96591-0BCD-42E6-8863-4B9BFE75530C}.DebugDLL|x64.ActiveCfg = DebugDLL|x64
-		{6BB96591-0BCD-42E6-8863-4B9BFE75530C}.DebugDLL|x64.Build.0 = DebugDLL|x64
-		{6BB96591-0BCD-42E6-8863-4B9BFE75530C}.DebugDLL|x86.ActiveCfg = DebugDLL|Win32
-		{6BB96591-0BCD-42E6-8863-4B9BFE75530C}.DebugDLL|x86.Build.0 = DebugDLL|Win32
-		{6BB96591-0BCD-42E6-8863-4B9BFE75530C}.Release|x64.ActiveCfg = Release|x64
-		{6BB96591-0BCD-42E6-8863-4B9BFE75530C}.Release|x64.Build.0 = Release|x64
-		{6BB96591-0BCD-42E6-8863-4B9BFE75530C}.Release|x86.ActiveCfg = Release|Win32
-		{6BB96591-0BCD-42E6-8863-4B9BFE75530C}.Release|x86.Build.0 = Release|Win32
-		{6BB96591-0BCD-42E6-8863-4B9BFE75530C}.ReleaseDLL|x64.ActiveCfg = ReleaseDLL|x64
-		{6BB96591-0BCD-42E6-8863-4B9BFE75530C}.ReleaseDLL|x64.Build.0 = ReleaseDLL|x64
-		{6BB96591-0BCD-42E6-8863-4B9BFE75530C}.ReleaseDLL|x86.ActiveCfg = ReleaseDLL|Win32
-		{6BB96591-0BCD-42E6-8863-4B9BFE75530C}.ReleaseDLL|x86.Build.0 = ReleaseDLL|Win32
 		{DCFEFB81-4696-45D2-9FCA-351CCFC13C74}.Debug|x64.ActiveCfg = Debug|x64
 		{DCFEFB81-4696-45D2-9FCA-351CCFC13C74}.Debug|x64.Build.0 = Debug|x64
 		{DCFEFB81-4696-45D2-9FCA-351CCFC13C74}.Debug|x86.ActiveCfg = Debug|Win32
diff --git a/VisualStudio/minimal_kex_oqs/minimal_kex_oqs.vcxproj b/VisualStudio/minimal_kex_oqs/minimal_kex_oqs.vcxproj
index 773bc6726..a4a349b01 100644
--- a/VisualStudio/minimal_kex_oqs/minimal_kex_oqs.vcxproj
+++ b/VisualStudio/minimal_kex_oqs/minimal_kex_oqs.vcxproj
@@ -293,10 +293,10 @@
     </Link>
   </ItemDefinitionGroup>
   <ItemGroup>
-    <ClCompile Include="..\..\src\kex\minimal_kex_oqs.c" />
+    <ClInclude Include="..\winconfig.h" />
   </ItemGroup>
   <ItemGroup>
-    <ClInclude Include="..\winconfig.h" />
+    <ClCompile Include="..\..\tests\minimal_kex_oqs.c" />
   </ItemGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
   <ImportGroup Label="ExtensionTargets">
diff --git a/VisualStudio/minimal_kex_oqs/minimal_kex_oqs.vcxproj.filters b/VisualStudio/minimal_kex_oqs/minimal_kex_oqs.vcxproj.filters
index dda88de2f..3e8f083fc 100644
--- a/VisualStudio/minimal_kex_oqs/minimal_kex_oqs.vcxproj.filters
+++ b/VisualStudio/minimal_kex_oqs/minimal_kex_oqs.vcxproj.filters
@@ -14,14 +14,14 @@
       <Extensions>rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav;mfcribbon-ms</Extensions>
     </Filter>
   </ItemGroup>
-  <ItemGroup>
-    <ClCompile Include="..\..\src\kex\minimal_kex_oqs.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-  </ItemGroup>
   <ItemGroup>
     <ClInclude Include="..\winconfig.h">
       <Filter>Header Files</Filter>
     </ClInclude>
   </ItemGroup>
+  <ItemGroup>
+    <ClCompile Include="..\..\tests\minimal_kex_oqs.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+  </ItemGroup>
 </Project>
\ No newline at end of file
diff --git a/VisualStudio/minimal_sig_oqs/minimal_sig_oqs.vcxproj b/VisualStudio/minimal_sig_oqs/minimal_sig_oqs.vcxproj
index 90ec21ba7..51bbef6e2 100644
--- a/VisualStudio/minimal_sig_oqs/minimal_sig_oqs.vcxproj
+++ b/VisualStudio/minimal_sig_oqs/minimal_sig_oqs.vcxproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project DefaultTargets="Build" ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <ItemGroup Label="ProjectConfigurations">
     <ProjectConfiguration Include="DebugDLL|Win32">
@@ -301,12 +301,12 @@
     </Link>
   </ItemDefinitionGroup>
   <ItemGroup>
-    <ClCompile Include="..\..\src\sig\minimal_sig_oqs.c" />
+    <ClInclude Include="..\winconfig.h" />
   </ItemGroup>
   <ItemGroup>
-    <ClInclude Include="..\winconfig.h" />
+    <ClCompile Include="..\..\tests\minimal_sig_oqs.c" />
   </ItemGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
   <ImportGroup Label="ExtensionTargets">
   </ImportGroup>
-</Project>
+</Project>
\ No newline at end of file
diff --git a/VisualStudio/minimal_sig_oqs/minimal_sig_oqs.vcxproj.filters b/VisualStudio/minimal_sig_oqs/minimal_sig_oqs.vcxproj.filters
index 3cc97e8ac..37be21b85 100644
--- a/VisualStudio/minimal_sig_oqs/minimal_sig_oqs.vcxproj.filters
+++ b/VisualStudio/minimal_sig_oqs/minimal_sig_oqs.vcxproj.filters
@@ -14,14 +14,14 @@
       <Extensions>rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav;mfcribbon-ms</Extensions>
     </Filter>
   </ItemGroup>
-  <ItemGroup>
-    <ClCompile Include="..\..\src\sig\minimal_sig_oqs.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-  </ItemGroup>
   <ItemGroup>
     <ClInclude Include="..\winconfig.h">
       <Filter>Header Files</Filter>
     </ClInclude>
   </ItemGroup>
+  <ItemGroup>
+    <ClCompile Include="..\..\tests\minimal_sig_oqs.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+  </ItemGroup>
 </Project>
\ No newline at end of file
diff --git a/VisualStudio/oqs/oqs.vcxproj b/VisualStudio/oqs/oqs.vcxproj
index 2c779fba1..8de72aa9d 100644
--- a/VisualStudio/oqs/oqs.vcxproj
+++ b/VisualStudio/oqs/oqs.vcxproj
@@ -262,14 +262,18 @@ copy "$(SolutionDir)..\src\crypto\aes\aes.h" "$(SolutionDir)include\oqs\"
 copy "$(SolutionDir)..\src\crypto\rand_urandom_chacha20\rand_urandom_chacha20.h" "$(SolutionDir)include\oqs\"
 copy "$(SolutionDir)..\src\crypto\rand_urandom_aesctr\rand_urandom_aesctr.h" "$(SolutionDir)include\oqs\"
 copy "$(SolutionDir)..\src\crypto\sha3\sha3.h" "$(SolutionDir)include\oqs\"
+copy "$(SolutionDir)..\src\kem\kem.h" "$(SolutionDir)include\oqs\"
+copy "$(SolutionDir)..\src\kem\bike\kem_bike.h" "$(SolutionDir)include\oqs\"
+copy "$(SolutionDir)..\src\kem\frodokem\kem_frodokem.h" "$(SolutionDir)include\oqs\"
+copy "$(SolutionDir)..\src\kem\sike\kem_sike.h" "$(SolutionDir)include\oqs\"
 copy "$(SolutionDir)..\src\kex\kex.h" "$(SolutionDir)include\oqs\"
-copy "$(SolutionDir)..\src\kex_rlwe_newhope\kex_rlwe_newhope.h" "$(SolutionDir)include\oqs\"
 copy "$(SolutionDir)..\src\kex_code_mcbits\kex_code_mcbits.h" "$(SolutionDir)include\oqs\"
 copy "$(SolutionDir)..\src\kex_ntru\kex_ntru.h" "$(SolutionDir)include\oqs\"
+copy "$(SolutionDir)..\src\kex_rlwe_newhope\kex_rlwe_newhope.h" "$(SolutionDir)include\oqs\"
 copy "$(SolutionDir)..\src\kex_sidh_msr\kex_sidh_msr.h" "$(SolutionDir)include\oqs\"
 copy "$(SolutionDir)..\src\sig\sig.h" "$(SolutionDir)include\oqs\"
 copy "$(SolutionDir)..\src\sig_picnic\sig_picnic.h" "$(SolutionDir)include\oqs\"
-</Command>
+copy "$(SolutionDir)..\src\sig_qtesla\sig_qtesla.h" "$(SolutionDir)include\oqs\"</Command>
     </PreBuildEvent>
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='DebugDLL|Win32'">
@@ -298,14 +302,18 @@ copy "$(SolutionDir)..\src\crypto\aes\aes.h" "$(SolutionDir)include\oqs\"
 copy "$(SolutionDir)..\src\crypto\rand_urandom_chacha20\rand_urandom_chacha20.h" "$(SolutionDir)include\oqs\"
 copy "$(SolutionDir)..\src\crypto\rand_urandom_aesctr\rand_urandom_aesctr.h" "$(SolutionDir)include\oqs\"
 copy "$(SolutionDir)..\src\crypto\sha3\sha3.h" "$(SolutionDir)include\oqs\"
+copy "$(SolutionDir)..\src\kem\kem.h" "$(SolutionDir)include\oqs\"
+copy "$(SolutionDir)..\src\kem\bike\kem_bike.h" "$(SolutionDir)include\oqs\"
+copy "$(SolutionDir)..\src\kem\frodokem\kem_frodokem.h" "$(SolutionDir)include\oqs\"
+copy "$(SolutionDir)..\src\kem\sike\kem_sike.h" "$(SolutionDir)include\oqs\"
 copy "$(SolutionDir)..\src\kex\kex.h" "$(SolutionDir)include\oqs\"
-copy "$(SolutionDir)..\src\kex_rlwe_newhope\kex_rlwe_newhope.h" "$(SolutionDir)include\oqs\"
 copy "$(SolutionDir)..\src\kex_code_mcbits\kex_code_mcbits.h" "$(SolutionDir)include\oqs\"
 copy "$(SolutionDir)..\src\kex_ntru\kex_ntru.h" "$(SolutionDir)include\oqs\"
+copy "$(SolutionDir)..\src\kex_rlwe_newhope\kex_rlwe_newhope.h" "$(SolutionDir)include\oqs\"
 copy "$(SolutionDir)..\src\kex_sidh_msr\kex_sidh_msr.h" "$(SolutionDir)include\oqs\"
 copy "$(SolutionDir)..\src\sig\sig.h" "$(SolutionDir)include\oqs\"
 copy "$(SolutionDir)..\src\sig_picnic\sig_picnic.h" "$(SolutionDir)include\oqs\"
-</Command>
+copy "$(SolutionDir)..\src\sig_qtesla\sig_qtesla.h" "$(SolutionDir)include\oqs\"</Command>
     </PreBuildEvent>
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
@@ -334,14 +342,18 @@ copy "$(SolutionDir)..\src\crypto\aes\aes.h" "$(SolutionDir)include\oqs\"
 copy "$(SolutionDir)..\src\crypto\rand_urandom_chacha20\rand_urandom_chacha20.h" "$(SolutionDir)include\oqs\"
 copy "$(SolutionDir)..\src\crypto\rand_urandom_aesctr\rand_urandom_aesctr.h" "$(SolutionDir)include\oqs\"
 copy "$(SolutionDir)..\src\crypto\sha3\sha3.h" "$(SolutionDir)include\oqs\"
+copy "$(SolutionDir)..\src\kem\kem.h" "$(SolutionDir)include\oqs\"
+copy "$(SolutionDir)..\src\kem\bike\kem_bike.h" "$(SolutionDir)include\oqs\"
+copy "$(SolutionDir)..\src\kem\frodokem\kem_frodokem.h" "$(SolutionDir)include\oqs\"
+copy "$(SolutionDir)..\src\kem\sike\kem_sike.h" "$(SolutionDir)include\oqs\"
 copy "$(SolutionDir)..\src\kex\kex.h" "$(SolutionDir)include\oqs\"
-copy "$(SolutionDir)..\src\kex_rlwe_newhope\kex_rlwe_newhope.h" "$(SolutionDir)include\oqs\"
 copy "$(SolutionDir)..\src\kex_code_mcbits\kex_code_mcbits.h" "$(SolutionDir)include\oqs\"
 copy "$(SolutionDir)..\src\kex_ntru\kex_ntru.h" "$(SolutionDir)include\oqs\"
+copy "$(SolutionDir)..\src\kex_rlwe_newhope\kex_rlwe_newhope.h" "$(SolutionDir)include\oqs\"
 copy "$(SolutionDir)..\src\kex_sidh_msr\kex_sidh_msr.h" "$(SolutionDir)include\oqs\"
 copy "$(SolutionDir)..\src\sig\sig.h" "$(SolutionDir)include\oqs\"
 copy "$(SolutionDir)..\src\sig_picnic\sig_picnic.h" "$(SolutionDir)include\oqs\"
-</Command>
+copy "$(SolutionDir)..\src\sig_qtesla\sig_qtesla.h" "$(SolutionDir)include\oqs\"</Command>
     </PreBuildEvent>
     <Lib>
       <AdditionalOptions>/ignore:4006 %(AdditionalOptions)</AdditionalOptions>
@@ -377,14 +389,18 @@ copy "$(SolutionDir)..\src\crypto\aes\aes.h" "$(SolutionDir)include\oqs\"
 copy "$(SolutionDir)..\src\crypto\rand_urandom_chacha20\rand_urandom_chacha20.h" "$(SolutionDir)include\oqs\"
 copy "$(SolutionDir)..\src\crypto\rand_urandom_aesctr\rand_urandom_aesctr.h" "$(SolutionDir)include\oqs\"
 copy "$(SolutionDir)..\src\crypto\sha3\sha3.h" "$(SolutionDir)include\oqs\"
+copy "$(SolutionDir)..\src\kem\kem.h" "$(SolutionDir)include\oqs\"
+copy "$(SolutionDir)..\src\kem\bike\kem_bike.h" "$(SolutionDir)include\oqs\"
+copy "$(SolutionDir)..\src\kem\frodokem\kem_frodokem.h" "$(SolutionDir)include\oqs\"
+copy "$(SolutionDir)..\src\kem\sike\kem_sike.h" "$(SolutionDir)include\oqs\"
 copy "$(SolutionDir)..\src\kex\kex.h" "$(SolutionDir)include\oqs\"
-copy "$(SolutionDir)..\src\kex_rlwe_newhope\kex_rlwe_newhope.h" "$(SolutionDir)include\oqs\"
 copy "$(SolutionDir)..\src\kex_code_mcbits\kex_code_mcbits.h" "$(SolutionDir)include\oqs\"
 copy "$(SolutionDir)..\src\kex_ntru\kex_ntru.h" "$(SolutionDir)include\oqs\"
+copy "$(SolutionDir)..\src\kex_rlwe_newhope\kex_rlwe_newhope.h" "$(SolutionDir)include\oqs\"
 copy "$(SolutionDir)..\src\kex_sidh_msr\kex_sidh_msr.h" "$(SolutionDir)include\oqs\"
 copy "$(SolutionDir)..\src\sig\sig.h" "$(SolutionDir)include\oqs\"
 copy "$(SolutionDir)..\src\sig_picnic\sig_picnic.h" "$(SolutionDir)include\oqs\"
-      </Command>
+copy "$(SolutionDir)..\src\sig_qtesla\sig_qtesla.h" "$(SolutionDir)include\oqs\"</Command>
     </PreBuildEvent>
     <Lib>
       <AdditionalOptions>/ignore:4006 %(AdditionalOptions)</AdditionalOptions>
@@ -419,14 +435,18 @@ copy "$(SolutionDir)..\src\crypto\aes\aes.h" "$(SolutionDir)include\oqs\"
 copy "$(SolutionDir)..\src\crypto\rand_urandom_chacha20\rand_urandom_chacha20.h" "$(SolutionDir)include\oqs\"
 copy "$(SolutionDir)..\src\crypto\rand_urandom_aesctr\rand_urandom_aesctr.h" "$(SolutionDir)include\oqs\"
 copy "$(SolutionDir)..\src\crypto\sha3\sha3.h" "$(SolutionDir)include\oqs\"
+copy "$(SolutionDir)..\src\kem\kem.h" "$(SolutionDir)include\oqs\"
+copy "$(SolutionDir)..\src\kem\bike\kem_bike.h" "$(SolutionDir)include\oqs\"
+copy "$(SolutionDir)..\src\kem\frodokem\kem_frodokem.h" "$(SolutionDir)include\oqs\"
+copy "$(SolutionDir)..\src\kem\sike\kem_sike.h" "$(SolutionDir)include\oqs\"
 copy "$(SolutionDir)..\src\kex\kex.h" "$(SolutionDir)include\oqs\"
-copy "$(SolutionDir)..\src\kex_rlwe_newhope\kex_rlwe_newhope.h" "$(SolutionDir)include\oqs\"
 copy "$(SolutionDir)..\src\kex_code_mcbits\kex_code_mcbits.h" "$(SolutionDir)include\oqs\"
 copy "$(SolutionDir)..\src\kex_ntru\kex_ntru.h" "$(SolutionDir)include\oqs\"
+copy "$(SolutionDir)..\src\kex_rlwe_newhope\kex_rlwe_newhope.h" "$(SolutionDir)include\oqs\"
 copy "$(SolutionDir)..\src\kex_sidh_msr\kex_sidh_msr.h" "$(SolutionDir)include\oqs\"
 copy "$(SolutionDir)..\src\sig\sig.h" "$(SolutionDir)include\oqs\"
 copy "$(SolutionDir)..\src\sig_picnic\sig_picnic.h" "$(SolutionDir)include\oqs\"
-      </Command>
+copy "$(SolutionDir)..\src\sig_qtesla\sig_qtesla.h" "$(SolutionDir)include\oqs\"</Command>
     </PreBuildEvent>
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='ReleaseDLL|Win32'">
@@ -459,14 +479,18 @@ copy "$(SolutionDir)..\src\crypto\aes\aes.h" "$(SolutionDir)include\oqs\"
 copy "$(SolutionDir)..\src\crypto\rand_urandom_chacha20\rand_urandom_chacha20.h" "$(SolutionDir)include\oqs\"
 copy "$(SolutionDir)..\src\crypto\rand_urandom_aesctr\rand_urandom_aesctr.h" "$(SolutionDir)include\oqs\"
 copy "$(SolutionDir)..\src\crypto\sha3\sha3.h" "$(SolutionDir)include\oqs\"
+copy "$(SolutionDir)..\src\kem\kem.h" "$(SolutionDir)include\oqs\"
+copy "$(SolutionDir)..\src\kem\bike\kem_bike.h" "$(SolutionDir)include\oqs\"
+copy "$(SolutionDir)..\src\kem\frodokem\kem_frodokem.h" "$(SolutionDir)include\oqs\"
+copy "$(SolutionDir)..\src\kem\sike\kem_sike.h" "$(SolutionDir)include\oqs\"
 copy "$(SolutionDir)..\src\kex\kex.h" "$(SolutionDir)include\oqs\"
-copy "$(SolutionDir)..\src\kex_rlwe_newhope\kex_rlwe_newhope.h" "$(SolutionDir)include\oqs\"
 copy "$(SolutionDir)..\src\kex_code_mcbits\kex_code_mcbits.h" "$(SolutionDir)include\oqs\"
 copy "$(SolutionDir)..\src\kex_ntru\kex_ntru.h" "$(SolutionDir)include\oqs\"
+copy "$(SolutionDir)..\src\kex_rlwe_newhope\kex_rlwe_newhope.h" "$(SolutionDir)include\oqs\"
 copy "$(SolutionDir)..\src\kex_sidh_msr\kex_sidh_msr.h" "$(SolutionDir)include\oqs\"
 copy "$(SolutionDir)..\src\sig\sig.h" "$(SolutionDir)include\oqs\"
 copy "$(SolutionDir)..\src\sig_picnic\sig_picnic.h" "$(SolutionDir)include\oqs\"
-      </Command>
+copy "$(SolutionDir)..\src\sig_qtesla\sig_qtesla.h" "$(SolutionDir)include\oqs\"</Command>
     </PreBuildEvent>
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
@@ -499,14 +523,18 @@ copy "$(SolutionDir)..\src\crypto\aes\aes.h" "$(SolutionDir)include\oqs\"
 copy "$(SolutionDir)..\src\crypto\rand_urandom_chacha20\rand_urandom_chacha20.h" "$(SolutionDir)include\oqs\"
 copy "$(SolutionDir)..\src\crypto\rand_urandom_aesctr\rand_urandom_aesctr.h" "$(SolutionDir)include\oqs\"
 copy "$(SolutionDir)..\src\crypto\sha3\sha3.h" "$(SolutionDir)include\oqs\"
+copy "$(SolutionDir)..\src\kem\kem.h" "$(SolutionDir)include\oqs\"
+copy "$(SolutionDir)..\src\kem\bike\kem_bike.h" "$(SolutionDir)include\oqs\"
+copy "$(SolutionDir)..\src\kem\frodokem\kem_frodokem.h" "$(SolutionDir)include\oqs\"
+copy "$(SolutionDir)..\src\kem\sike\kem_sike.h" "$(SolutionDir)include\oqs\"
 copy "$(SolutionDir)..\src\kex\kex.h" "$(SolutionDir)include\oqs\"
-copy "$(SolutionDir)..\src\kex_rlwe_newhope\kex_rlwe_newhope.h" "$(SolutionDir)include\oqs\"
 copy "$(SolutionDir)..\src\kex_code_mcbits\kex_code_mcbits.h" "$(SolutionDir)include\oqs\"
 copy "$(SolutionDir)..\src\kex_ntru\kex_ntru.h" "$(SolutionDir)include\oqs\"
+copy "$(SolutionDir)..\src\kex_rlwe_newhope\kex_rlwe_newhope.h" "$(SolutionDir)include\oqs\"
 copy "$(SolutionDir)..\src\kex_sidh_msr\kex_sidh_msr.h" "$(SolutionDir)include\oqs\"
 copy "$(SolutionDir)..\src\sig\sig.h" "$(SolutionDir)include\oqs\"
 copy "$(SolutionDir)..\src\sig_picnic\sig_picnic.h" "$(SolutionDir)include\oqs\"
-      </Command>
+copy "$(SolutionDir)..\src\sig_qtesla\sig_qtesla.h" "$(SolutionDir)include\oqs\"</Command>
     </PreBuildEvent>
     <Lib>
       <AdditionalOptions>/ignore:4006 %(AdditionalOptions)</AdditionalOptions>
@@ -546,14 +574,18 @@ copy "$(SolutionDir)..\src\crypto\aes\aes.h" "$(SolutionDir)include\oqs\"
 copy "$(SolutionDir)..\src\crypto\rand_urandom_chacha20\rand_urandom_chacha20.h" "$(SolutionDir)include\oqs\"
 copy "$(SolutionDir)..\src\crypto\rand_urandom_aesctr\rand_urandom_aesctr.h" "$(SolutionDir)include\oqs\"
 copy "$(SolutionDir)..\src\crypto\sha3\sha3.h" "$(SolutionDir)include\oqs\"
+copy "$(SolutionDir)..\src\kem\kem.h" "$(SolutionDir)include\oqs\"
+copy "$(SolutionDir)..\src\kem\bike\kem_bike.h" "$(SolutionDir)include\oqs\"
+copy "$(SolutionDir)..\src\kem\frodokem\kem_frodokem.h" "$(SolutionDir)include\oqs\"
+copy "$(SolutionDir)..\src\kem\sike\kem_sike.h" "$(SolutionDir)include\oqs\"
 copy "$(SolutionDir)..\src\kex\kex.h" "$(SolutionDir)include\oqs\"
-copy "$(SolutionDir)..\src\kex_rlwe_newhope\kex_rlwe_newhope.h" "$(SolutionDir)include\oqs\"
 copy "$(SolutionDir)..\src\kex_code_mcbits\kex_code_mcbits.h" "$(SolutionDir)include\oqs\"
 copy "$(SolutionDir)..\src\kex_ntru\kex_ntru.h" "$(SolutionDir)include\oqs\"
+copy "$(SolutionDir)..\src\kex_rlwe_newhope\kex_rlwe_newhope.h" "$(SolutionDir)include\oqs\"
 copy "$(SolutionDir)..\src\kex_sidh_msr\kex_sidh_msr.h" "$(SolutionDir)include\oqs\"
 copy "$(SolutionDir)..\src\sig\sig.h" "$(SolutionDir)include\oqs\"
 copy "$(SolutionDir)..\src\sig_picnic\sig_picnic.h" "$(SolutionDir)include\oqs\"
-      </Command>
+copy "$(SolutionDir)..\src\sig_qtesla\sig_qtesla.h" "$(SolutionDir)include\oqs\"</Command>
     </PreBuildEvent>
     <Lib>
       <AdditionalOptions>/ignore:4006 %(AdditionalOptions)</AdditionalOptions>
@@ -562,4 +594,4 @@ copy "$(SolutionDir)..\src\sig_picnic\sig_picnic.h" "$(SolutionDir)include\oqs\"
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
   <ImportGroup Label="ExtensionTargets">
   </ImportGroup>
-</Project>
+</Project>
\ No newline at end of file
diff --git a/VisualStudio/oqs/oqs.vcxproj.filters b/VisualStudio/oqs/oqs.vcxproj.filters
index e0d22acd4..cd893d869 100644
--- a/VisualStudio/oqs/oqs.vcxproj.filters
+++ b/VisualStudio/oqs/oqs.vcxproj.filters
@@ -1,286 +1,272 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <ItemGroup>
-    <ClCompile Include="..\..\src\kex_rlwe_newhope\kex_rlwe_newhope.c">
-      <Filter>KEX_NewHope</Filter>
-    </ClCompile>
     <ClCompile Include="..\..\src\common\common.c">
-      <Filter>Common</Filter>
+      <Filter>common</Filter>
     </ClCompile>
     <ClCompile Include="..\..\src\common\rand.c">
-      <Filter>Common</Filter>
+      <Filter>common</Filter>
     </ClCompile>
     <ClCompile Include="..\..\src\crypto\aes\aes.c">
-      <Filter>Crypto\AES</Filter>
+      <Filter>crypto</Filter>
     </ClCompile>
     <ClCompile Include="..\..\src\crypto\aes\aes_c.c">
-      <Filter>Crypto\AES</Filter>
+      <Filter>crypto</Filter>
     </ClCompile>
     <ClCompile Include="..\..\src\crypto\aes\aes_ni.c">
-      <Filter>Crypto\AES</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\src\crypto\sha3\sha3.c">
-      <Filter>Crypto\SHA3</Filter>
+      <Filter>crypto</Filter>
     </ClCompile>
     <ClCompile Include="..\..\src\crypto\rand_urandom_aesctr\rand_urandom_aesctr.c">
-        <ClCompile Include="..\..\src\common\rand.c">
-          <Filter>Crypto\Rand</Filter>
-        </ClCompile>
-      <Filter>Crypto\Rand</Filter>
+      <Filter>crypto</Filter>
     </ClCompile>
     <ClCompile Include="..\..\src\crypto\rand_urandom_chacha20\rand_urandom_chacha20.c">
-      <Filter>Crypto\Rand</Filter>
+      <Filter>crypto</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\src\crypto\sha3\sha3.c">
+      <Filter>crypto</Filter>
     </ClCompile>
     <ClCompile Include="..\..\src\kex\kex.c">
-      <Filter>KEX</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\src\kex_code_mcbits\kex_code_mcbits.c">
-      <Filter>KEX_McBits</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\src\kex_code_mcbits\external\operations.c">
-      <Filter>KEX_McBits</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\src\kex_ntru\kex_ntru.c">
-      <Filter>KEX_NTRU</Filter>
+      <Filter>kex</Filter>
     </ClCompile>
     <ClCompile Include="..\..\src\sig\sig.c">
-      <Filter>Sig</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\src\sig_picnic\sig_picnic.c">
-      <Filter>Sig_Picnic</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\src\kex_sidh_msr\kex_sidh_msr.c">
-      <Filter>KEX_SIDH_MSR</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\src\kex_sidh_msr\P503\P503.c">
-      <Filter>KEX_SIDH_MSR</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\src\kex_sidh_msr\P751\P751.c">
-      <Filter>KEX_SIDH_MSR</Filter>
+      <Filter>sig</Filter>
     </ClCompile>
     <ClCompile Include="..\..\src\sig_picnic\external\aligned_alloc.c">
-      <Filter>Sig_Picnic</Filter>
+      <Filter>picnic</Filter>
     </ClCompile>
     <ClCompile Include="..\..\src\sig_picnic\external\bitstream.c">
-      <Filter>Sig_Picnic</Filter>
+      <Filter>picnic</Filter>
     </ClCompile>
     <ClCompile Include="..\..\src\sig_picnic\external\cpu.c">
-      <Filter>Sig_Picnic</Filter>
+      <Filter>picnic</Filter>
     </ClCompile>
     <ClCompile Include="..\..\src\sig_picnic\external\io.c">
-      <Filter>Sig_Picnic</Filter>
+      <Filter>picnic</Filter>
     </ClCompile>
     <ClCompile Include="..\..\src\sig_picnic\external\kdf_shake.c">
-      <Filter>Sig_Picnic</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\src\sig_picnic\external\lowmc.c">
-      <Filter>Sig_Picnic</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\src\sig_picnic\external\lowmc_128_128_20.c">
-      <Filter>Sig_Picnic</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\src\sig_picnic\external\lowmc_192_192_30.c">
-      <Filter>Sig_Picnic</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\src\sig_picnic\external\lowmc_256_256_38.c">
-      <Filter>Sig_Picnic</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\src\sig_picnic\external\lowmc_pars.c">
-      <Filter>Sig_Picnic</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\src\sig_picnic\external\mpc.c">
-      <Filter>Sig_Picnic</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\src\sig_picnic\external\mpc_lowmc.c">
-      <Filter>Sig_Picnic</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\src\sig_picnic\external\mzd_additional.c">
-      <Filter>Sig_Picnic</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\src\sig_picnic\external\picnic.c">
-      <Filter>Sig_Picnic</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\src\sig_picnic\external\picnic_impl.c">
-      <Filter>Sig_Picnic</Filter>
+      <Filter>picnic</Filter>
     </ClCompile>
     <ClCompile Include="..\..\src\sig_picnic\external\sha3\KeccakHash.c">
-      <Filter>Sig_Picnic</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\src\sig_picnic\external\sha3\KeccakSponge.c">
-      <Filter>Sig_Picnic</Filter>
+      <Filter>picnic</Filter>
     </ClCompile>
     <ClCompile Include="..\..\src\sig_picnic\external\sha3\opt64\KeccakP-1600-opt64.c">
-      <Filter>Sig_Picnic</Filter>
+      <Filter>picnic</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\src\sig_picnic\external\sha3\KeccakSponge.c">
+      <Filter>picnic</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\src\kex_code_mcbits\kex_code_mcbits.c">
+      <Filter>mcbits</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\src\kex_ntru\kex_ntru.c">
+      <Filter>ntru</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\src\kex_rlwe_newhope\kex_rlwe_newhope.c">
+      <Filter>newhope</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\src\kex_sidh_msr\kex_sidh_msr.c">
+      <Filter>sidh</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\src\sig_picnic\external\lowmc.c">
+      <Filter>picnic</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\src\sig_picnic\external\lowmc_128_128_20.c">
+      <Filter>picnic</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\src\sig_picnic\external\lowmc_192_192_30.c">
+      <Filter>picnic</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\src\sig_picnic\external\lowmc_256_256_38.c">
+      <Filter>picnic</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\src\sig_picnic\external\lowmc_pars.c">
+      <Filter>picnic</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\src\sig_picnic\external\mpc.c">
+      <Filter>picnic</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\src\sig_picnic\external\mpc_lowmc.c">
+      <Filter>picnic</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\src\sig_picnic\external\mzd_additional.c">
+      <Filter>picnic</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\src\kex_code_mcbits\external\operations.c">
+      <Filter>mcbits</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\src\kex_sidh_msr\P503\P503.c">
+      <Filter>sidh</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\src\kex_sidh_msr\P751\P751.c">
+      <Filter>sidh</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\src\sig_picnic\external\picnic.c">
+      <Filter>picnic</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\src\sig_picnic\external\picnic_impl.c">
+      <Filter>picnic</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\src\sig_picnic\sig_picnic.c">
+      <Filter>picnic</Filter>
     </ClCompile>
   </ItemGroup>
   <ItemGroup>
-    <ClInclude Include="..\..\src\kex_rlwe_newhope\kex_rlwe_newhope.h">
-      <Filter>KEX_NewHope</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\src\kex_rlwe_newhope\params.h">
-      <Filter>KEX_NewHope</Filter>
-    </ClInclude>
+    <ClInclude Include="..\..\src\oqs.h" />
+    <ClInclude Include="..\winconfig.h" />
     <ClInclude Include="..\..\src\common\common.h">
-      <Filter>Common</Filter>
+      <Filter>common</Filter>
     </ClInclude>
     <ClInclude Include="..\..\src\common\rand.h">
-      <Filter>Common</Filter>
+      <Filter>common</Filter>
     </ClInclude>
     <ClInclude Include="..\..\src\crypto\aes\aes.h">
-      <Filter>Crypto\AES</Filter>
+      <Filter>crypto</Filter>
     </ClInclude>
     <ClInclude Include="..\..\src\crypto\aes\aes_local.h">
-      <Filter>Crypto\AES</Filter>
+      <Filter>crypto</Filter>
     </ClInclude>
     <ClInclude Include="..\..\src\crypto\sha3\sha3.h">
-      <Filter>Crypto\SHA3</Filter>
+      <Filter>crypto</Filter>
     </ClInclude>
     <ClInclude Include="..\..\src\crypto\rand_urandom_aesctr\rand_urandom_aesctr.h">
-      <Filter>Crypto\Rand</Filter>
+      <Filter>crypto</Filter>
     </ClInclude>
     <ClInclude Include="..\..\src\crypto\rand_urandom_chacha20\rand_urandom_chacha20.h">
-      <Filter>Crypto\Rand</Filter>
+      <Filter>crypto</Filter>
     </ClInclude>
     <ClInclude Include="..\..\src\kex\kex.h">
-      <Filter>KEX</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\src\kex_code_mcbits\kex_code_mcbits.h">
-      <Filter>KEX_McBits</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\src\kex_code_mcbits\mcbits.h">
-      <Filter>KEX_McBits</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\src\kex_ntru\kex_ntru.h">
-      <Filter>KEX_NTRU</Filter>
+      <Filter>kex</Filter>
     </ClInclude>
     <ClInclude Include="..\..\src\sig\sig.h">
-      <Filter>Sig</Filter>
+      <Filter>sig</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\src\sig_picnic\sig_picnic.h">
-      <Filter>Sig_Picnic</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\src\kex_sidh_msr\kex_sidh_msr.h">
-      <Filter>KEX_SIDH_MSR</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\src\kex_sidh_msr\P503\P503_api.h">
-      <Filter>KEX_SIDH_MSR</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\src\kex_sidh_msr\P503\P503_internal.h">
-      <Filter>KEX_SIDH_MSR</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\src\kex_sidh_msr\windows_undef.h">
-      <Filter>KEX_SIDH_MSR</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\src\kex_sidh_msr\P751\P751_api.h">
-      <Filter>KEX_SIDH_MSR</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\src\kex_sidh_msr\P751\P751_internal.h">
-      <Filter>KEX_SIDH_MSR</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\src\sig_picnic\external\picnic.h">
-      <Filter>Sig_Picnic</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\src\oqs.h">
-      <Filter>Common</Filter>
-    </ClInclude>
-    <ClInclude Include="..\winconfig.h" />
     <ClInclude Include="..\..\src\sig_picnic\external\bitstream.h">
-      <Filter>Sig_Picnic</Filter>
+      <Filter>picnic</Filter>
     </ClInclude>
     <ClInclude Include="..\..\src\sig_picnic\external\compat.h">
-      <Filter>Sig_Picnic</Filter>
+      <Filter>picnic</Filter>
     </ClInclude>
     <ClInclude Include="..\..\src\sig_picnic\external\cpu.h">
-      <Filter>Sig_Picnic</Filter>
+      <Filter>picnic</Filter>
     </ClInclude>
     <ClInclude Include="..\..\src\sig_picnic\external\crypto_sign.h">
-      <Filter>Sig_Picnic</Filter>
+      <Filter>picnic</Filter>
     </ClInclude>
     <ClInclude Include="..\..\src\sig_picnic\external\endian_compat.h">
-      <Filter>Sig_Picnic</Filter>
+      <Filter>picnic</Filter>
     </ClInclude>
     <ClInclude Include="..\..\src\sig_picnic\external\io.h">
-      <Filter>Sig_Picnic</Filter>
+      <Filter>picnic</Filter>
     </ClInclude>
     <ClInclude Include="..\..\src\sig_picnic\external\kdf_shake.h">
-      <Filter>Sig_Picnic</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\src\sig_picnic\external\lowmc.h">
-      <Filter>Sig_Picnic</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\src\sig_picnic\external\lowmc_128_128_20.h">
-      <Filter>Sig_Picnic</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\src\sig_picnic\external\lowmc_192_192_30.h">
-      <Filter>Sig_Picnic</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\src\sig_picnic\external\lowmc_256_256_38.h">
-      <Filter>Sig_Picnic</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\src\sig_picnic\external\lowmc_pars.h">
-      <Filter>Sig_Picnic</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\src\sig_picnic\external\macros.h">
-      <Filter>Sig_Picnic</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\src\sig_picnic\external\mpc.h">
-      <Filter>Sig_Picnic</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\src\sig_picnic\external\mpc_lowmc.h">
-      <Filter>Sig_Picnic</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\src\sig_picnic\external\mzd_additional.h">
-      <Filter>Sig_Picnic</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\src\sig_picnic\external\picnic_impl.h">
-      <Filter>Sig_Picnic</Filter>
+      <Filter>picnic</Filter>
     </ClInclude>
     <ClInclude Include="..\..\src\sig_picnic\external\sha3\KeccakHash.h">
-      <Filter>Sig_Picnic</Filter>
+      <Filter>picnic</Filter>
     </ClInclude>
     <ClInclude Include="..\..\src\sig_picnic\external\sha3\KeccakSponge.h">
-      <Filter>Sig_Picnic</Filter>
+      <Filter>picnic</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\src\kex_code_mcbits\kex_code_mcbits.h">
+      <Filter>mcbits</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\src\kex_ntru\kex_ntru.h">
+      <Filter>ntru</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\src\kex_rlwe_newhope\kex_rlwe_newhope.h">
+      <Filter>newhope</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\src\kex_sidh_msr\kex_sidh_msr.h">
+      <Filter>sidh</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\src\sig_picnic\external\lowmc.h">
+      <Filter>picnic</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\src\sig_picnic\external\lowmc_128_128_20.h">
+      <Filter>picnic</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\src\sig_picnic\external\lowmc_192_192_30.h">
+      <Filter>picnic</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\src\sig_picnic\external\lowmc_256_256_38.h">
+      <Filter>picnic</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\src\sig_picnic\external\lowmc_pars.h">
+      <Filter>picnic</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\src\sig_picnic\external\macros.h">
+      <Filter>picnic</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\src\kex_code_mcbits\mcbits.h">
+      <Filter>mcbits</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\src\sig_picnic\external\mpc.h">
+      <Filter>picnic</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\src\sig_picnic\external\mpc_lowmc.h">
+      <Filter>picnic</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\src\sig_picnic\external\mzd_additional.h">
+      <Filter>picnic</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\src\kex_sidh_msr\P503\P503_api.h">
+      <Filter>sidh</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\src\kex_sidh_msr\P503\P503_internal.h">
+      <Filter>sidh</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\src\kex_sidh_msr\P751\P751_api.h">
+      <Filter>sidh</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\src\kex_sidh_msr\P751\P751_internal.h">
+      <Filter>sidh</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\src\kex_rlwe_newhope\params.h">
+      <Filter>newhope</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\src\sig_picnic\external\picnic.h">
+      <Filter>picnic</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\src\sig_picnic\external\picnic_impl.h">
+      <Filter>picnic</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\src\sig_picnic\sig_picnic.h">
+      <Filter>picnic</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\src\kex_sidh_msr\windows_undef.h">
+      <Filter>sidh</Filter>
     </ClInclude>
-  </ItemGroup>
-  <ItemGroup>
-    <Filter Include="Common">
-      <UniqueIdentifier>{2b7cf696-2f08-4ea3-80c5-0d16a8c70cfa}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="Crypto">
-      <UniqueIdentifier>{4a3e4a60-250c-46a9-8c6c-c8aecadee154}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="Crypto\AES">
-      <UniqueIdentifier>{71c917ec-9181-4b88-bdfc-9611ee1abe9a}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="Crypto\Rand">
-      <UniqueIdentifier>{fd44eb34-2f81-411e-a55f-f279c4b101de}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="KEX">
-      <UniqueIdentifier>{3bb6aa76-f294-47a9-bf22-76245c9cb1d1}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="KEX_NewHope">
-      <UniqueIdentifier>{d0291785-4232-4264-b1bd-08b7e3f8df5e}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="Crypto\SHA3">
-      <UniqueIdentifier>{a9a0db92-1388-4ea2-b0d5-d61a51581993}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="KEX_McBits">
-      <UniqueIdentifier>{9c91a128-d5a0-4eec-998e-a7bc85b3691e}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="KEX_NTRU">
-      <UniqueIdentifier>{f2432c4a-5195-4990-af30-65a61bf36897}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="Sig">
-      <UniqueIdentifier>{d8958465-5fd0-4d0f-8acf-f20d79c4a490}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="Sig_Picnic">
-      <UniqueIdentifier>{18dd9adb-41b8-4058-a714-0a0d49db26ad}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="KEX_SIDH_MSR">
-      <UniqueIdentifier>{e8cfee66-d051-4f66-af66-1478288097fb}</UniqueIdentifier>
-    </Filter>
   </ItemGroup>
   <ItemGroup>
     <None Include="dll.def" />
   </ItemGroup>
-</Project>
+  <ItemGroup>
+    <Filter Include="common">
+      <UniqueIdentifier>{b1b5c245-25b4-4f34-a290-fb36bb9ff8ea}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="crypto">
+      <UniqueIdentifier>{57fbdf3e-6a39-495b-bbc2-6d342bacc156}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="kex">
+      <UniqueIdentifier>{dad45e36-f955-417c-846f-256015873c5a}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="sig">
+      <UniqueIdentifier>{143e4927-3f7d-449f-b1d9-669993470c2f}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="picnic">
+      <UniqueIdentifier>{38993d7a-4180-4824-9451-f118b8df2fbd}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="mcbits">
+      <UniqueIdentifier>{b6afb5f9-a34e-4e96-b458-2d2bf2a1f6f7}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="ntru">
+      <UniqueIdentifier>{669c3be0-bba3-4507-b0a2-a332bbce2052}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="newhope">
+      <UniqueIdentifier>{754f92dd-11d8-4c4e-85e5-b8753a66f3d1}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="sidh">
+      <UniqueIdentifier>{7e30eb7e-4fb9-4783-8154-6f2a9f88e68a}</UniqueIdentifier>
+    </Filter>
+  </ItemGroup>
+</Project>
\ No newline at end of file
diff --git a/VisualStudio/test_kex/test_kex.vcxproj b/VisualStudio/test_kex/test_kex.vcxproj
index 5af9ea1b6..8c036c95f 100644
--- a/VisualStudio/test_kex/test_kex.vcxproj
+++ b/VisualStudio/test_kex/test_kex.vcxproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project DefaultTargets="Build" ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <ItemGroup Label="ProjectConfigurations">
     <ProjectConfiguration Include="DebugDLL|Win32">
@@ -328,12 +328,12 @@
     </Link>
   </ItemDefinitionGroup>
   <ItemGroup>
-    <ClCompile Include="..\..\src\kex\test_kex.c" />
+    <ClInclude Include="..\winconfig.h" />
   </ItemGroup>
   <ItemGroup>
-    <ClInclude Include="..\winconfig.h" />
+    <ClCompile Include="..\..\tests\test_kex.c" />
   </ItemGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
   <ImportGroup Label="ExtensionTargets">
   </ImportGroup>
-</Project>
+</Project>
\ No newline at end of file
diff --git a/VisualStudio/test_kex/test_kex.vcxproj.filters b/VisualStudio/test_kex/test_kex.vcxproj.filters
index 9cc6d9eb6..43146b292 100644
--- a/VisualStudio/test_kex/test_kex.vcxproj.filters
+++ b/VisualStudio/test_kex/test_kex.vcxproj.filters
@@ -14,14 +14,14 @@
       <Extensions>rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav;mfcribbon-ms</Extensions>
     </Filter>
   </ItemGroup>
-  <ItemGroup>
-    <ClCompile Include="..\..\src\kex\test_kex.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-  </ItemGroup>
   <ItemGroup>
     <ClInclude Include="..\winconfig.h">
       <Filter>Header Files</Filter>
     </ClInclude>
   </ItemGroup>
+  <ItemGroup>
+    <ClCompile Include="..\..\tests\test_kex.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+  </ItemGroup>
 </Project>
\ No newline at end of file
diff --git a/VisualStudio/test_sig/test_sig.vcxproj b/VisualStudio/test_sig/test_sig.vcxproj
index b523bf5cf..394028c66 100644
--- a/VisualStudio/test_sig/test_sig.vcxproj
+++ b/VisualStudio/test_sig/test_sig.vcxproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project DefaultTargets="Build" ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <ItemGroup Label="ProjectConfigurations">
     <ProjectConfiguration Include="DebugDLL|Win32">
@@ -349,12 +349,12 @@
     </PostBuildEvent>
   </ItemDefinitionGroup>
   <ItemGroup>
-    <ClCompile Include="..\..\src\sig\test_sig.c" />
+    <ClInclude Include="..\winconfig.h" />
   </ItemGroup>
   <ItemGroup>
-    <ClInclude Include="..\winconfig.h" />
+    <ClCompile Include="..\..\tests\test_sig.c" />
   </ItemGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
   <ImportGroup Label="ExtensionTargets">
   </ImportGroup>
-</Project>
+</Project>
\ No newline at end of file
diff --git a/VisualStudio/test_sig/test_sig.vcxproj.filters b/VisualStudio/test_sig/test_sig.vcxproj.filters
index 9cc16a1f7..7c35630fe 100644
--- a/VisualStudio/test_sig/test_sig.vcxproj.filters
+++ b/VisualStudio/test_sig/test_sig.vcxproj.filters
@@ -14,14 +14,14 @@
       <Extensions>rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav;mfcribbon-ms</Extensions>
     </Filter>
   </ItemGroup>
-  <ItemGroup>
-    <ClCompile Include="..\..\src\sig\test_sig.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-  </ItemGroup>
   <ItemGroup>
     <ClInclude Include="..\winconfig.h">
       <Filter>Header Files</Filter>
     </ClInclude>
   </ItemGroup>
+  <ItemGroup>
+    <ClCompile Include="..\..\tests\test_sig.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+  </ItemGroup>
 </Project>
\ No newline at end of file
diff --git a/appveyor.yml b/appveyor.yml
index 3ca42abff..03e025df1 100644
--- a/appveyor.yml
+++ b/appveyor.yml
@@ -15,8 +15,6 @@ configuration:
 
 test_script:
 - cmd: >-
-    %APPVEYOR_BUILD_FOLDER%\VisualStudio\x64\%CONFIGURATION%\test_rand.exe
-
     %APPVEYOR_BUILD_FOLDER%\VisualStudio\x64\%CONFIGURATION%\test_kex.exe
 
     %APPVEYOR_BUILD_FOLDER%\VisualStudio\x64\%CONFIGURATION%\test_sig.exe
diff --git a/src/common/common.h b/src/common/common.h
index f8909a919..9fad7e543 100644
--- a/src/common/common.h
+++ b/src/common/common.h
@@ -8,7 +8,11 @@
 
 #include <stdint.h>
 #include <stdlib.h>
-#include <oqs/config.h>
+#if defined(_WIN32)
+#include <oqs/winconfig.h>
+#else
+#include <oqs/config.h>
+#endif
 
 /**
  * Represents return values from functions.
@@ -123,6 +127,10 @@ void OQS_MEM_insecure_free(void *ptr);
  *
  * Example: OQS_API return_value function_name(void);
  */
+#if defined(_WIN32)
+#define OQS_API
+#else
 #define OQS_API __attribute__((visibility("default")))
+#endif
 
 #endif // __OQS_COMMON_H
diff --git a/src/common/rand.c b/src/common/rand.c
index 26da0dcef..79be86b2e 100644
--- a/src/common/rand.c
+++ b/src/common/rand.c
@@ -2,13 +2,14 @@
 #if defined(_WIN32)
 #include <windows.h>
 #include <Wincrypt.h>
+#define strcasecmp _stricmp
 #else
 #include <stdlib.h>
 #include <unistd.h>
+#include <strings.h>
 #endif
 
 #include <fcntl.h>
-#include <strings.h>
 
 #include <oqs/oqs.h>
 
diff --git a/tests/minimal_kex_oqs.c b/tests/minimal_kex_oqs.c
index bf8e3466b..b7f862c17 100644
--- a/tests/minimal_kex_oqs.c
+++ b/tests/minimal_kex_oqs.c
@@ -17,7 +17,7 @@ void cleanup(uint8_t *alice_msg, size_t alice_msg_len, uint8_t *alice_key,
              uint8_t *bob_key, size_t bob_key_len, void *alice_priv,
              OQS_KEX *kex, OQS_RAND *rnd);
 
-#ifdef ENABLE_KEX_LWE_FRODO
+#ifdef ENABLE_KEX_RLWE_NEWHOPE
 int main(void) {
 	/* Key exchange parameters */
 	void *alice_priv = NULL;   // Alice's private key
@@ -32,7 +32,7 @@ int main(void) {
 	size_t bob_key_len = 0;  // Bob's final key length
 
 	/* Setup the key exchange protocol */
-	enum OQS_KEX_alg_name alg_name = OQS_KEX_alg_lwe_frodo;      // Alg. name
+	enum OQS_KEX_alg_name alg_name = OQS_KEX_alg_rlwe_newhope;      // Alg. name
 	const uint8_t *seed = (unsigned char *) "01234567890123456"; // Rand. seed
 	const size_t seed_len = 16;                                  // Seed length
 	const char *named_parameters = "recommended";                // Named params.