From 9687160cf047493df958f7b0577f2808016d08ef Mon Sep 17 00:00:00 2001
From: huitema <huitema@huitema.net>
Date: Sat, 8 Dec 2018 15:52:27 -0800
Subject: [PATCH] Remove usage of relative paths (../xxx.h) in include headers.

---
 UnitTest1/UnitTest1.vcxproj          |  4 ++++
 UnitTest1/unittest1.cpp              |  2 +-
 picoquic_t/picoquic_t.c              |  8 ++++----
 picoquic_t/picoquic_t.vcxproj        |  6 ++++--
 picoquicfirst/picoquicdemo.c         | 28 ++++++++++++++++++----------
 picoquicfirst/picoquicfirst.vcxproj  |  4 ++++
 picoquictest/ack_of_ack_test.c       |  2 +-
 picoquictest/cleartext_aead_test.c   |  8 ++++----
 picoquictest/cnx_creation_test.c     |  2 +-
 picoquictest/float16test.c           |  2 +-
 picoquictest/fnv1atest.c             |  2 +-
 picoquictest/hashtest.c              |  2 +-
 picoquictest/intformattest.c         |  2 +-
 picoquictest/parseheadertest.c       |  4 ++--
 picoquictest/picoquictest.vcxproj    |  8 ++++----
 picoquictest/picoquictest_internal.h |  2 +-
 picoquictest/pn2pn64test.c           |  2 +-
 picoquictest/sacktest.c              |  2 +-
 picoquictest/sim_link.c              |  2 +-
 picoquictest/skip_frame_test.c       |  4 ++--
 picoquictest/socket_test.c           |  4 ++--
 picoquictest/splay_test.c            |  4 ++--
 picoquictest/stream0_frame_test.c    |  2 +-
 picoquictest/stresstest.c            |  4 ++--
 picoquictest/ticket_store_test.c     |  2 +-
 picoquictest/tls_api_test.c          |  4 ++--
 picoquictest/transport_param_test.c  |  6 +++---
 27 files changed, 70 insertions(+), 52 deletions(-)

diff --git a/UnitTest1/UnitTest1.vcxproj b/UnitTest1/UnitTest1.vcxproj
index d6dfd9b0..3d36864c 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 bd631c5f..6320f985 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 dcd3b34e..4bb1e46b 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 1201cfae..a88f6f8b 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 4ba06e4b..825bc38e 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 50d63d06..66697c49 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 e7dc5a9d..05b82d48 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 2e073e61..98ff7d4e 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 16c26922..60e2d9c9 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 cd07d68f..575bc57f 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 500da99d..174888f9 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 15b1f500..6e57715c 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 67824b61..f40e8289 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 3eb94c11..aec6addd 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 d0778752..b72dcb9d 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 d5430f48..a6e03fed 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 131381fe..c76e811b 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 815776fb..a91fdb74 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 0d4d3715..25968495 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 f7163294..0953b8df 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 aac79f39..21119670 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 67776c51..27a53665 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 a323f175..5e59414c 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 33316ecf..2c0e28cd 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 f676051d..663ddedb 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 b7c37034..c5e37cf3 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 230522f3..c977fa47 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
-- 
GitLab