diff --git a/src/ripple/conditions/impl/utils.h b/src/ripple/conditions/impl/utils.h
index 75a23725e06..e9ab1770a18 100644
--- a/src/ripple/conditions/impl/utils.h
+++ b/src/ripple/conditions/impl/utils.h
@@ -20,6 +20,8 @@
 #ifndef RIPPLE_CONDITIONS_UTILS_H
 #define RIPPLE_CONDITIONS_UTILS_H
 
+#include <ripple/basics/Buffer.h>
+#include <ripple/basics/Slice.h>
 #include <ripple/basics/strHex.h>
 #include <ripple/conditions/impl/error.h>
 #include <boost/dynamic_bitset.hpp>
diff --git a/src/ripple/consensus/LedgerTrie.h b/src/ripple/consensus/LedgerTrie.h
index 0bb902ef1cb..12cd0d3cbbc 100644
--- a/src/ripple/consensus/LedgerTrie.h
+++ b/src/ripple/consensus/LedgerTrie.h
@@ -23,6 +23,7 @@
 #include <ripple/basics/ToString.h>
 #include <ripple/json/json_value.h>
 #include <algorithm>
+#include <iomanip>
 #include <memory>
 #include <optional>
 #include <sstream>
diff --git a/src/test/csf/Histogram.h b/src/test/csf/Histogram.h
index 9d385cc1f5d..2df1844a21d 100644
--- a/src/test/csf/Histogram.h
+++ b/src/test/csf/Histogram.h
@@ -20,7 +20,9 @@
 #define RIPPLE_TEST_CSF_HISTOGRAM_H_INCLUDED
 
 #include <algorithm>
+#include <cassert>
 #include <chrono>
+#include <cmath>
 #include <map>
 
 namespace ripple {
diff --git a/src/test/csf/Tx.h b/src/test/csf/Tx.h
index d271338141a..7f3645a59e6 100644
--- a/src/test/csf/Tx.h
+++ b/src/test/csf/Tx.h
@@ -24,6 +24,7 @@
 #include <boost/iterator/function_output_iterator.hpp>
 #include <map>
 #include <ostream>
+#include <sstream>
 #include <string>
 #include <type_traits>
 
diff --git a/src/test/jtx/JTx.h b/src/test/jtx/JTx.h
index 06b68dda336..2eeb6ccf8f4 100644
--- a/src/test/jtx/JTx.h
+++ b/src/test/jtx/JTx.h
@@ -21,6 +21,7 @@
 #define RIPPLE_TEST_JTX_JTX_H_INCLUDED
 
 #include <ripple/json/json_value.h>
+#include <ripple/protocol/ErrorCodes.h>
 #include <ripple/protocol/STTx.h>
 #include <ripple/protocol/TER.h>
 #include <test/jtx/basic_prop.h>
diff --git a/src/test/rpc/GRPCTestClientBase.h b/src/test/rpc/GRPCTestClientBase.h
index a2cf8b686e8..a5c613f55e2 100644
--- a/src/test/rpc/GRPCTestClientBase.h
+++ b/src/test/rpc/GRPCTestClientBase.h
@@ -20,6 +20,7 @@
 #ifndef RIPPLED_GRPCTESTCLIENTBASE_H
 #define RIPPLED_GRPCTESTCLIENTBASE_H
 
+#include <grpcpp/grpcpp.h>
 #include <org/xrpl/rpc/v1/xrp_ledger.grpc.pb.h>
 #include <test/jtx/envconfig.h>