diff --git a/UnitTest1/UnitTest1.vcxproj b/UnitTest1/UnitTest1.vcxproj
index d6dfd9b08a9698d026eb85dbe59904279b8bcdf3..3d36864c10bd55b67bf3f39a5602b6e4b10b0793 100644
--- a/UnitTest1/UnitTest1.vcxproj
+++ b/UnitTest1/UnitTest1.vcxproj
@@ -94,6 +94,7 @@
       <Optimization>Disabled</Optimization>
       <PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <UseFullPaths>true</UseFullPaths>
+      <AdditionalIncludeDirectories>$(SolutionDir)</AdditionalIncludeDirectories>
     </ClCompile>
     <Link>
       <SubSystem>Windows</SubSystem>
@@ -108,6 +109,7 @@
       <Optimization>Disabled</Optimization>
       <PreprocessorDefinitions>_DEBUG;_WINDOWS;_WINDOWS64;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <UseFullPaths>true</UseFullPaths>
+      <AdditionalIncludeDirectories>$(SolutionDir)</AdditionalIncludeDirectories>
     </ClCompile>
     <Link>
       <SubSystem>Windows</SubSystem>
@@ -124,6 +126,7 @@
       <IntrinsicFunctions>true</IntrinsicFunctions>
       <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <UseFullPaths>true</UseFullPaths>
+      <AdditionalIncludeDirectories>$(SolutionDir)</AdditionalIncludeDirectories>
     </ClCompile>
     <Link>
       <SubSystem>Windows</SubSystem>
@@ -142,6 +145,7 @@
       <IntrinsicFunctions>true</IntrinsicFunctions>
       <PreprocessorDefinitions>NDEBUG;_WINDOWS;_WINDOWS64;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <UseFullPaths>true</UseFullPaths>
+      <AdditionalIncludeDirectories>$(SolutionDir)</AdditionalIncludeDirectories>
     </ClCompile>
     <Link>
       <SubSystem>Windows</SubSystem>
diff --git a/UnitTest1/unittest1.cpp b/UnitTest1/unittest1.cpp
index bd631c5f8632094dc4b60587438fa3d5ae31a86c..6320f98577d96465125d97ce8be57e6e384be5a0 100644
--- a/UnitTest1/unittest1.cpp
+++ b/UnitTest1/unittest1.cpp
@@ -21,7 +21,7 @@
 
 #include "stdafx.h"
 #include "CppUnitTest.h"
-#include "../picoquictest/picoquictest.h"
+#include "picoquictest/picoquictest.h"
 
 using namespace Microsoft::VisualStudio::CppUnitTestFramework;
 
diff --git a/picoquic_t/picoquic_t.c b/picoquic_t/picoquic_t.c
index dcd3b34e86cd3a8ed2ebc8d5dc06580ac16556fc..4bb1e46b0c4f6b8e6f2dc67aaa1e9f3a1eab88f7 100644
--- a/picoquic_t/picoquic_t.c
+++ b/picoquic_t/picoquic_t.c
@@ -19,11 +19,11 @@
 * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 */
 #ifdef _WINDOWS
-#include "../picoquicfirst/getopt.h"
+#include "picoquicfirst/getopt.h"
 #endif
-#include "../picoquic/picoquic.h"
-#include "../picoquic/util.h"
-#include "../picoquictest/picoquictest.h"
+#include "picoquic/picoquic.h"
+#include "picoquic/util.h"
+#include "picoquictest/picoquictest.h"
 #include <stdio.h>
 #include <string.h>
 #include <stdlib.h>
diff --git a/picoquic_t/picoquic_t.vcxproj b/picoquic_t/picoquic_t.vcxproj
index 1201cfae540446199f900d4e72e840dd6b3d74b2..a88f6f8b8f797af633a2d37838bf4280ece4b84e 100644
--- a/picoquic_t/picoquic_t.vcxproj
+++ b/picoquic_t/picoquic_t.vcxproj
@@ -89,7 +89,7 @@
       <WarningLevel>Level3</WarningLevel>
       <Optimization>Disabled</Optimization>
       <PreprocessorDefinitions>WIN32;_DEBUG;_CONSOLE;_WINDOWS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories>..\..\picotls\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>$(SolutionDir);..\..\picotls\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
     </ClCompile>
     <Link>
       <SubSystem>Console</SubSystem>
@@ -104,7 +104,7 @@
       <WarningLevel>Level3</WarningLevel>
       <Optimization>Disabled</Optimization>
       <PreprocessorDefinitions>_DEBUG;_CONSOLE;_WINDOWS;_WINDOWS64;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories>..\..\picotls\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>$(SolutionDir);..\..\picotls\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
     </ClCompile>
     <Link>
       <SubSystem>Console</SubSystem>
@@ -121,6 +121,7 @@
       <FunctionLevelLinking>true</FunctionLevelLinking>
       <IntrinsicFunctions>true</IntrinsicFunctions>
       <PreprocessorDefinitions>WIN32;NDEBUG;_CONSOLE;_WINDOWS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <AdditionalIncludeDirectories>$(SolutionDir)</AdditionalIncludeDirectories>
     </ClCompile>
     <Link>
       <SubSystem>Console</SubSystem>
@@ -139,6 +140,7 @@
       <FunctionLevelLinking>true</FunctionLevelLinking>
       <IntrinsicFunctions>true</IntrinsicFunctions>
       <PreprocessorDefinitions>NDEBUG;_CONSOLE;_WINDOWS;_WINDOWS64;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <AdditionalIncludeDirectories>$(SolutionDir)</AdditionalIncludeDirectories>
     </ClCompile>
     <Link>
       <SubSystem>Console</SubSystem>
diff --git a/picoquicfirst/picoquicdemo.c b/picoquicfirst/picoquicdemo.c
index 4ba06e4b4a605b51c3dc3483e2b69dcb7d1286b0..825bc38e3bcd70c18ce2698cab3e4305e8a5ae0d 100644
--- a/picoquicfirst/picoquicdemo.c
+++ b/picoquicfirst/picoquicdemo.c
@@ -104,10 +104,10 @@ static const char* ticket_store_filename = "demo_ticket_store.bin";
 
 static const char* bad_request_message = "<html><head><title>Bad Request</title></head><body>Bad request. Why don't you try \"GET /doc-456789.html\"?</body></html>";
 
-#include "../picoquic/picoquic.h"
-#include "../picoquic/picoquic_internal.h"
-#include "../picoquic/picosocks.h"
-#include "../picoquic/util.h"
+#include "picoquic/picoquic.h"
+#include "picoquic/picoquic_internal.h"
+#include "picoquic/picosocks.h"
+#include "picoquic/util.h"
 
 void print_address(struct sockaddr* address, char* label, picoquic_connection_id_t cnx_id)
 {
@@ -149,16 +149,24 @@ static void picoquic_set_key_log_file_from_env(picoquic_quic_t* quic)
     const char* keylog_filename;
     FILE* F = NULL;
 
+#ifdef _WINDOWS
+    size_t len;
+    errno_t err = _dupenv_s(&keylog_filename, &len, "SSLKEYLOGFILE");
+
+    if (err == 0) {
+        err = fopen_s(&F, keylog_filename, "a");
+
+        free(keylog_filename);
+
+        if (err != 0 || F == NULL) {
+            return;
+        }
+    }
+#else
     keylog_filename = getenv("SSLKEYLOGFILE");
     if (keylog_filename == NULL) {
         return;
     }
-#ifdef _WINDOWS
-    errno_t err = fopen_s(&F, keylog_filename, "a");
-    if (err != 0 || F == NULL) {
-        return;
-    }
-#else
     F = fopen(keylog_filename, "a");
     if (F == NULL) {
         return;
diff --git a/picoquicfirst/picoquicfirst.vcxproj b/picoquicfirst/picoquicfirst.vcxproj
index 50d63d0604b4ed4d203a4a1336f517c52ba5b629..66697c498079df0cd3db7e8d209c018b18f81e3b 100644
--- a/picoquicfirst/picoquicfirst.vcxproj
+++ b/picoquicfirst/picoquicfirst.vcxproj
@@ -89,6 +89,7 @@
       <WarningLevel>Level3</WarningLevel>
       <Optimization>Disabled</Optimization>
       <PreprocessorDefinitions>WIN32;_DEBUG;_CONSOLE;_WINDOWS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <AdditionalIncludeDirectories>$(SolutionDir)</AdditionalIncludeDirectories>
     </ClCompile>
     <Link>
       <SubSystem>Console</SubSystem>
@@ -102,6 +103,7 @@
       <WarningLevel>Level3</WarningLevel>
       <Optimization>Disabled</Optimization>
       <PreprocessorDefinitions>_DEBUG;_CONSOLE;_WINDOWS;_WINDOWS64;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <AdditionalIncludeDirectories>$(SolutionDir)</AdditionalIncludeDirectories>
     </ClCompile>
     <Link>
       <SubSystem>Console</SubSystem>
@@ -117,6 +119,7 @@
       <FunctionLevelLinking>true</FunctionLevelLinking>
       <IntrinsicFunctions>true</IntrinsicFunctions>
       <PreprocessorDefinitions>WIN32;NDEBUG;_CONSOLE;_WINDOWS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <AdditionalIncludeDirectories>$(SolutionDir)</AdditionalIncludeDirectories>
     </ClCompile>
     <Link>
       <SubSystem>Console</SubSystem>
@@ -134,6 +137,7 @@
       <FunctionLevelLinking>true</FunctionLevelLinking>
       <IntrinsicFunctions>true</IntrinsicFunctions>
       <PreprocessorDefinitions>NDEBUG;_CONSOLE;_WINDOWS;_WINDOWS64;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <AdditionalIncludeDirectories>$(SolutionDir)</AdditionalIncludeDirectories>
     </ClCompile>
     <Link>
       <SubSystem>Console</SubSystem>
diff --git a/picoquictest/ack_of_ack_test.c b/picoquictest/ack_of_ack_test.c
index e7dc5a9d2f3f9b91cd9d51f7faba7b655f1fe04d..05b82d4857d04f83dc762627df71384958d085e1 100644
--- a/picoquictest/ack_of_ack_test.c
+++ b/picoquictest/ack_of_ack_test.c
@@ -19,7 +19,7 @@
 * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 */
 
-#include "../picoquic/picoquic_internal.h"
+#include "picoquic/picoquic_internal.h"
 #include <stdlib.h>
 
 /*
diff --git a/picoquictest/cleartext_aead_test.c b/picoquictest/cleartext_aead_test.c
index 2e073e6148e6b230a269a4c2cb131a58c1ff74e3..98ff7d4e5850d33c49fff8565a72f340bc888367 100644
--- a/picoquictest/cleartext_aead_test.c
+++ b/picoquictest/cleartext_aead_test.c
@@ -20,11 +20,11 @@
 */
 
 #ifdef _WINDOWS
-#include "../picoquic/wincompat.h"
+#include "picoquic/wincompat.h"
 #endif
-#include "../picoquic/picoquic_internal.h"
-#include "../picoquic/tls_api.h"
-#include "../picoquic/util.h"
+#include "picoquic/picoquic_internal.h"
+#include "picoquic/tls_api.h"
+#include "picoquic/util.h"
 #include "picotls.h"
 #include "picotls/openssl.h"
 #include "picotls/minicrypto.h"
diff --git a/picoquictest/cnx_creation_test.c b/picoquictest/cnx_creation_test.c
index 16c269227f5956bb78e3f2db1a9c962234ec0ba8..60e2d9c93a4dfdafac9d1c2f4754a7db90be97a2 100644
--- a/picoquictest/cnx_creation_test.c
+++ b/picoquictest/cnx_creation_test.c
@@ -19,7 +19,7 @@
 * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 */
 
-#include "../picoquic/picoquic_internal.h"
+#include "picoquic/picoquic_internal.h"
 #include <stdlib.h>
 #ifdef _WINDOWS
 #include <malloc.h>
diff --git a/picoquictest/float16test.c b/picoquictest/float16test.c
index cd07d68fdfecf1c1e31c181b44b0a93da7ea9a32..575bc57f6096cd092d7909e969d0dddc79702819 100644
--- a/picoquictest/float16test.c
+++ b/picoquictest/float16test.c
@@ -19,7 +19,7 @@
 * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 */
 
-#include "../picoquic/picoquic_internal.h"
+#include "picoquic/picoquic_internal.h"
 
 /*
 * Float16 format required for encoding the time deltas in current QUIC draft.
diff --git a/picoquictest/fnv1atest.c b/picoquictest/fnv1atest.c
index 500da99d1461bbc5e904ca37e1dade80771cc532..174888f949f0fe89c7729dd77c4c2e35af663b26 100644
--- a/picoquictest/fnv1atest.c
+++ b/picoquictest/fnv1atest.c
@@ -19,7 +19,7 @@
 * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 */
 
-#include "../picoquic/fnv1a.h"
+#include "picoquic/fnv1a.h"
 #include <stdint.h>
 #include <stdlib.h>
 
diff --git a/picoquictest/hashtest.c b/picoquictest/hashtest.c
index 15b1f500897f988f95a5afb0808cb75923a32c4e..6e57715c79a37a9f05eea188cc828996354b2413 100644
--- a/picoquictest/hashtest.c
+++ b/picoquictest/hashtest.c
@@ -23,7 +23,7 @@
 #ifdef _WINDOWS
 #include <malloc.h>
 #endif
-#include "../picoquic/picohash.h"
+#include "picoquic/picohash.h"
 
 struct hashtestkey {
     uint64_t x;
diff --git a/picoquictest/intformattest.c b/picoquictest/intformattest.c
index 67824b619a38a73bad1f8780f07900a04566d894..f40e828951241a8ad7f50ccd8a93261633b90232 100644
--- a/picoquictest/intformattest.c
+++ b/picoquictest/intformattest.c
@@ -19,7 +19,7 @@
 * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 */
 
-#include "../picoquic/picoquic_internal.h"
+#include "picoquic/picoquic_internal.h"
 #include <string.h>
 
 static const uint64_t test_number[] = {
diff --git a/picoquictest/parseheadertest.c b/picoquictest/parseheadertest.c
index 3eb94c114172649c586a7e589b270383bfa06daf..aec6addd04ef9da25b267370e6b61176d3742802 100644
--- a/picoquictest/parseheadertest.c
+++ b/picoquictest/parseheadertest.c
@@ -21,8 +21,8 @@
 
 #include <stdlib.h>
 #include <string.h>
-#include "../picoquic/tls_api.h"
-#include "../picoquic/picoquic_internal.h"
+#include "picoquic/tls_api.h"
+#include "picoquic/picoquic_internal.h"
 #include "picoquictest_internal.h"
 
 /* test vectors and corresponding structure */
diff --git a/picoquictest/picoquictest.vcxproj b/picoquictest/picoquictest.vcxproj
index d0778752613977928fbf361a761fc29376de5fa0..b72dcb9df2b5b2a69914e86763dec3524d5f4212 100644
--- a/picoquictest/picoquictest.vcxproj
+++ b/picoquictest/picoquictest.vcxproj
@@ -78,7 +78,7 @@
       <WarningLevel>Level3</WarningLevel>
       <Optimization>Disabled</Optimization>
       <PreprocessorDefinitions>WIN32;_DEBUG;_LIB;_WINDOWS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories>$(OPENSSLDIR)\include;..\..\picotls\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>$(SolutionDir);$(OPENSSLDIR)\include;..\..\picotls\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
     </ClCompile>
     <Link>
       <SubSystem>Windows</SubSystem>
@@ -91,7 +91,7 @@
       <WarningLevel>Level3</WarningLevel>
       <Optimization>Disabled</Optimization>
       <PreprocessorDefinitions>_DEBUG;_LIB;_WINDOWS;_WINDOWS64;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories>$(OPENSSL64DIR)\include;..\..\picotls\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>$(SolutionDir);$(OPENSSL64DIR)\include;..\..\picotls\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
     </ClCompile>
     <Link>
       <SubSystem>Windows</SubSystem>
@@ -106,7 +106,7 @@
       <FunctionLevelLinking>true</FunctionLevelLinking>
       <IntrinsicFunctions>true</IntrinsicFunctions>
       <PreprocessorDefinitions>WIN32;NDEBUG;_LIB;_WINDOWS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories>$(OPENSSLDIR)\include;..\..\picotls\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>$(SolutionDir);$(OPENSSLDIR)\include;..\..\picotls\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
     </ClCompile>
     <Link>
       <SubSystem>Windows</SubSystem>
@@ -123,7 +123,7 @@
       <FunctionLevelLinking>true</FunctionLevelLinking>
       <IntrinsicFunctions>true</IntrinsicFunctions>
       <PreprocessorDefinitions>NDEBUG;_LIB;_WINDOWS;_WINDOWS64;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories>$(OPENSSL64DIR)\include;..\..\picotls\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>$(SolutionDir);$(OPENSSL64DIR)\include;..\..\picotls\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
     </ClCompile>
     <Link>
       <SubSystem>Windows</SubSystem>
diff --git a/picoquictest/picoquictest_internal.h b/picoquictest/picoquictest_internal.h
index d5430f483e8552df5cc88b1ab7a36c16d9102da9..a6e03fedd7290a442f87053bdb64c14b8e8dc98c 100644
--- a/picoquictest/picoquictest_internal.h
+++ b/picoquictest/picoquictest_internal.h
@@ -22,7 +22,7 @@
 #ifndef PICOQUICTEST_INTERNAL_H
 #define PICOQUICTEST_INTERNAL_H
 
-#include "../picoquic/picoquic_internal.h"
+#include "picoquic/picoquic_internal.h"
 
 #ifdef __cplusplus
 extern "C" {
diff --git a/picoquictest/pn2pn64test.c b/picoquictest/pn2pn64test.c
index 131381fe1f1c0812d5aff507ddcd5be7cc7c1a2f..c76e811bcd7485eca02780dae5970f73ac201f28 100644
--- a/picoquictest/pn2pn64test.c
+++ b/picoquictest/pn2pn64test.c
@@ -19,7 +19,7 @@
 * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 */
 
-#include "../picoquic/picoquic_internal.h"
+#include "picoquic/picoquic_internal.h"
 #include <stdlib.h>
 
 struct _pn2pn64test_entry {
diff --git a/picoquictest/sacktest.c b/picoquictest/sacktest.c
index 815776fb1acdbfecef969ae36432f2527c42cb7f..a91fdb7417a41de9902b468a720911743009d83d 100644
--- a/picoquictest/sacktest.c
+++ b/picoquictest/sacktest.c
@@ -19,7 +19,7 @@
 * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 */
 
-#include "../picoquic/picoquic_internal.h"
+#include "picoquic/picoquic_internal.h"
 #include <stdlib.h>
 #include <string.h>
 
diff --git a/picoquictest/sim_link.c b/picoquictest/sim_link.c
index 0d4d3715c801fa669d69d87909c3a3acd16cc86c..259684959335d223f6831555755673aed525e3da 100644
--- a/picoquictest/sim_link.c
+++ b/picoquictest/sim_link.c
@@ -29,7 +29,7 @@
  * Get packet out of link at time T + L + Queue.
  */
 
-#include "../picoquic/picoquic_internal.h"
+#include "picoquic/picoquic_internal.h"
 #include "picoquictest_internal.h"
 #include <stdlib.h>
 
diff --git a/picoquictest/skip_frame_test.c b/picoquictest/skip_frame_test.c
index f7163294e53f08996a00c3a998bd2a6107c6f25e..0953b8df05fe4ae126af2a5ca2a6f49b1e2bec8a 100644
--- a/picoquictest/skip_frame_test.c
+++ b/picoquictest/skip_frame_test.c
@@ -19,8 +19,8 @@
 * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 */
 
-#include "../picoquic/tls_api.h"
-#include "../picoquic/picoquic_internal.h"
+#include "picoquic/tls_api.h"
+#include "picoquic/picoquic_internal.h"
 #include "picoquictest_internal.h"
 #include <stdlib.h>
 #include <string.h>
diff --git a/picoquictest/socket_test.c b/picoquictest/socket_test.c
index aac79f3998f92513c2c262aa4f8510dc81b3d528..211196708b3ca810a7382880b4e396b04eebe2ec 100644
--- a/picoquictest/socket_test.c
+++ b/picoquictest/socket_test.c
@@ -19,8 +19,8 @@
 * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 */
 
-#include "../picoquic/picosocks.h"
-#include "../picoquic/util.h"
+#include "picoquic/picosocks.h"
+#include "picoquic/util.h"
 
 static int socket_ping_pong(SOCKET_TYPE fd, struct sockaddr* server_addr, int server_address_length,
     picoquic_server_sockets_t* server_sockets)
diff --git a/picoquictest/splay_test.c b/picoquictest/splay_test.c
index 67776c51ae755567502e9a8242294c60a81d5ae2..27a53665526c26fb0ece1341766e0542a7baa58a 100644
--- a/picoquictest/splay_test.c
+++ b/picoquictest/splay_test.c
@@ -24,8 +24,8 @@
 
 #include <stdio.h>
 #include <stdlib.h>
-#include "../picoquic/util.h"
-#include "../picoquic/picosplay.h"
+#include "picoquic/util.h"
+#include "picoquic/picosplay.h"
 
 static int compare_int(void *l, void *r) {
     return *((int*)l) - *((int*)r);
diff --git a/picoquictest/stream0_frame_test.c b/picoquictest/stream0_frame_test.c
index a323f17507fda3cdae0e0725ab9b81efe925a6af..5e59414cd394bf99febf17a54f9a854ce91e58fb 100644
--- a/picoquictest/stream0_frame_test.c
+++ b/picoquictest/stream0_frame_test.c
@@ -19,7 +19,7 @@
 * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 */
 
-#include "../picoquic/picoquic_internal.h"
+#include "picoquic/picoquic_internal.h"
 
 /*
  * Testing Arrival of Frame for Stream Zero
diff --git a/picoquictest/stresstest.c b/picoquictest/stresstest.c
index 33316ecf3ac8baa98eb6d2b7a401dd632f125285..2c0e28cd6c871b4b2e90816a01e2da0c65f04233 100644
--- a/picoquictest/stresstest.c
+++ b/picoquictest/stresstest.c
@@ -19,8 +19,8 @@
 * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 */
 
-#include "../picoquic/picoquic_internal.h"
-#include "../picoquic/tls_api.h"
+#include "picoquic/picoquic_internal.h"
+#include "picoquic/tls_api.h"
 #include "picoquictest_internal.h"
 #ifdef _WINDOWS
 #include "..\picoquic\wincompat.h"
diff --git a/picoquictest/ticket_store_test.c b/picoquictest/ticket_store_test.c
index f676051d1440b103018a137201640d8b2cff0960..663ddedb804285bdddb2eaae4ca064af5873f803 100644
--- a/picoquictest/ticket_store_test.c
+++ b/picoquictest/ticket_store_test.c
@@ -19,7 +19,7 @@
 * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 */
 
-#include "../picoquic/picoquic_internal.h"
+#include "picoquic/picoquic_internal.h"
 #include <stdlib.h>
 #include <string.h>
 
diff --git a/picoquictest/tls_api_test.c b/picoquictest/tls_api_test.c
index b7c3703480e1304e236d9226071a941fd5c9b4da..c5e37cf3907dc13feeedf117e8852632f01c7ea5 100644
--- a/picoquictest/tls_api_test.c
+++ b/picoquictest/tls_api_test.c
@@ -19,8 +19,8 @@
 * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 */
 
-#include "../picoquic/picoquic_internal.h"
-#include "../picoquic/tls_api.h"
+#include "picoquic/picoquic_internal.h"
+#include "picoquic/tls_api.h"
 #include "picoquictest_internal.h"
 #ifdef _WINDOWS
 #include "..\picoquic\wincompat.h"
diff --git a/picoquictest/transport_param_test.c b/picoquictest/transport_param_test.c
index 230522f39d209a4d724038bd72c09ba79fa0e684..c977fa47c4cbbca6b5c8183573793ee0ae681afc 100644
--- a/picoquictest/transport_param_test.c
+++ b/picoquictest/transport_param_test.c
@@ -22,9 +22,9 @@
 #include <stdlib.h>
 #include <string.h>
 
-#include "../picoquic/picoquic_internal.h"
-#include "../picoquic/util.h"
-#include "../picoquic/tls_api.h"
+#include "picoquic/picoquic_internal.h"
+#include "picoquic/util.h"
+#include "picoquic/tls_api.h"
 #include "picoquictest_internal.h"
 
 /* The transport parameter tests operate by comparing the decoding of test vectors