From c21f5ee4102a813dd10367f3da61fd81bb04345b Mon Sep 17 00:00:00 2001
From: Christian Despres <despresc@ibm.com>
Date: Fri, 29 Nov 2024 11:30:48 -0500
Subject: [PATCH] Fix some include warnings in JITServer

These headers mention certain types but do not include the relevant
headers for them. This does not yet cause a compilation error because
all of their use sites are coincidentally only after those headers have
been included.

Signed-off-by: Christian Despres <despresc@ibm.com>
---
 runtime/compiler/env/J9KnownObjectTable.hpp           | 1 +
 runtime/compiler/net/CommunicationStream.hpp          | 3 ++-
 runtime/compiler/runtime/JITServerAOTDeserializer.hpp | 3 ++-
 3 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/runtime/compiler/env/J9KnownObjectTable.hpp b/runtime/compiler/env/J9KnownObjectTable.hpp
index ef5f42a0537..5ab5149c705 100644
--- a/runtime/compiler/env/J9KnownObjectTable.hpp
+++ b/runtime/compiler/env/J9KnownObjectTable.hpp
@@ -37,6 +37,7 @@ namespace J9 { typedef J9::KnownObjectTable KnownObjectTableConnector; }
 #include "infra/Array.hpp"
 #include "infra/BitVector.hpp"
 #if defined(J9VM_OPT_JITSERVER)
+#include <string>
 #include <tuple>
 #include <vector>
 #endif /* defined(J9VM_OPT_JITSERVER) */
diff --git a/runtime/compiler/net/CommunicationStream.hpp b/runtime/compiler/net/CommunicationStream.hpp
index a33fde23a94..7e953aa5512 100644
--- a/runtime/compiler/net/CommunicationStream.hpp
+++ b/runtime/compiler/net/CommunicationStream.hpp
@@ -24,9 +24,10 @@
 #define COMMUNICATION_STREAM_H
 
 #include <unistd.h>
+#include "infra/Statistics.hpp"
 #include "net/LoadSSLLibs.hpp"
 #include "net/Message.hpp"
-#include "infra/Statistics.hpp"
+#include "net/StreamExceptions.hpp"
 #include "env/VerboseLog.hpp"
 #include "control/MethodToBeCompiled.hpp"
 
diff --git a/runtime/compiler/runtime/JITServerAOTDeserializer.hpp b/runtime/compiler/runtime/JITServerAOTDeserializer.hpp
index cf0a0787a3d..f0a798d3d04 100644
--- a/runtime/compiler/runtime/JITServerAOTDeserializer.hpp
+++ b/runtime/compiler/runtime/JITServerAOTDeserializer.hpp
@@ -23,8 +23,9 @@
 #ifndef JITSERVER_AOT_DESERIALIZER_H
 #define JITSERVER_AOT_DESERIALIZER_H
 
-#include "env/TRMemory.hpp"
 #include "env/PersistentCollections.hpp"
+#include "env/SystemSegmentProvider.hpp"
+#include "env/TRMemory.hpp"
 #include "runtime/JITServerAOTSerializationRecords.hpp"
 
 class TR_PersistentClassLoaderTable;