diff --git a/.clang-tidy b/.clang-tidy
index 07091d0e..af68e4f0 100644
--- a/.clang-tidy
+++ b/.clang-tidy
@@ -50,6 +50,7 @@ Checks: >
   bugprone-*,
   google-*,
   modernize-*,
+  misc-include-cleaner,
   performance-*,
   portability-*,
   readability-*,
@@ -108,3 +109,5 @@ CheckOptions:
   - { key: readability-implicit-bool-conversion.AllowIntegerConditions,            value: 1         }
   - { key: readability-implicit-bool-conversion.AllowPointerConditions,            value: 1         }
   - { key: readability-function-cognitive-complexity.IgnoreMacros,                 value: 1         }
+  - { key: misc-include-cleaner.IgnoreHeaders
+      value: bits/getopt_.*;getopt.h }
diff --git a/export/planloader/planloader.cpp b/export/planloader/planloader.cpp
index 5fa263cc..99593293 100644
--- a/export/planloader/planloader.cpp
+++ b/export/planloader/planloader.cpp
@@ -2,7 +2,12 @@
 
 #include "planloader.h"
 
+#include <substrait/proto/plan.pb.h>
+
+#include <cstdint>
+#include <cstring>
 #include <limits>
+#include <string>
 
 #include "substrait/common/Io.h"
 
diff --git a/export/planloader/tests/PlanLoaderTest.cpp b/export/planloader/tests/PlanLoaderTest.cpp
index 008beaca..fe52708c 100644
--- a/export/planloader/tests/PlanLoaderTest.cpp
+++ b/export/planloader/tests/PlanLoaderTest.cpp
@@ -6,7 +6,7 @@
 #include <gtest/gtest.h>
 #include <substrait/proto/plan.pb.h>
 
-#include <functional>
+#include "substrait/common/Io.h"
 
 namespace io::substrait::textplan {
 namespace {
diff --git a/src/substrait/common/Exceptions.cpp b/src/substrait/common/Exceptions.cpp
index fa372cc5..fa676239 100644
--- a/src/substrait/common/Exceptions.cpp
+++ b/src/substrait/common/Exceptions.cpp
@@ -2,7 +2,10 @@
 
 #include "substrait/common/Exceptions.h"
 
-#include <fmt/format.h>
+#include <fmt/core.h>
+
+#include <cstddef>
+#include <string>
 
 namespace io::substrait::common {
 
diff --git a/src/substrait/common/Io.cpp b/src/substrait/common/Io.cpp
index 86ddacc0..0a3dd76c 100644
--- a/src/substrait/common/Io.cpp
+++ b/src/substrait/common/Io.cpp
@@ -2,6 +2,8 @@
 
 #include "substrait/common/Io.h"
 
+#include <absl/status/status.h>
+#include <absl/status/statusor.h>
 #include <substrait/proto/plan.pb.h>
 
 #include <regex>
diff --git a/src/substrait/common/PlanTransformerTool.cpp b/src/substrait/common/PlanTransformerTool.cpp
index 550c2136..aa1601a2 100644
--- a/src/substrait/common/PlanTransformerTool.cpp
+++ b/src/substrait/common/PlanTransformerTool.cpp
@@ -1,6 +1,12 @@
 /* SPDX-License-Identifier: Apache-2.0 */
 
+#include <algorithm>
+#include <cctype>
+#include <cstdio>
+#include <cstdlib>
 #include <iostream>
+#include <string>
+#include <string_view>
 
 #include "substrait/common/Io.h"
 
diff --git a/src/substrait/common/tests/IoTest.cpp b/src/substrait/common/tests/IoTest.cpp
index c4b7959e..722c6984 100644
--- a/src/substrait/common/tests/IoTest.cpp
+++ b/src/substrait/common/tests/IoTest.cpp
@@ -5,12 +5,11 @@
 #include <gmock/gmock-matchers.h>
 #include <gtest/gtest.h>
 #include <protobuf-matchers/protocol-buffer-matchers.h>
+#include <substrait/proto/plan.pb.h>
 
 #include <filesystem>
-
-#ifndef _WIN32
-#include <unistd.h>
-#endif
+#include <string>
+#include <system_error>
 
 using ::protobuf_matchers::EqualsProto;
 using ::protobuf_matchers::Partially;
diff --git a/src/substrait/expression/DecimalLiteral.cpp b/src/substrait/expression/DecimalLiteral.cpp
index 36eaa613..a0186ee2 100644
--- a/src/substrait/expression/DecimalLiteral.cpp
+++ b/src/substrait/expression/DecimalLiteral.cpp
@@ -6,7 +6,11 @@
 #include <absl/strings/numbers.h>
 #include <substrait/proto/algebra.pb.h>
 
+#include <cstddef>
+#include <cstdint>
+#include <cstring>
 #include <sstream>
+#include <string>
 
 namespace io::substrait::expression {
 
diff --git a/src/substrait/expression/tests/DecimalTest.cpp b/src/substrait/expression/tests/DecimalTest.cpp
index 07a4be5f..74a5b9e5 100644
--- a/src/substrait/expression/tests/DecimalTest.cpp
+++ b/src/substrait/expression/tests/DecimalTest.cpp
@@ -4,6 +4,11 @@
 #include <gtest/gtest.h>
 #include <substrait/proto/algebra.pb.h>
 
+#include <algorithm>
+#include <cstdint>
+#include <string>
+#include <vector>
+
 #include "substrait/expression/DecimalLiteral.h"
 
 namespace io::substrait::expression {
diff --git a/src/substrait/function/Extension.cpp b/src/substrait/function/Extension.cpp
index 88916483..a5a82c06 100644
--- a/src/substrait/function/Extension.cpp
+++ b/src/substrait/function/Extension.cpp
@@ -4,6 +4,16 @@
 
 #include <yaml-cpp/yaml.h>
 
+#include <memory>
+#include <optional>
+#include <sstream>
+#include <string>
+#include <utility>
+#include <vector>
+
+#include "substrait/function/Function.h"
+#include "substrait/type/Type.h"
+
 bool decodeFunctionImpl(
     const YAML::Node& node,
     io::substrait::FunctionImplementation& function) {
diff --git a/src/substrait/function/Function.cpp b/src/substrait/function/Function.cpp
index a4198bda..f5a866d1 100644
--- a/src/substrait/function/Function.cpp
+++ b/src/substrait/function/Function.cpp
@@ -2,7 +2,12 @@
 
 #include "substrait/function/Function.h"
 
+#include <memory>
 #include <sstream>
+#include <string>
+#include <vector>
+
+#include "substrait/function/FunctionSignature.h"
 
 namespace io::substrait {
 
diff --git a/src/substrait/function/FunctionLookup.cpp b/src/substrait/function/FunctionLookup.cpp
index 8d750194..61913971 100644
--- a/src/substrait/function/FunctionLookup.cpp
+++ b/src/substrait/function/FunctionLookup.cpp
@@ -2,6 +2,9 @@
 
 #include "substrait/function/FunctionLookup.h"
 
+#include "substrait/function/Function.h"
+#include "substrait/function/FunctionSignature.h"
+
 namespace io::substrait {
 
 FunctionImplementationPtr FunctionLookup::lookupFunction(
diff --git a/src/substrait/function/tests/FunctionLookupTest.cpp b/src/substrait/function/tests/FunctionLookupTest.cpp
index c80682bd..6db7cd7a 100644
--- a/src/substrait/function/tests/FunctionLookupTest.cpp
+++ b/src/substrait/function/tests/FunctionLookupTest.cpp
@@ -5,7 +5,12 @@
 #include <gtest/gtest.h>
 
 #include <filesystem>
-#include <iostream>
+#include <memory>
+#include <string>
+
+#include "substrait/function/Extension.h"
+#include "substrait/function/FunctionSignature.h"
+#include "substrait/type/Type.h"
 
 using namespace io::substrait;
 
diff --git a/src/substrait/textplan/Location.cpp b/src/substrait/textplan/Location.cpp
index 6b52228d..90897d4d 100644
--- a/src/substrait/textplan/Location.cpp
+++ b/src/substrait/textplan/Location.cpp
@@ -2,7 +2,9 @@
 
 #include "substrait/textplan/Location.h"
 
+#include <cstddef>
 #include <functional>
+#include <variant>
 
 namespace io::substrait::textplan {
 
diff --git a/src/substrait/textplan/ParseResult.cpp b/src/substrait/textplan/ParseResult.cpp
index fee6c1e8..e0808c33 100644
--- a/src/substrait/textplan/ParseResult.cpp
+++ b/src/substrait/textplan/ParseResult.cpp
@@ -2,7 +2,8 @@
 
 #include "substrait/textplan/ParseResult.h"
 
-#include <sstream>
+#include <ostream>
+#include <string>
 
 namespace io::substrait::textplan {
 
diff --git a/src/substrait/textplan/PlanPrinterVisitor.cpp b/src/substrait/textplan/PlanPrinterVisitor.cpp
index 2c8d88c9..36af2c38 100644
--- a/src/substrait/textplan/PlanPrinterVisitor.cpp
+++ b/src/substrait/textplan/PlanPrinterVisitor.cpp
@@ -2,10 +2,18 @@
 
 #include "substrait/textplan/PlanPrinterVisitor.h"
 
+#include <substrait/proto/type.pb.h>
+
+#include <any>
+#include <cstdint>
+#include <memory>
+#include <string_view>
+
+#include "substrait/textplan/Location.h"
+#include "substrait/textplan/converter/BasePlanProtoVisitor.h"
+
 #ifdef _WIN32
 #include <io.h>
-#else
-#include <unistd.h>
 #endif
 
 #include <date/date.h>
diff --git a/src/substrait/textplan/StringManipulation.cpp b/src/substrait/textplan/StringManipulation.cpp
index cb11e53a..eb37d2b4 100644
--- a/src/substrait/textplan/StringManipulation.cpp
+++ b/src/substrait/textplan/StringManipulation.cpp
@@ -2,10 +2,7 @@
 
 #include "StringManipulation.h"
 
-#include <numeric>
-#include <string>
 #include <string_view>
-#include <vector>
 
 namespace io::substrait::textplan {
 
diff --git a/src/substrait/textplan/SubstraitErrorListener.cpp b/src/substrait/textplan/SubstraitErrorListener.cpp
index e0e9b468..9b8bc56e 100644
--- a/src/substrait/textplan/SubstraitErrorListener.cpp
+++ b/src/substrait/textplan/SubstraitErrorListener.cpp
@@ -2,6 +2,7 @@
 
 #include "SubstraitErrorListener.h"
 
+#include <cstddef>
 #include <string>
 #include <vector>
 
diff --git a/src/substrait/textplan/SymbolTable.cpp b/src/substrait/textplan/SymbolTable.cpp
index f0d8a8d1..490ab80f 100644
--- a/src/substrait/textplan/SymbolTable.cpp
+++ b/src/substrait/textplan/SymbolTable.cpp
@@ -3,10 +3,18 @@
 
 #include <algorithm>
 #include <any>
+#include <cstddef>
+#include <cstdint>
 #include <iomanip>
+#include <ios>
 #include <map>
+#include <memory>
+#include <optional>
 #include <sstream>
 #include <string>
+#include <unordered_set>
+#include <utility>
+#include <vector>
 
 #include "substrait/common/Exceptions.h"
 #include "substrait/textplan/Any.h"
diff --git a/src/substrait/textplan/SymbolTablePrinter.cpp b/src/substrait/textplan/SymbolTablePrinter.cpp
index 4e740f8a..90043697 100644
--- a/src/substrait/textplan/SymbolTablePrinter.cpp
+++ b/src/substrait/textplan/SymbolTablePrinter.cpp
@@ -3,14 +3,24 @@
 #include "substrait/textplan/SymbolTablePrinter.h"
 
 #include <substrait/proto/algebra.pb.h>
+#include <substrait/proto/type.pb.h>
 
+#include <algorithm>
+#include <cstdint>
+#include <map>
+#include <memory>
 #include <set>
 #include <sstream>
+#include <string>
+#include <utility>
+#include <vector>
 
 #include "substrait/common/Exceptions.h"
 #include "substrait/textplan/Any.h"
+#include "substrait/textplan/Location.h"
 #include "substrait/textplan/PlanPrinterVisitor.h"
 #include "substrait/textplan/StructuredSymbolData.h"
+#include "substrait/textplan/SubstraitErrorListener.h"
 #include "substrait/textplan/SymbolTable.h"
 
 namespace io::substrait::textplan {
diff --git a/src/substrait/textplan/converter/BasePlanProtoVisitor.cpp b/src/substrait/textplan/converter/BasePlanProtoVisitor.cpp
index 87a49eda..6ef5be82 100644
--- a/src/substrait/textplan/converter/BasePlanProtoVisitor.cpp
+++ b/src/substrait/textplan/converter/BasePlanProtoVisitor.cpp
@@ -3,9 +3,11 @@
 #include "substrait/textplan/converter/BasePlanProtoVisitor.h"
 
 #include <substrait/proto/algebra.pb.h>
+#include <substrait/proto/extensions/extensions.pb.h>
 #include <substrait/proto/plan.pb.h>
+#include <substrait/proto/type.pb.h>
 
-#include <iterator>
+#include <any>
 #include <optional>
 #include <string>
 
diff --git a/src/substrait/textplan/converter/InitialPlanProtoVisitor.cpp b/src/substrait/textplan/converter/InitialPlanProtoVisitor.cpp
index 94162f97..8e17cac4 100644
--- a/src/substrait/textplan/converter/InitialPlanProtoVisitor.cpp
+++ b/src/substrait/textplan/converter/InitialPlanProtoVisitor.cpp
@@ -3,10 +3,17 @@
 #include "substrait/textplan/converter/InitialPlanProtoVisitor.h"
 
 #include <substrait/proto/algebra.pb.h>
+#include <substrait/proto/extensions/extensions.pb.h>
 #include <substrait/proto/plan.pb.h>
+#include <substrait/proto/type.pb.h>
 
+#include <any>
+#include <cstdint>
+#include <memory>
 #include <optional>
 #include <string>
+#include <utility>
+#include <vector>
 
 #include "substrait/common/Exceptions.h"
 #include "substrait/proto/ProtoUtils.h"
@@ -15,6 +22,7 @@
 #include "substrait/textplan/Location.h"
 #include "substrait/textplan/StructuredSymbolData.h"
 #include "substrait/textplan/SymbolTable.h"
+#include "substrait/textplan/converter/BasePlanProtoVisitor.h"
 
 namespace io::substrait::textplan {
 
diff --git a/src/substrait/textplan/converter/LoadBinary.cpp b/src/substrait/textplan/converter/LoadBinary.cpp
index 43011664..7e7a573d 100644
--- a/src/substrait/textplan/converter/LoadBinary.cpp
+++ b/src/substrait/textplan/converter/LoadBinary.cpp
@@ -2,21 +2,25 @@
 
 #include "substrait/textplan/converter/LoadBinary.h"
 
+#include <absl/status/status.h>
+#include <absl/status/statusor.h>
 #include <absl/strings/str_join.h>
-#include <fmt/format.h>
+#include <absl/strings/string_view.h>
 #include <google/protobuf/io/tokenizer.h>
 #include <google/protobuf/text_format.h>
 #include <google/protobuf/util/json_util.h>
 #include <substrait/proto/plan.pb.h>
 
+#include <cerrno>
 #include <filesystem>
 #include <fstream>
+#include <ios>
 #include <sstream>
 #include <string>
 #include <string_view>
 #include <vector>
 
-#include "substrait/textplan/StringManipulation.h"
+#include "fmt/core.h"
 
 namespace io::substrait::textplan {
 
diff --git a/src/substrait/textplan/converter/ParseBinary.cpp b/src/substrait/textplan/converter/ParseBinary.cpp
index e76c9448..a3e4a0b4 100644
--- a/src/substrait/textplan/converter/ParseBinary.cpp
+++ b/src/substrait/textplan/converter/ParseBinary.cpp
@@ -4,6 +4,10 @@
 
 #include <substrait/proto/plan.pb.h>
 
+#include <string>
+#include <vector>
+
+#include "substrait/textplan/ParseResult.h"
 #include "substrait/textplan/PlanPrinterVisitor.h"
 #include "substrait/textplan/converter/InitialPlanProtoVisitor.h"
 #include "substrait/textplan/converter/PipelineVisitor.h"
diff --git a/src/substrait/textplan/converter/PipelineVisitor.cpp b/src/substrait/textplan/converter/PipelineVisitor.cpp
index 979f79a2..dc12168c 100644
--- a/src/substrait/textplan/converter/PipelineVisitor.cpp
+++ b/src/substrait/textplan/converter/PipelineVisitor.cpp
@@ -2,10 +2,18 @@
 
 #include "substrait/textplan/converter/PipelineVisitor.h"
 
+#include <substrait/proto/algebra.pb.h>
+#include <substrait/proto/plan.pb.h>
+
+#include <any>
+#include <memory>
+
 #include "substrait/textplan/Any.h"
 #include "substrait/textplan/Finally.h"
+#include "substrait/textplan/Location.h"
 #include "substrait/textplan/StructuredSymbolData.h"
 #include "substrait/textplan/SymbolTable.h"
+#include "substrait/textplan/converter/BasePlanProtoVisitor.h"
 
 namespace io::substrait::textplan {
 
diff --git a/src/substrait/textplan/converter/ReferenceNormalizer.cpp b/src/substrait/textplan/converter/ReferenceNormalizer.cpp
index cd5060c4..994fac12 100644
--- a/src/substrait/textplan/converter/ReferenceNormalizer.cpp
+++ b/src/substrait/textplan/converter/ReferenceNormalizer.cpp
@@ -3,9 +3,13 @@
 #include "substrait/textplan/converter/ReferenceNormalizer.h"
 
 #include <substrait/proto/algebra.pb.h>
+#include <substrait/proto/extensions/extensions.pb.h>
 #include <substrait/proto/plan.pb.h>
 
-#include <string>
+#include <algorithm>
+#include <cstdint>
+#include <map>
+#include <string_view>
 
 namespace io::substrait::textplan {
 
diff --git a/src/substrait/textplan/converter/SaveBinary.cpp b/src/substrait/textplan/converter/SaveBinary.cpp
index 7a7f8d81..9f8f3e3f 100644
--- a/src/substrait/textplan/converter/SaveBinary.cpp
+++ b/src/substrait/textplan/converter/SaveBinary.cpp
@@ -2,16 +2,24 @@
 
 #include "substrait/textplan/converter/SaveBinary.h"
 
+#include <absl/status/status.h>
 #include <absl/strings/str_join.h>
-#include <fmt/format.h>
+#include <fcntl.h>
 #include <google/protobuf/io/zero_copy_stream_impl.h>
 #include <google/protobuf/text_format.h>
 #include <google/protobuf/util/json_util.h>
 
+#include <cerrno>
+#include <ios>
+#include <string>
+#include <string_view>
+
+#include "fmt/core.h"
+#include "substrait/textplan/SubstraitErrorListener.h"
+
 #ifdef _WIN32
 #include <io.h>
 #else
-#include <sys/fcntl.h>
 #include <sys/stat.h>
 #endif
 
@@ -19,7 +27,6 @@
 
 #include <fstream>
 
-#include "substrait/textplan/StringManipulation.h"
 #include "substrait/textplan/SymbolTablePrinter.h"
 #include "substrait/textplan/converter/ParseBinary.h"
 
diff --git a/src/substrait/textplan/converter/Tool.cpp b/src/substrait/textplan/converter/Tool.cpp
index 63ad4a51..53f9edce 100644
--- a/src/substrait/textplan/converter/Tool.cpp
+++ b/src/substrait/textplan/converter/Tool.cpp
@@ -1,14 +1,17 @@
 /* SPDX-License-Identifier: Apache-2.0 */
 
+#include <cstddef>
+#include <cstdio>
+#include <cstdlib>
+#include <iostream>
+
+#include "substrait/textplan/SubstraitErrorListener.h"
 #ifndef _WIN32
 #include <glob.h>
 #endif
 
-#include <sstream>
-
 #include "substrait/common/Io.h"
 #include "substrait/textplan/SymbolTablePrinter.h"
-#include "substrait/textplan/converter/LoadBinary.h"
 #include "substrait/textplan/converter/ParseBinary.h"
 
 namespace io::substrait::textplan {
diff --git a/src/substrait/textplan/converter/tests/BinaryToTextPlanConversionTest.cpp b/src/substrait/textplan/converter/tests/BinaryToTextPlanConversionTest.cpp
index 4443c858..afd7bfd7 100644
--- a/src/substrait/textplan/converter/tests/BinaryToTextPlanConversionTest.cpp
+++ b/src/substrait/textplan/converter/tests/BinaryToTextPlanConversionTest.cpp
@@ -4,6 +4,12 @@
 #include <gtest/gtest.h>
 #include <protobuf-matchers/protocol-buffer-matchers.h>
 
+#include <algorithm>
+#include <string>
+#include <vector>
+
+#include "substrait/textplan/ParseResult.h"
+#include "substrait/textplan/SymbolTable.h"
 #include "substrait/textplan/converter/LoadBinary.h"
 #include "substrait/textplan/converter/ParseBinary.h"
 #include "substrait/textplan/tests/ParseResultMatchers.h"
diff --git a/src/substrait/textplan/parser/LoadText.cpp b/src/substrait/textplan/parser/LoadText.cpp
index 039dde59..d5be921f 100644
--- a/src/substrait/textplan/parser/LoadText.cpp
+++ b/src/substrait/textplan/parser/LoadText.cpp
@@ -2,10 +2,13 @@
 
 #include "substrait/textplan/parser/LoadText.h"
 
+#include <absl/status/status.h>
+#include <absl/status/statusor.h>
 #include <absl/strings/str_join.h>
 #include <substrait/proto/plan.pb.h>
 
-#include "substrait/textplan/StringManipulation.h"
+#include <string>
+
 #include "substrait/textplan/SymbolTablePrinter.h"
 #include "substrait/textplan/parser/ParseText.h"
 
diff --git a/src/substrait/textplan/parser/ParseText.cpp b/src/substrait/textplan/parser/ParseText.cpp
index 7eacc9a9..b6b5aac4 100644
--- a/src/substrait/textplan/parser/ParseText.cpp
+++ b/src/substrait/textplan/parser/ParseText.cpp
@@ -2,16 +2,21 @@
 
 #include "substrait/textplan/parser/ParseText.h"
 
-#include <ANTLRErrorStrategy.h>
-#include <antlr4-runtime.h>
+#include <CommonTokenStream.h>
 
+#include <exception>
 #include <fstream>
+#include <iostream>
 #include <memory>
-#include <sstream>
+#include <optional>
+#include <stdexcept>
+#include <string>
+#include <string_view>
 
 #include "SubstraitPlanLexer/SubstraitPlanLexer.h"
 #include "SubstraitPlanParser/SubstraitPlanParser.h"
-#include "substrait/textplan/StructuredSymbolData.h"
+#include "substrait/textplan/ParseResult.h"
+#include "substrait/textplan/SymbolTable.h"
 #include "substrait/textplan/parser/SubstraitParserErrorListener.h"
 #include "substrait/textplan/parser/SubstraitPlanPipelineVisitor.h"
 #include "substrait/textplan/parser/SubstraitPlanRelationVisitor.h"
diff --git a/src/substrait/textplan/parser/SubstraitParserErrorListener.cpp b/src/substrait/textplan/parser/SubstraitParserErrorListener.cpp
index e5c6c0a2..5633088e 100644
--- a/src/substrait/textplan/parser/SubstraitParserErrorListener.cpp
+++ b/src/substrait/textplan/parser/SubstraitParserErrorListener.cpp
@@ -2,10 +2,15 @@
 
 #include "substrait/textplan/parser/SubstraitParserErrorListener.h"
 
-#include <antlr4-runtime.h>
+#include <Recognizer.h>
+#include <Token.h>
 
+#include <cstddef>
+#include <exception>
 #include <string>
 
+#include "substrait/textplan/SubstraitErrorListener.h"
+
 namespace io::substrait::textplan {
 
 void SubstraitParserErrorListener::syntaxError(
diff --git a/src/substrait/textplan/parser/SubstraitPlanPipelineVisitor.cpp b/src/substrait/textplan/parser/SubstraitPlanPipelineVisitor.cpp
index cc644479..21e24c00 100644
--- a/src/substrait/textplan/parser/SubstraitPlanPipelineVisitor.cpp
+++ b/src/substrait/textplan/parser/SubstraitPlanPipelineVisitor.cpp
@@ -2,9 +2,12 @@
 
 #include "substrait/textplan/parser/SubstraitPlanPipelineVisitor.h"
 
+#include <any>
 #include <memory>
+#include <string>
 
 #include "SubstraitPlanParser/SubstraitPlanParser.h"
+#include "SubstraitPlanParser/SubstraitPlanParserBaseVisitor.h"
 #include "substrait/textplan/Any.h"
 #include "substrait/textplan/Finally.h"
 #include "substrait/textplan/Location.h"
diff --git a/src/substrait/textplan/parser/SubstraitPlanRelationVisitor.cpp b/src/substrait/textplan/parser/SubstraitPlanRelationVisitor.cpp
index 0f9ff8bf..f4eff7b2 100644
--- a/src/substrait/textplan/parser/SubstraitPlanRelationVisitor.cpp
+++ b/src/substrait/textplan/parser/SubstraitPlanRelationVisitor.cpp
@@ -2,27 +2,40 @@
 
 #include "substrait/textplan/parser/SubstraitPlanRelationVisitor.h"
 
+#include <Token.h>
 #include <absl/strings/ascii.h>
 #include <absl/strings/numbers.h>
 #include <absl/strings/strip.h>
 #include <date/tz.h>
 #include <substrait/proto/algebra.pb.h>
 #include <substrait/proto/type.pb.h>
+#include <tree/TerminalNode.h>
 
+#include <algorithm>
+#include <any>
+#include <cctype>
 #include <chrono>
+#include <cstddef>
+#include <cstdint>
 #include <limits>
 #include <memory>
+#include <optional>
 #include <sstream>
 #include <string>
+#include <string_view>
+#include <utility>
+#include <vector>
 
 #include "SubstraitPlanParser/SubstraitPlanParser.h"
 #include "SubstraitPlanTypeVisitor.h"
+#include "date/date.h"
 #include "substrait/expression/DecimalLiteral.h"
 #include "substrait/textplan/Any.h"
 #include "substrait/textplan/Finally.h"
 #include "substrait/textplan/Location.h"
 #include "substrait/textplan/StringManipulation.h"
 #include "substrait/textplan/StructuredSymbolData.h"
+#include "substrait/textplan/SubstraitErrorListener.h"
 #include "substrait/textplan/SymbolTable.h"
 
 namespace io::substrait::textplan {
diff --git a/src/substrait/textplan/parser/SubstraitPlanSubqueryRelationVisitor.cpp b/src/substrait/textplan/parser/SubstraitPlanSubqueryRelationVisitor.cpp
index 8d45c063..e9a01904 100644
--- a/src/substrait/textplan/parser/SubstraitPlanSubqueryRelationVisitor.cpp
+++ b/src/substrait/textplan/parser/SubstraitPlanSubqueryRelationVisitor.cpp
@@ -2,27 +2,41 @@
 
 #include "substrait/textplan/parser/SubstraitPlanSubqueryRelationVisitor.h"
 
+#include <Token.h>
 #include <absl/strings/ascii.h>
 #include <absl/strings/numbers.h>
 #include <absl/strings/strip.h>
 #include <date/tz.h>
 #include <substrait/proto/algebra.pb.h>
 #include <substrait/proto/type.pb.h>
+#include <tree/TerminalNode.h>
 
+#include <algorithm>
+#include <any>
+#include <cctype>
 #include <chrono>
+#include <cstddef>
+#include <cstdint>
 #include <limits>
 #include <memory>
+#include <optional>
 #include <sstream>
 #include <string>
+#include <string_view>
+#include <unordered_map>
+#include <utility>
+#include <vector>
 
 #include "SubstraitPlanParser/SubstraitPlanParser.h"
 #include "SubstraitPlanTypeVisitor.h"
+#include "date/date.h"
 #include "substrait/expression/DecimalLiteral.h"
 #include "substrait/textplan/Any.h"
 #include "substrait/textplan/Finally.h"
 #include "substrait/textplan/Location.h"
 #include "substrait/textplan/StringManipulation.h"
 #include "substrait/textplan/StructuredSymbolData.h"
+#include "substrait/textplan/SubstraitErrorListener.h"
 #include "substrait/textplan/SymbolTable.h"
 
 namespace io::substrait::textplan {
diff --git a/src/substrait/textplan/parser/SubstraitPlanTypeVisitor.cpp b/src/substrait/textplan/parser/SubstraitPlanTypeVisitor.cpp
index 0720eba5..400ed931 100644
--- a/src/substrait/textplan/parser/SubstraitPlanTypeVisitor.cpp
+++ b/src/substrait/textplan/parser/SubstraitPlanTypeVisitor.cpp
@@ -2,13 +2,16 @@
 
 #include "SubstraitPlanTypeVisitor.h"
 
+#include <ParserRuleContext.h>
+#include <RuleContext.h>
 #include <substrait/proto/type.pb.h>
 
+#include <any>
+#include <cstdint>
 #include <memory>
 #include <string>
 
 #include "SubstraitPlanParser/SubstraitPlanParser.h"
-#include "substrait/textplan/SymbolTable.h"
 #include "substrait/type/Type.h"
 
 namespace io::substrait::textplan {
diff --git a/src/substrait/textplan/parser/SubstraitPlanVisitor.cpp b/src/substrait/textplan/parser/SubstraitPlanVisitor.cpp
index 2cf57933..cf549280 100644
--- a/src/substrait/textplan/parser/SubstraitPlanVisitor.cpp
+++ b/src/substrait/textplan/parser/SubstraitPlanVisitor.cpp
@@ -2,7 +2,17 @@
 
 #include "substrait/textplan/parser/SubstraitPlanVisitor.h"
 
+#include <substrait/proto/algebra.pb.h>
+
+#include <algorithm>
+#include <any>
+#include <cctype>
+#include <cstdint>
 #include <memory>
+#include <optional>
+#include <string>
+#include <unordered_map>
+#include <vector>
 
 #include "SubstraitPlanParser/SubstraitPlanParser.h"
 #include "substrait/textplan/Any.h"
diff --git a/src/substrait/textplan/parser/Tool.cpp b/src/substrait/textplan/parser/Tool.cpp
index 9af37dca..02addf94 100644
--- a/src/substrait/textplan/parser/Tool.cpp
+++ b/src/substrait/textplan/parser/Tool.cpp
@@ -2,8 +2,12 @@
 
 #include <getopt.h>
 
-#include <sstream>
+#include <cstdio>
+#include <cstdlib>
+#include <iostream>
+#include <string>
 
+#include "substrait/textplan/SubstraitErrorListener.h"
 #include "substrait/textplan/SymbolTablePrinter.h"
 #include "substrait/textplan/parser/ParseText.h"
 
diff --git a/src/substrait/textplan/parser/tests/TextPlanParserTest.cpp b/src/substrait/textplan/parser/tests/TextPlanParserTest.cpp
index 9a49ed54..2c143c3d 100644
--- a/src/substrait/textplan/parser/tests/TextPlanParserTest.cpp
+++ b/src/substrait/textplan/parser/tests/TextPlanParserTest.cpp
@@ -3,12 +3,14 @@
 #include <gmock/gmock-matchers.h>
 #include <gtest/gtest.h>
 #include <protobuf-matchers/protocol-buffer-matchers.h>
+#include <substrait/proto/plan.pb.h>
 
 #include <algorithm>
-#include <memory>
 #include <string>
-#include <utility>
+#include <vector>
 
+#include "substrait/textplan/ParseResult.h"
+#include "substrait/textplan/SymbolTable.h"
 #include "substrait/textplan/parser/ParseText.h"
 #include "substrait/textplan/tests/ParseResultMatchers.h"
 
diff --git a/src/substrait/textplan/tests/ParseResultMatchers.cpp b/src/substrait/textplan/tests/ParseResultMatchers.cpp
index f08e3f0f..5f178a7c 100644
--- a/src/substrait/textplan/tests/ParseResultMatchers.cpp
+++ b/src/substrait/textplan/tests/ParseResultMatchers.cpp
@@ -6,12 +6,18 @@
 #include <gtest/gtest.h>
 #include <substrait/proto/plan.pb.h>
 
+#include <algorithm>
+#include <cctype>
+#include <iterator>
 #include <memory>
+#include <ostream>
 #include <set>
 #include <string>
 #include <utility>
+#include <vector>
 
 #include "substrait/textplan/ParseResult.h"
+#include "substrait/textplan/SubstraitErrorListener.h"
 #include "substrait/textplan/SymbolTable.h"
 #include "substrait/textplan/SymbolTablePrinter.h"
 
diff --git a/src/substrait/textplan/tests/RoundtripTest.cpp b/src/substrait/textplan/tests/RoundtripTest.cpp
index 60837f1f..4b116b26 100644
--- a/src/substrait/textplan/tests/RoundtripTest.cpp
+++ b/src/substrait/textplan/tests/RoundtripTest.cpp
@@ -1,17 +1,17 @@
 /* SPDX-License-Identifier: Apache-2.0 */
 
-#include <absl/strings/str_join.h>
 #include <gmock/gmock-matchers.h>
 #include <gtest/gtest.h>
 #include <protobuf-matchers/protocol-buffer-matchers.h>
 
 #include <algorithm>
 #include <filesystem>
-#include <memory>
+#include <iomanip>
 #include <sstream>
 #include <string>
-#include <utility>
+#include <vector>
 
+#include "substrait/textplan/SubstraitErrorListener.h"
 #include "substrait/textplan/SymbolTablePrinter.h"
 #include "substrait/textplan/converter/LoadBinary.h"
 #include "substrait/textplan/converter/ParseBinary.h"
diff --git a/src/substrait/textplan/tests/SymbolTableTest.cpp b/src/substrait/textplan/tests/SymbolTableTest.cpp
index 9aac8968..ad2f5cba 100644
--- a/src/substrait/textplan/tests/SymbolTableTest.cpp
+++ b/src/substrait/textplan/tests/SymbolTableTest.cpp
@@ -4,9 +4,12 @@
 
 #include <gmock/gmock-matchers.h>
 #include <gtest/gtest.h>
+#include <substrait/proto/extensions/extensions.pb.h>
 #include <substrait/proto/plan.pb.h>
 
-#include <functional>
+#include <memory>
+#include <string>
+#include <vector>
 
 #include "substrait/textplan/Any.h"
 #include "substrait/textplan/Location.h"
diff --git a/src/substrait/type/Type.cpp b/src/substrait/type/Type.cpp
index 9581607a..69afd229 100644
--- a/src/substrait/type/Type.cpp
+++ b/src/substrait/type/Type.cpp
@@ -3,8 +3,13 @@
 #include "substrait/type/Type.h"
 
 #include <algorithm>
+#include <cctype>
+#include <cstddef>
+#include <memory>
 #include <sstream>
-#include <stdexcept>
+#include <string>
+#include <string_view>
+#include <vector>
 
 #include "substrait/common/Exceptions.h"
 #include "substrait/common/NumberUtils.h"
diff --git a/src/substrait/type/tests/TypeTest.cpp b/src/substrait/type/tests/TypeTest.cpp
index f90b7d0a..666c4a9e 100644
--- a/src/substrait/type/tests/TypeTest.cpp
+++ b/src/substrait/type/tests/TypeTest.cpp
@@ -4,7 +4,9 @@
 
 #include <gtest/gtest.h>
 
+#include <functional>
 #include <memory>
+#include <string>
 
 using namespace io::substrait;