diff --git a/iocore/net/P_Net.h b/iocore/net/P_Net.h
index b3027ce155a..6ac9bdd8541 100644
--- a/iocore/net/P_Net.h
+++ b/iocore/net/P_Net.h
@@ -106,11 +106,6 @@ extern RecRawStatBlock *net_rsb;
 #include "P_CompletionUtil.h"
 #include "P_NetVCTest.h"
 
-#include "P_SSLNetVConnection.h"
-#include "P_SSLNetProcessor.h"
-#include "P_SSLNetAccept.h"
-#include "P_SSLCertLookup.h"
-
 static constexpr ts::ModuleVersion NET_SYSTEM_MODULE_INTERNAL_VERSION(NET_SYSTEM_MODULE_PUBLIC_VERSION, ts::ModuleVersion::PRIVATE);
 
 // For very verbose iocore debugging.
diff --git a/iocore/net/SSLClientUtils.cc b/iocore/net/SSLClientUtils.cc
index 012db75b624..af5f100ebde 100644
--- a/iocore/net/SSLClientUtils.cc
+++ b/iocore/net/SSLClientUtils.cc
@@ -27,6 +27,7 @@
 
 #include "P_Net.h"
 #include "P_SSLClientUtils.h"
+#include "P_SSLNetVConnection.h"
 #include "YamlSNIConfig.h"
 #include "SSLDiags.h"
 
diff --git a/iocore/net/SSLDiags.cc b/iocore/net/SSLDiags.cc
index 1742e7bb760..6a5e682c589 100644
--- a/iocore/net/SSLDiags.cc
+++ b/iocore/net/SSLDiags.cc
@@ -27,6 +27,7 @@
 
 #include "P_Net.h"
 #include "SSLStats.h"
+#include "P_SSLNetVConnection.h"
 
 // return true if we have a stat for the error
 static bool
diff --git a/iocore/net/SSLNetAccept.cc b/iocore/net/SSLNetAccept.cc
index b5f8e43acc4..58f9882163c 100644
--- a/iocore/net/SSLNetAccept.cc
+++ b/iocore/net/SSLNetAccept.cc
@@ -21,6 +21,7 @@
 
 #include "tscore/ink_config.h"
 #include "P_Net.h"
+#include "P_SSLNetAccept.h"
 
 SSLNetAccept::SSLNetAccept(const NetProcessor::AcceptOptions &opt) : NetAccept(opt) {}
 
diff --git a/iocore/net/SSLNetProcessor.cc b/iocore/net/SSLNetProcessor.cc
index 73188864c28..2919825e4ea 100644
--- a/iocore/net/SSLNetProcessor.cc
+++ b/iocore/net/SSLNetProcessor.cc
@@ -27,6 +27,9 @@
 #include "P_SSLUtils.h"
 #include "P_OCSPStapling.h"
 #include "SSLStats.h"
+#include "P_SSLNetProcessor.h"
+#include "P_SSLNetAccept.h"
+#include "P_SSLNetVConnection.h"
 #include "P_SSLClientCoordinator.h"
 
 //
diff --git a/proxy/http/Http1ClientSession.cc b/proxy/http/Http1ClientSession.cc
index 14291cba3ed..8086c958e94 100644
--- a/proxy/http/Http1ClientSession.cc
+++ b/proxy/http/Http1ClientSession.cc
@@ -38,6 +38,8 @@
 #include "Plugin.h"
 #include "PoolableSession.h"
 
+#include "P_SSLNetVConnection.h"
+
 #define HttpSsnDebug(fmt, ...) SsnDebug(this, "http_cs", fmt, __VA_ARGS__)
 
 #define STATE_ENTER(state_name, event, vio)                                                             \
diff --git a/proxy/http2/Http2ClientSession.cc b/proxy/http2/Http2ClientSession.cc
index d28d0b82d20..0ab4d9fd362 100644
--- a/proxy/http2/Http2ClientSession.cc
+++ b/proxy/http2/Http2ClientSession.cc
@@ -25,6 +25,8 @@
 #include "HttpDebugNames.h"
 #include "tscore/ink_base64.h"
 
+#include "P_SSLNetVConnection.h"
+
 #define REMEMBER(e, r)                          \
   {                                             \
     this->remember(MakeSourceLocation(), e, r); \
diff --git a/proxy/private/SSLProxySession.cc b/proxy/private/SSLProxySession.cc
index e2b10857b1d..e53342390f9 100644
--- a/proxy/private/SSLProxySession.cc
+++ b/proxy/private/SSLProxySession.cc
@@ -25,6 +25,7 @@
 
 #include "SSLProxySession.h"
 #include "P_Net.h"
+#include "P_SSLNetVConnection.h"
 
 void
 SSLProxySession::init(SSLNetVConnection const &new_vc)
diff --git a/src/traffic_quic/traffic_quic.cc b/src/traffic_quic/traffic_quic.cc
index 8af2146c3ef..51e673777a7 100644
--- a/src/traffic_quic/traffic_quic.cc
+++ b/src/traffic_quic/traffic_quic.cc
@@ -36,6 +36,9 @@
 #include "diags.h"
 #include "quic_client.h"
 
+#include "P_SSLUtils.h"
+#include "P_SSLConfig.h"
+
 #define THREADS 1
 
 constexpr size_t stacksize = 1048576;