diff --git a/include/pistache/pist_check.h b/include/pistache/pist_check.h
index f9ef2fea..4bb40018 100644
--- a/include/pistache/pist_check.h
+++ b/include/pistache/pist_check.h
@@ -15,7 +15,7 @@
 #define INCLUDED_PSCHECK_H
 
 #include <mutex>
-
+#include <pistache/pist_quote.h>
 #include "pist_syslog.h"
 
 // If DEBUG is enabled, PS_LOGDBG_STACK_TRACE logs a stack trace
diff --git a/include/pistache/transport.h b/include/pistache/transport.h
index d316309e..8fbfb3bf 100644
--- a/include/pistache/transport.h
+++ b/include/pistache/transport.h
@@ -16,8 +16,6 @@
 
 #include PST_SYS_RESOURCE_HDR // for PST_RUSAGE + PST_GETRUSAGE
 
-#include <pistache/pist_timelog.h>
-#include <pistache/pist_quote.h>
 #include <pistache/async.h>
 #include <pistache/mailbox.h>
 #include <pistache/pist_quote.h>
diff --git a/src/common/transport.cc b/src/common/transport.cc
index b2b0b560..2376d2a6 100644
--- a/src/common/transport.cc
+++ b/src/common/transport.cc
@@ -12,6 +12,7 @@
 */
 
 #include <pistache/eventmeth.h>
+#include <pistache/pist_quote.h>
 
 #ifdef _USE_LIBEVENT_LIKE_APPLE
 
diff --git a/src/server/endpoint.cc b/src/server/endpoint.cc
index b061b51b..b21ae4c3 100644
--- a/src/server/endpoint.cc
+++ b/src/server/endpoint.cc
@@ -13,6 +13,7 @@
 #include <pistache/config.h>
 #include <pistache/endpoint.h>
 #include <pistache/peer.h>
+#include <pistache/pist_quote.h>
 #include <pistache/tcp.h>
 
 #include <array>
diff --git a/src/server/listener.cc b/src/server/listener.cc
index 2601fb1c..6bf320dc 100644
--- a/src/server/listener.cc
+++ b/src/server/listener.cc
@@ -16,6 +16,7 @@
 #include <pistache/listener.h>
 #include <pistache/os.h>
 #include <pistache/peer.h>
+#include <pistache/pist_quote.h>
 #include <pistache/ssl_wrappers.h>
 #include <pistache/transport.h>