From 365e8fb3cba43b3558bcd5bb9479e665e1a1eaad Mon Sep 17 00:00:00 2001
From: Henner Zeller <hzeller@google.com>
Date: Mon, 18 Sep 2023 10:07:55 -0700
Subject: [PATCH] Fix missing includes of stanard headers.

---
 .github/bin/smoke-test.sh                     | 38 +++++++++----------
 .github/workflows/verible-ci.yml              |  4 +-
 common/analysis/citation.cc                   |  2 +
 common/analysis/command_file_lexer.cc         |  3 ++
 common/analysis/command_file_lexer.h          |  2 +
 common/analysis/file_analyzer.cc              |  1 +
 common/analysis/file_analyzer.h               |  2 +
 common/analysis/line_linter_test.cc           |  1 +
 common/analysis/lint_rule_status.cc           |  1 +
 common/analysis/lint_rule_status_test.cc      |  3 ++
 common/analysis/lint_waiver.cc                |  1 +
 common/analysis/lint_waiver.h                 |  2 +
 common/analysis/lint_waiver_test.cc           |  1 +
 common/analysis/linter_test_utils.cc          |  1 +
 common/analysis/linter_test_utils.h           |  1 +
 common/analysis/linter_test_utils_test.cc     |  1 +
 common/analysis/syntax_tree_linter_test.cc    |  1 +
 common/analysis/text_structure_linter_test.cc |  1 +
 common/analysis/token_stream_linter_test.cc   |  1 +
 common/analysis/violation_handler.cc          |  7 ++++
 common/formatting/align.cc                    |  6 +++
 common/formatting/align.h                     |  2 +
 common/formatting/align_test.cc               |  3 ++
 common/formatting/format_token.cc             |  3 ++
 common/formatting/layout_optimizer.cc         |  4 ++
 common/formatting/layout_optimizer_internal.h |  3 ++
 common/formatting/layout_optimizer_test.cc    |  3 ++
 common/formatting/line_wrap_searcher.cc       |  1 +
 common/formatting/line_wrap_searcher_test.cc  |  1 +
 common/formatting/state_node.cc               |  1 +
 common/formatting/state_node_test.cc          |  1 +
 common/formatting/token_partition_tree.cc     |  4 ++
 common/formatting/tree_annotator.cc           |  1 +
 common/formatting/tree_annotator_test.cc      |  2 +
 common/formatting/tree_unwrapper.cc           |  1 +
 common/formatting/tree_unwrapper_test.cc      |  1 +
 common/formatting/unwrapped_line.cc           |  1 +
 common/formatting/unwrapped_line_test.cc      |  1 +
 common/formatting/unwrapped_line_test_utils.h |  1 +
 common/lexer/lexer_test_util_test.cc          |  1 +
 common/lexer/token_stream_adapter.cc          |  2 +
 common/lexer/token_stream_adapter_test.cc     |  2 +
 common/lsp/dummy-ls.cc                        |  2 +
 common/lsp/json-rpc-dispatcher.cc             |  4 ++
 common/lsp/json-rpc-dispatcher.h              |  1 +
 common/lsp/json-rpc-dispatcher_test.cc        |  2 +
 common/lsp/json-rpc-expect.cc                 |  1 +
 common/lsp/lsp-file-utils.cc                  |  2 +
 common/lsp/lsp-file-utils.h                   |  2 +
 common/lsp/lsp-file-utils_test.cc             |  2 +
 common/lsp/lsp-text-buffer.cc                 |  4 ++
 common/lsp/lsp-text-buffer.h                  |  1 +
 common/lsp/lsp-text-buffer_test.cc            |  2 +
 common/lsp/message-stream-splitter.cc         |  2 +
 common/lsp/message-stream-splitter.h          |  1 +
 common/lsp/message-stream-splitter_test.cc    |  1 +
 common/parser/parser_param.h                  |  1 +
 common/strings/compare_test.cc                |  3 ++
 common/strings/diff_test.cc                   |  3 ++
 common/strings/display_utils_test.cc          |  1 +
 common/strings/obfuscator_test.cc             |  2 +
 common/strings/patch.cc                       |  4 ++
 common/strings/patch_test.cc                  |  2 +
 common/strings/range.cc                       |  1 +
 common/strings/range_test.cc                  |  2 +
 common/strings/split_test.cc                  |  4 ++
 common/strings/string_memory_map_test.cc      |  1 +
 common/text/config_utils.cc                   |  3 ++
 common/text/config_utils_test.cc              |  1 +
 common/text/token_info.cc                     |  1 +
 common/text/token_info.h                      |  2 +
 common/text/token_info_json.cc                |  1 +
 common/text/token_info_json_test.cc           |  1 +
 common/text/token_info_test.cc                |  2 +
 common/text/tree_context_visitor.h            |  2 +
 common/text/tree_context_visitor_test.cc      |  2 +
 common/text/tree_utils.cc                     |  1 +
 common/text/tree_utils_test.cc                |  2 +
 common/tools/jcxxgen.cc                       |  1 +
 common/tools/jcxxgen_test.cc                  |  2 +
 common/tools/patch_tool.cc                    |  1 +
 common/util/auto_iterator_test.cc             |  1 +
 common/util/bijective_map_test.cc             |  3 ++
 common/util/container_proxy_test.cc           |  2 +
 common/util/enum_flags.h                      |  1 +
 common/util/file_util.cc                      |  2 +
 common/util/file_util.h                       |  1 +
 common/util/file_util_test.cc                 |  1 +
 common/util/forward_test.cc                   |  1 +
 common/util/init_command_line.cc              |  1 +
 common/util/init_command_line.h               |  1 +
 common/util/interval_map_test.cc              |  2 +
 common/util/interval_set.h                    |  2 +
 common/util/interval_set_test.cc              |  4 ++
 common/util/map_tree_test.cc                  |  2 +
 common/util/range_test.cc                     |  2 +
 common/util/sha256.cc                         |  1 +
 common/util/sha256_test.cc                    |  2 -
 common/util/simple_zip.cc                     |  1 +
 common/util/subcommand.cc                     |  1 +
 common/util/subcommand.h                      |  1 +
 common/util/thread_pool.cc                    |  4 ++
 common/util/thread_pool.h                     |  3 ++
 common/util/thread_pool_test.cc               |  1 +
 common/util/type_traits_test.cc               |  2 +
 common/util/vector_tree_iterators.h           |  1 +
 common/util/vector_tree_iterators_test.cc     |  1 +
 common/util/vector_tree_test.cc               |  1 +
 verilog/CST/DPI.cc                            |  2 +
 verilog/CST/DPI_test.cc                       |  1 +
 verilog/CST/class.h                           |  2 +
 verilog/CST/declaration.cc                    |  1 +
 verilog/CST/declaration.h                     |  1 +
 verilog/CST/expression.h                      |  1 +
 verilog/CST/expression_test.cc                |  1 +
 verilog/CST/macro.cc                          |  2 +
 verilog/CST/macro_test.cc                     |  2 +
 verilog/CST/match_test_utils.cc               |  1 +
 verilog/CST/numbers.cc                        |  1 +
 verilog/CST/type.cc                           |  1 +
 verilog/CST/verilog_tree_json.cc              |  3 ++
 verilog/analysis/checkers/always_comb_rule.cc |  1 +
 .../checkers/always_ff_non_blocking_rule.cc   |  2 +
 .../checkers/always_ff_non_blocking_rule.h    |  1 +
 .../checkers/disable_statement_rule.cc        |  1 +
 .../explicit_parameter_storage_type_rule.cc   |  1 +
 .../numeric_format_string_style_rule.cc       |  1 +
 .../checkers/package_filename_rule.cc         |  1 +
 .../checkers/parameter_name_style_rule.cc     |  2 +
 .../checkers/port_name_suffix_rule.cc         |  2 +
 .../checkers/suggest_parentheses_rule.h       |  2 +
 .../checkers/suggest_parentheses_rule_test.cc |  2 +
 .../truncated_numeric_literal_rule.cc         |  1 +
 .../truncated_numeric_literal_rule_test.cc    |  1 +
 .../undersized_binary_literal_rule.cc         |  1 +
 .../checkers/uvm_macro_semicolon_rule.h       |  1 +
 .../analysis/checkers/void_cast_rule_test.cc  |  2 +
 verilog/analysis/dependencies.cc              |  1 +
 verilog/analysis/dependencies_test.cc         |  4 ++
 verilog/analysis/extractors.cc                |  1 +
 verilog/analysis/extractors_test.cc           |  4 ++
 verilog/analysis/flow_tree.h                  |  2 +
 verilog/analysis/lint_rule_registry.cc        |  1 +
 verilog/analysis/symbol_table.cc              |  4 ++
 verilog/analysis/symbol_table.h               |  5 +++
 verilog/analysis/verilog_analyzer.cc          |  1 +
 verilog/analysis/verilog_analyzer.h           |  1 +
 verilog/analysis/verilog_equivalence.cc       |  1 +
 verilog/analysis/verilog_equivalence_test.cc  |  2 +
 verilog/analysis/verilog_filelist.cc          |  1 +
 verilog/analysis/verilog_filelist.h           |  1 +
 verilog/analysis/verilog_filelist_test.cc     |  3 ++
 verilog/analysis/verilog_linter.cc            |  3 ++
 verilog/analysis/verilog_linter.h             |  1 +
 .../analysis/verilog_linter_configuration.cc  |  2 +
 verilog/analysis/verilog_linter_test.cc       |  2 +
 verilog/analysis/verilog_project.cc           |  1 +
 verilog/analysis/verilog_project.h            |  3 ++
 verilog/analysis/verilog_project_test.cc      |  3 ++
 verilog/formatting/align.cc                   |  1 +
 verilog/formatting/comment_controls.cc        |  2 +
 verilog/formatting/comment_controls.h         |  2 +
 verilog/formatting/comment_controls_test.cc   |  2 +
 verilog/formatting/formatter.cc               |  5 +++
 verilog/formatting/formatter.h                |  1 +
 verilog/formatting/formatter_test.cc          |  1 +
 verilog/formatting/token_annotator.cc         |  2 +
 verilog/formatting/tree_unwrapper.cc          |  3 ++
 verilog/parser/verilog_lexer.cc               |  2 +
 verilog/parser/verilog_lexer.h                |  2 +
 verilog/parser/verilog_lexer_unittest.cc      |  1 +
 verilog/preprocessor/verilog_preprocess.cc    |  1 +
 .../preprocessor/verilog_preprocess_test.cc   |  1 +
 verilog/tools/diff/verilog_diff.cc            |  2 +
 verilog/tools/kythe/indexing_facts_tree.cc    |  2 +
 verilog/tools/kythe/indexing_facts_tree.h     |  1 +
 .../kythe/indexing_facts_tree_extractor.cc    |  3 ++
 .../indexing_facts_tree_extractor_test.cc     |  1 +
 .../tools/kythe/indexing_facts_tree_test.cc   |  1 +
 verilog/tools/kythe/kythe_facts.cc            |  1 +
 verilog/tools/kythe/kythe_proto_output.cc     |  2 +
 verilog/tools/kythe/scope_resolver.cc         |  1 +
 verilog/tools/kythe/scope_resolver.h          |  1 +
 .../tools/kythe/verilog_kythe_extractor.cc    |  2 +
 verilog/tools/lint/verilog_lint.cc            |  1 +
 verilog/tools/ls/autoexpand.cc                | 10 +++++
 verilog/tools/ls/autoexpand_test.cc           |  6 +++
 verilog/tools/ls/document-symbol-filler.cc    |  2 +
 verilog/tools/ls/lsp-parse-buffer.cc          |  6 +++
 verilog/tools/ls/lsp-parse-buffer.h           |  5 +++
 verilog/tools/ls/symbol-table-handler.cc      |  4 ++
 verilog/tools/ls/symbol-table-handler.h       |  2 +
 verilog/tools/ls/symbol-table-handler_test.cc |  2 +
 verilog/tools/ls/verible-lsp-adapter.cc       |  4 ++
 verilog/tools/ls/verilog-language-server.cc   |  2 +
 verilog/tools/ls/verilog-language-server.h    |  2 +
 .../tools/ls/verilog-language-server_test.cc  |  5 +++
 .../preprocessor/verilog_preprocessor.cc      |  1 +
 verilog/tools/project/project_tool.cc         |  2 +
 .../tools/syntax/export_json_examples/BUILD   |  4 +-
 verilog/tools/syntax/verilog_syntax.cc        |  2 +
 verilog/transform/obfuscate.cc                |  1 +
 verilog/transform/obfuscate.h                 |  1 +
 verilog/transform/obfuscate_test.cc           |  2 +
 204 files changed, 408 insertions(+), 24 deletions(-)

diff --git a/.github/bin/smoke-test.sh b/.github/bin/smoke-test.sh
index 0fa7e4880..f1b010ac0 100755
--- a/.github/bin/smoke-test.sh
+++ b/.github/bin/smoke-test.sh
@@ -132,30 +132,30 @@ ExpectedFailCount[lint:ibex]=14
 ExpectedFailCount[project:ibex]=193
 ExpectedFailCount[preprocessor:ibex]=368
 
-ExpectedFailCount[syntax:opentitan]=36
-ExpectedFailCount[lint:opentitan]=36
-ExpectedFailCount[project:opentitan]=733
-ExpectedFailCount[preprocessor:opentitan]=1957
+ExpectedFailCount[syntax:opentitan]=35
+ExpectedFailCount[lint:opentitan]=35
+ExpectedFailCount[project:opentitan]=739
+ExpectedFailCount[preprocessor:opentitan]=1978
 
 ExpectedFailCount[syntax:sv-tests]=77
 ExpectedFailCount[lint:sv-tests]=76
 ExpectedFailCount[project:sv-tests]=187
 ExpectedFailCount[preprocessor:sv-tests]=139
 
-ExpectedFailCount[syntax:caliptra-rtl]=19
-ExpectedFailCount[lint:caliptra-rtl]=19
-ExpectedFailCount[project:caliptra-rtl]=315
-ExpectedFailCount[preprocessor:caliptra-rtl]=698
+ExpectedFailCount[syntax:caliptra-rtl]=21
+ExpectedFailCount[lint:caliptra-rtl]=21
+ExpectedFailCount[project:caliptra-rtl]=324
+ExpectedFailCount[preprocessor:caliptra-rtl]=758
 
 ExpectedFailCount[syntax:Cores-VeeR-EH2]=2
 ExpectedFailCount[lint:Cores-VeeR-EH2]=2
 ExpectedFailCount[project:Cores-VeeR-EH2]=42
 ExpectedFailCount[preprocessor:Cores-VeeR-EH2]=43
 
-ExpectedFailCount[syntax:cva6]=4
-ExpectedFailCount[lint:cva6]=4
-ExpectedFailCount[project:cva6]=69
-ExpectedFailCount[preprocessor:cva6]=65
+ExpectedFailCount[syntax:cva6]=5
+ExpectedFailCount[lint:cva6]=5
+ExpectedFailCount[project:cva6]=76
+ExpectedFailCount[preprocessor:cva6]=98
 
 ExpectedFailCount[syntax:uvm]=1
 ExpectedFailCount[lint:uvm]=1
@@ -175,10 +175,10 @@ ExpectedFailCount[lint:XilinxUnisimLibrary]=4
 ExpectedFailCount[project:XilinxUnisimLibrary]=22
 ExpectedFailCount[preprocessor:XilinxUnisimLibrary]=96
 
-ExpectedFailCount[syntax:black-parrot]=156
-ExpectedFailCount[lint:black-parrot]=156
-ExpectedFailCount[project:black-parrot]=171
-ExpectedFailCount[preprocessor:black-parrot]=172
+ExpectedFailCount[syntax:black-parrot]=155
+ExpectedFailCount[lint:black-parrot]=155
+ExpectedFailCount[project:black-parrot]=170
+ExpectedFailCount[preprocessor:black-parrot]=171
 
 ExpectedFailCount[syntax:ivtest]=166
 ExpectedFailCount[lint:ivtest]=166
@@ -190,8 +190,8 @@ ExpectedFailCount[lint:nontrivial-mips]=2
 ExpectedFailCount[project:nontrivial-mips]=81
 ExpectedFailCount[preprocessor:nontrivial-mips]=78
 
-ExpectedFailCount[project:axi]=73
-ExpectedFailCount[preprocessor:axi]=70
+ExpectedFailCount[project:axi]=74
+ExpectedFailCount[preprocessor:axi]=71
 
 ExpectedFailCount[syntax:rsd]=5
 ExpectedFailCount[lint:rsd]=5
@@ -207,7 +207,7 @@ ExpectedFailCount[preprocessor:serv]=1
 ExpectedFailCount[syntax:basejump_stl]=466
 ExpectedFailCount[lint:basejump_stl]=466
 ExpectedFailCount[project:basejump_stl]=577
-ExpectedFailCount[preprocessor:basejump_stl]=610
+ExpectedFailCount[preprocessor:basejump_stl]=611
 
 # Ideally, we expect all tools to process all files with a zero exit code.
 # However, that is not always the case, so we document the current
diff --git a/.github/workflows/verible-ci.yml b/.github/workflows/verible-ci.yml
index bc17cf6d9..c70819865 100644
--- a/.github/workflows/verible-ci.yml
+++ b/.github/workflows/verible-ci.yml
@@ -507,10 +507,10 @@ jobs:
       run: bazel info
 
     - name: Run Tests
-      run: bazel test --noshow_progress --test_output=errors //...
+      run: bazel test --keep_going --noshow_progress --test_output=errors //...
 
     - name: Build Verible Binaries
-      run: bazel build --noshow_progress -c opt :install-binaries
+      run: bazel build --keep_going --noshow_progress -c opt :install-binaries
 
     - name: Prepare release
       run: |
diff --git a/common/analysis/citation.cc b/common/analysis/citation.cc
index e326f8265..8568785e5 100644
--- a/common/analysis/citation.cc
+++ b/common/analysis/citation.cc
@@ -14,6 +14,8 @@
 
 #include "common/analysis/citation.h"
 
+#include <string>
+
 #include "absl/strings/str_cat.h"
 
 namespace verible {
diff --git a/common/analysis/command_file_lexer.cc b/common/analysis/command_file_lexer.cc
index 37bca0c15..b189efb3a 100644
--- a/common/analysis/command_file_lexer.cc
+++ b/common/analysis/command_file_lexer.cc
@@ -14,6 +14,9 @@
 
 #include "common/analysis/command_file_lexer.h"
 
+#include <algorithm>
+#include <vector>
+
 #include "absl/strings/string_view.h"
 #include "common/analysis/lint_waiver.h"
 #include "common/lexer/token_stream_adapter.h"
diff --git a/common/analysis/command_file_lexer.h b/common/analysis/command_file_lexer.h
index 757854d1b..08f4b8e91 100644
--- a/common/analysis/command_file_lexer.h
+++ b/common/analysis/command_file_lexer.h
@@ -27,6 +27,8 @@
 #  undef yyFlexLexer  // this is how FlexLexer.h says to do things
 #  define yyFlexLexer veribleCommandFileFlexLexer
 #  include <FlexLexer.h>
+
+#include <vector>
 #endif
 // clang-format on
 
diff --git a/common/analysis/file_analyzer.cc b/common/analysis/file_analyzer.cc
index 61527a23e..ec4e8f322 100644
--- a/common/analysis/file_analyzer.cc
+++ b/common/analysis/file_analyzer.cc
@@ -17,6 +17,7 @@
 #include "common/analysis/file_analyzer.h"
 
 #include <algorithm>
+#include <ostream>
 #include <sstream>  // IWYU pragma: keep  // for ostringstream
 #include <string>
 #include <vector>
diff --git a/common/analysis/file_analyzer.h b/common/analysis/file_analyzer.h
index 6f09408ae..3acfff086 100644
--- a/common/analysis/file_analyzer.h
+++ b/common/analysis/file_analyzer.h
@@ -41,7 +41,9 @@
 
 #include <functional>
 #include <iosfwd>
+#include <memory>
 #include <string>
+#include <utility>
 #include <vector>
 
 #include "absl/status/status.h"
diff --git a/common/analysis/line_linter_test.cc b/common/analysis/line_linter_test.cc
index ddf881c70..281075526 100644
--- a/common/analysis/line_linter_test.cc
+++ b/common/analysis/line_linter_test.cc
@@ -16,6 +16,7 @@
 
 #include <cstddef>
 #include <memory>
+#include <set>
 #include <vector>
 
 #include "absl/strings/string_view.h"
diff --git a/common/analysis/lint_rule_status.cc b/common/analysis/lint_rule_status.cc
index 827929365..9744be4d6 100644
--- a/common/analysis/lint_rule_status.cc
+++ b/common/analysis/lint_rule_status.cc
@@ -19,6 +19,7 @@
 #include <iostream>
 #include <iterator>
 #include <ostream>
+#include <set>
 #include <string>
 #include <vector>
 
diff --git a/common/analysis/lint_rule_status_test.cc b/common/analysis/lint_rule_status_test.cc
index 07d262dc9..997960514 100644
--- a/common/analysis/lint_rule_status_test.cc
+++ b/common/analysis/lint_rule_status_test.cc
@@ -14,8 +14,11 @@
 
 #include "common/analysis/lint_rule_status.h"
 
+#include <iostream>
+#include <set>
 #include <sstream>  // IWYU pragma: keep  // for ostringstream
 #include <string>
+#include <utility>
 #include <vector>
 
 #include "absl/strings/str_split.h"
diff --git a/common/analysis/lint_waiver.cc b/common/analysis/lint_waiver.cc
index 0dbff3f25..a36f2dfe3 100644
--- a/common/analysis/lint_waiver.cc
+++ b/common/analysis/lint_waiver.cc
@@ -22,6 +22,7 @@
 #include <map>
 #include <regex>  // NOLINT
 #include <set>
+#include <string>
 #include <utility>
 #include <vector>
 
diff --git a/common/analysis/lint_waiver.h b/common/analysis/lint_waiver.h
index 22e09aadc..1ff961839 100644
--- a/common/analysis/lint_waiver.h
+++ b/common/analysis/lint_waiver.h
@@ -19,6 +19,8 @@
 #include <map>
 #include <regex>  // NOLINT
 #include <set>
+#include <string>
+#include <utility>
 #include <vector>
 
 #include "absl/strings/string_view.h"
diff --git a/common/analysis/lint_waiver_test.cc b/common/analysis/lint_waiver_test.cc
index 55ef7039b..f05ed3feb 100644
--- a/common/analysis/lint_waiver_test.cc
+++ b/common/analysis/lint_waiver_test.cc
@@ -15,6 +15,7 @@
 #include "common/analysis/lint_waiver.h"
 
 #include <cstddef>
+#include <set>
 #include <vector>
 
 #include "common/strings/line_column_map.h"
diff --git a/common/analysis/linter_test_utils.cc b/common/analysis/linter_test_utils.cc
index 9960f6785..d9ce87c20 100644
--- a/common/analysis/linter_test_utils.cc
+++ b/common/analysis/linter_test_utils.cc
@@ -16,6 +16,7 @@
 
 #include <iostream>
 #include <iterator>
+#include <set>
 #include <vector>
 
 #include "absl/strings/string_view.h"
diff --git a/common/analysis/linter_test_utils.h b/common/analysis/linter_test_utils.h
index a33420380..7c7a0b07a 100644
--- a/common/analysis/linter_test_utils.h
+++ b/common/analysis/linter_test_utils.h
@@ -21,6 +21,7 @@
 #include <memory>
 #include <set>
 #include <sstream>
+#include <string>
 
 #include "absl/status/status.h"
 #include "absl/strings/str_cat.h"
diff --git a/common/analysis/linter_test_utils_test.cc b/common/analysis/linter_test_utils_test.cc
index 080b2fd95..8c7054fd9 100644
--- a/common/analysis/linter_test_utils_test.cc
+++ b/common/analysis/linter_test_utils_test.cc
@@ -14,6 +14,7 @@
 
 #include "common/analysis/linter_test_utils.h"
 
+#include <set>
 #include <sstream>
 #include <string>
 #include <vector>
diff --git a/common/analysis/syntax_tree_linter_test.cc b/common/analysis/syntax_tree_linter_test.cc
index cfbb1f551..4f2e6f9b7 100644
--- a/common/analysis/syntax_tree_linter_test.cc
+++ b/common/analysis/syntax_tree_linter_test.cc
@@ -15,6 +15,7 @@
 #include "common/analysis/syntax_tree_linter.h"
 
 #include <memory>
+#include <set>
 #include <vector>
 
 #include "common/analysis/lint_rule_status.h"
diff --git a/common/analysis/text_structure_linter_test.cc b/common/analysis/text_structure_linter_test.cc
index a72561e19..d5d4ce56b 100644
--- a/common/analysis/text_structure_linter_test.cc
+++ b/common/analysis/text_structure_linter_test.cc
@@ -15,6 +15,7 @@
 #include "common/analysis/text_structure_linter.h"
 
 #include <memory>
+#include <set>
 #include <vector>
 
 #include "absl/strings/match.h"
diff --git a/common/analysis/token_stream_linter_test.cc b/common/analysis/token_stream_linter_test.cc
index efd4a59d6..9eaf0b146 100644
--- a/common/analysis/token_stream_linter_test.cc
+++ b/common/analysis/token_stream_linter_test.cc
@@ -15,6 +15,7 @@
 #include "common/analysis/token_stream_linter.h"
 
 #include <memory>
+#include <set>
 #include <vector>
 
 #include "absl/strings/string_view.h"
diff --git a/common/analysis/violation_handler.cc b/common/analysis/violation_handler.cc
index 1e5215a13..4133c7abc 100644
--- a/common/analysis/violation_handler.cc
+++ b/common/analysis/violation_handler.cc
@@ -14,6 +14,13 @@
 
 #include "common/analysis/violation_handler.h"
 
+#include <iostream>
+#include <ostream>
+#include <set>
+#include <sstream>
+#include <string>
+#include <vector>
+
 #include "absl/status/status.h"
 #include "common/strings/diff.h"
 #include "common/util/file_util.h"
diff --git a/common/formatting/align.cc b/common/formatting/align.cc
index 961b2c257..7871e9f40 100644
--- a/common/formatting/align.cc
+++ b/common/formatting/align.cc
@@ -15,11 +15,17 @@
 #include "common/formatting/align.h"
 
 #include <algorithm>
+#include <cstddef>
+#include <cstdlib>
 #include <functional>
 #include <iostream>
 #include <iterator>
+#include <limits>
 #include <map>
 #include <numeric>
+#include <sstream>
+#include <string>
+#include <utility>
 #include <vector>
 
 #include "absl/strings/str_join.h"
diff --git a/common/formatting/align.h b/common/formatting/align.h
index b41d2b1dd..9f33ae738 100644
--- a/common/formatting/align.h
+++ b/common/formatting/align.h
@@ -16,6 +16,8 @@
 #define VERIBLE_COMMON_FORMATTING_ALIGN_H_
 
 #include <functional>
+#include <ostream>
+#include <string>
 #include <vector>
 
 #include "absl/strings/string_view.h"
diff --git a/common/formatting/align_test.cc b/common/formatting/align_test.cc
index 8659d6751..5ab7bc5a5 100644
--- a/common/formatting/align_test.cc
+++ b/common/formatting/align_test.cc
@@ -14,6 +14,9 @@
 
 #include "common/formatting/align.h"
 
+#include <algorithm>
+#include <iterator>
+#include <ostream>
 #include <sstream>
 #include <string>
 #include <utility>
diff --git a/common/formatting/format_token.cc b/common/formatting/format_token.cc
index 915623b8f..b6ec6c140 100644
--- a/common/formatting/format_token.cc
+++ b/common/formatting/format_token.cc
@@ -14,9 +14,12 @@
 
 #include "common/formatting/format_token.h"
 
+#include <algorithm>
 #include <iostream>
 #include <sstream>  // pragma IWYU: keep  // for ostringstream
 #include <string>
+#include <utility>
+#include <vector>
 
 #include "absl/base/macros.h"
 #include "absl/strings/string_view.h"
diff --git a/common/formatting/layout_optimizer.cc b/common/formatting/layout_optimizer.cc
index 9b6d3977c..21408cb67 100644
--- a/common/formatting/layout_optimizer.cc
+++ b/common/formatting/layout_optimizer.cc
@@ -20,8 +20,12 @@
 #include "common/formatting/layout_optimizer.h"
 
 #include <algorithm>
+#include <cmath>
 #include <iomanip>
+#include <ios>
+#include <limits>
 #include <ostream>
+#include <utility>
 
 #include "absl/container/fixed_array.h"
 #include "common/formatting/basic_format_style.h"
diff --git a/common/formatting/layout_optimizer_internal.h b/common/formatting/layout_optimizer_internal.h
index 9873bbcdd..ee075d7ec 100644
--- a/common/formatting/layout_optimizer_internal.h
+++ b/common/formatting/layout_optimizer_internal.h
@@ -18,9 +18,12 @@
 #define VERIBLE_VERILOG_FORMATTING_LAYOUT_OPTIMIZER_INTERNAL_H_
 
 #include <algorithm>
+#include <cstddef>
 #include <iterator>
 #include <ostream>
+#include <string>
 #include <type_traits>
+#include <utility>
 #include <vector>
 
 #include "absl/container/fixed_array.h"
diff --git a/common/formatting/layout_optimizer_test.cc b/common/formatting/layout_optimizer_test.cc
index d4ca02650..f921598e3 100644
--- a/common/formatting/layout_optimizer_test.cc
+++ b/common/formatting/layout_optimizer_test.cc
@@ -14,6 +14,9 @@
 //
 #include "common/formatting/layout_optimizer.h"
 
+#include <algorithm>
+#include <limits>
+#include <ostream>
 #include <sstream>
 #include <string>
 #include <vector>
diff --git a/common/formatting/line_wrap_searcher.cc b/common/formatting/line_wrap_searcher.cc
index 4affe1654..162759fa3 100644
--- a/common/formatting/line_wrap_searcher.cc
+++ b/common/formatting/line_wrap_searcher.cc
@@ -15,6 +15,7 @@
 #include "common/formatting/line_wrap_searcher.h"
 
 #include <memory>
+#include <ostream>
 #include <queue>
 #include <vector>
 
diff --git a/common/formatting/line_wrap_searcher_test.cc b/common/formatting/line_wrap_searcher_test.cc
index 53c331696..1d3f168ae 100644
--- a/common/formatting/line_wrap_searcher_test.cc
+++ b/common/formatting/line_wrap_searcher_test.cc
@@ -14,6 +14,7 @@
 
 #include "common/formatting/line_wrap_searcher.h"
 
+#include <sstream>
 #include <vector>
 
 #include "absl/strings/match.h"
diff --git a/common/formatting/state_node.cc b/common/formatting/state_node.cc
index 6efddb4f4..a15482dc3 100644
--- a/common/formatting/state_node.cc
+++ b/common/formatting/state_node.cc
@@ -17,6 +17,7 @@
 #include <cstddef>
 #include <iterator>
 #include <memory>
+#include <ostream>
 #include <stack>
 #include <vector>
 
diff --git a/common/formatting/state_node_test.cc b/common/formatting/state_node_test.cc
index e1d84bac4..58436dd75 100644
--- a/common/formatting/state_node_test.cc
+++ b/common/formatting/state_node_test.cc
@@ -15,6 +15,7 @@
 #include "common/formatting/state_node.h"
 
 #include <memory>
+#include <sstream>
 #include <stack>
 #include <string>
 #include <vector>
diff --git a/common/formatting/token_partition_tree.cc b/common/formatting/token_partition_tree.cc
index 0c83f1209..be3c1acc4 100644
--- a/common/formatting/token_partition_tree.cc
+++ b/common/formatting/token_partition_tree.cc
@@ -14,8 +14,12 @@
 
 #include "common/formatting/token_partition_tree.h"
 
+#include <algorithm>
 #include <cstddef>
 #include <iterator>
+#include <memory>
+#include <ostream>
+#include <utility>
 #include <vector>
 
 #include "common/formatting/format_token.h"
diff --git a/common/formatting/tree_annotator.cc b/common/formatting/tree_annotator.cc
index a15ca55c8..4b8a0786d 100644
--- a/common/formatting/tree_annotator.cc
+++ b/common/formatting/tree_annotator.cc
@@ -14,6 +14,7 @@
 
 #include "common/formatting/tree_annotator.h"
 
+#include <iterator>
 #include <vector>
 
 #include "common/text/concrete_syntax_leaf.h"
diff --git a/common/formatting/tree_annotator_test.cc b/common/formatting/tree_annotator_test.cc
index 85310656c..9f23ac36c 100644
--- a/common/formatting/tree_annotator_test.cc
+++ b/common/formatting/tree_annotator_test.cc
@@ -14,6 +14,8 @@
 
 #include "common/formatting/tree_annotator.h"
 
+#include <vector>
+
 #include "common/formatting/format_token.h"
 #include "common/text/constants.h"
 #include "common/text/token_info.h"
diff --git a/common/formatting/tree_unwrapper.cc b/common/formatting/tree_unwrapper.cc
index a1e46d0cf..2dce64a2d 100644
--- a/common/formatting/tree_unwrapper.cc
+++ b/common/formatting/tree_unwrapper.cc
@@ -18,6 +18,7 @@
 #include <functional>
 #include <iterator>
 #include <memory>
+#include <ostream>
 #include <vector>
 
 #include "common/formatting/format_token.h"
diff --git a/common/formatting/tree_unwrapper_test.cc b/common/formatting/tree_unwrapper_test.cc
index da2a33bb0..05737d3ae 100644
--- a/common/formatting/tree_unwrapper_test.cc
+++ b/common/formatting/tree_unwrapper_test.cc
@@ -17,6 +17,7 @@
 #include <algorithm>
 #include <iterator>
 #include <memory>
+#include <sstream>
 #include <vector>
 
 #include "absl/strings/ascii.h"
diff --git a/common/formatting/unwrapped_line.cc b/common/formatting/unwrapped_line.cc
index 831827d67..2ed22b6ef 100644
--- a/common/formatting/unwrapped_line.cc
+++ b/common/formatting/unwrapped_line.cc
@@ -15,6 +15,7 @@
 #include "common/formatting/unwrapped_line.h"
 
 #include <algorithm>
+#include <functional>
 #include <iostream>
 #include <iterator>
 #include <map>
diff --git a/common/formatting/unwrapped_line_test.cc b/common/formatting/unwrapped_line_test.cc
index b1eea0835..5b250dac6 100644
--- a/common/formatting/unwrapped_line_test.cc
+++ b/common/formatting/unwrapped_line_test.cc
@@ -15,6 +15,7 @@
 #include "common/formatting/unwrapped_line.h"
 
 #include <iterator>
+#include <ostream>
 #include <sstream>
 #include <vector>
 
diff --git a/common/formatting/unwrapped_line_test_utils.h b/common/formatting/unwrapped_line_test_utils.h
index 7bab4c954..ffcd1aadb 100644
--- a/common/formatting/unwrapped_line_test_utils.h
+++ b/common/formatting/unwrapped_line_test_utils.h
@@ -15,6 +15,7 @@
 #ifndef VERIBLE_COMMON_FORMATTING_UNWRAPPED_LINE_TEST_UTILS_H_
 #define VERIBLE_COMMON_FORMATTING_UNWRAPPED_LINE_TEST_UTILS_H_
 
+#include <string>
 #include <vector>
 
 #include "absl/strings/string_view.h"
diff --git a/common/lexer/lexer_test_util_test.cc b/common/lexer/lexer_test_util_test.cc
index 237a9b3c5..f43c43c98 100644
--- a/common/lexer/lexer_test_util_test.cc
+++ b/common/lexer/lexer_test_util_test.cc
@@ -16,6 +16,7 @@
 
 #include <initializer_list>
 #include <iterator>
+#include <sstream>
 #include <vector>
 
 #include "absl/strings/match.h"
diff --git a/common/lexer/token_stream_adapter.cc b/common/lexer/token_stream_adapter.cc
index c7351735a..9b7f02bcb 100644
--- a/common/lexer/token_stream_adapter.cc
+++ b/common/lexer/token_stream_adapter.cc
@@ -14,6 +14,8 @@
 
 #include "common/lexer/token_stream_adapter.h"
 
+#include <functional>
+
 #include "absl/status/status.h"
 #include "common/lexer/lexer.h"
 #include "common/lexer/token_generator.h"
diff --git a/common/lexer/token_stream_adapter_test.cc b/common/lexer/token_stream_adapter_test.cc
index 1bdab2493..cb5a70ac2 100644
--- a/common/lexer/token_stream_adapter_test.cc
+++ b/common/lexer/token_stream_adapter_test.cc
@@ -14,6 +14,8 @@
 
 #include "common/lexer/token_stream_adapter.h"
 
+#include <initializer_list>
+
 #include "absl/status/status.h"
 #include "common/lexer/lexer.h"
 #include "common/lexer/lexer_test_util.h"
diff --git a/common/lsp/dummy-ls.cc b/common/lsp/dummy-ls.cc
index 91f50816a..9b0495897 100644
--- a/common/lsp/dummy-ls.cc
+++ b/common/lsp/dummy-ls.cc
@@ -31,6 +31,8 @@
 #define read(fd, buf, size) _read(fd, buf, size)
 #endif
 
+#include <iostream>
+
 using verible::lsp::BufferCollection;
 using verible::lsp::InitializeResult;
 using verible::lsp::JsonRpcDispatcher;
diff --git a/common/lsp/json-rpc-dispatcher.cc b/common/lsp/json-rpc-dispatcher.cc
index e7e493edb..f40839c3e 100644
--- a/common/lsp/json-rpc-dispatcher.cc
+++ b/common/lsp/json-rpc-dispatcher.cc
@@ -14,6 +14,10 @@
 
 #include "common/lsp/json-rpc-dispatcher.h"
 
+#include <exception>
+#include <sstream>
+#include <string>
+
 #include "common/util/logging.h"
 
 namespace verible {
diff --git a/common/lsp/json-rpc-dispatcher.h b/common/lsp/json-rpc-dispatcher.h
index 4ea363df4..deedbf35b 100644
--- a/common/lsp/json-rpc-dispatcher.h
+++ b/common/lsp/json-rpc-dispatcher.h
@@ -20,6 +20,7 @@
 #include <sstream>
 #include <string>
 #include <unordered_map>
+#include <utility>
 
 #include "absl/strings/str_cat.h"
 #include "absl/strings/string_view.h"
diff --git a/common/lsp/json-rpc-dispatcher_test.cc b/common/lsp/json-rpc-dispatcher_test.cc
index 53b8f2de9..705b51997 100644
--- a/common/lsp/json-rpc-dispatcher_test.cc
+++ b/common/lsp/json-rpc-dispatcher_test.cc
@@ -16,6 +16,8 @@
 
 #include <algorithm>
 #include <exception>
+#include <iostream>
+#include <stdexcept>
 
 #include "absl/status/status.h"
 #include "absl/strings/string_view.h"
diff --git a/common/lsp/json-rpc-expect.cc b/common/lsp/json-rpc-expect.cc
index d2572bd98..09a775a9a 100644
--- a/common/lsp/json-rpc-expect.cc
+++ b/common/lsp/json-rpc-expect.cc
@@ -16,6 +16,7 @@
 
 #include <fstream>
 #include <iostream>
+#include <iterator>
 #include <streambuf>
 #include <string>
 
diff --git a/common/lsp/lsp-file-utils.cc b/common/lsp/lsp-file-utils.cc
index 4f02f9b62..20058ca46 100644
--- a/common/lsp/lsp-file-utils.cc
+++ b/common/lsp/lsp-file-utils.cc
@@ -16,7 +16,9 @@
 #include "common/lsp/lsp-file-utils.h"
 
 #include <algorithm>
+#include <cctype>
 #include <filesystem>
+#include <string>
 
 #include "absl/strings/escaping.h"
 #include "absl/strings/match.h"
diff --git a/common/lsp/lsp-file-utils.h b/common/lsp/lsp-file-utils.h
index cc1dff742..6d82682c3 100644
--- a/common/lsp/lsp-file-utils.h
+++ b/common/lsp/lsp-file-utils.h
@@ -16,6 +16,8 @@
 #ifndef VERIBLE_COMMON_LSP_LSP_FILE_UTILS_H
 #define VERIBLE_COMMON_LSP_LSP_FILE_UTILS_H
 
+#include <string>
+
 #include "absl/strings/string_view.h"
 
 namespace verible::lsp {
diff --git a/common/lsp/lsp-file-utils_test.cc b/common/lsp/lsp-file-utils_test.cc
index 5a6fe157f..e4df6b35a 100644
--- a/common/lsp/lsp-file-utils_test.cc
+++ b/common/lsp/lsp-file-utils_test.cc
@@ -15,6 +15,8 @@
 
 #include "common/lsp/lsp-file-utils.h"
 
+#include <string>
+
 #include "absl/strings/str_cat.h"
 #include "gtest/gtest.h"
 
diff --git a/common/lsp/lsp-text-buffer.cc b/common/lsp/lsp-text-buffer.cc
index 67725e2b2..30ba091b8 100644
--- a/common/lsp/lsp-text-buffer.cc
+++ b/common/lsp/lsp-text-buffer.cc
@@ -14,6 +14,10 @@
 
 #include "common/lsp/lsp-text-buffer.h"
 
+#include <numeric>
+#include <string>
+#include <vector>
+
 #include "common/strings/utf8.h"
 
 namespace verible {
diff --git a/common/lsp/lsp-text-buffer.h b/common/lsp/lsp-text-buffer.h
index 4c432765d..f3c069241 100644
--- a/common/lsp/lsp-text-buffer.h
+++ b/common/lsp/lsp-text-buffer.h
@@ -17,6 +17,7 @@
 
 #include <functional>
 #include <memory>
+#include <string>
 #include <vector>
 
 #include "absl/container/flat_hash_map.h"
diff --git a/common/lsp/lsp-text-buffer_test.cc b/common/lsp/lsp-text-buffer_test.cc
index a694ca34f..c83644ec0 100644
--- a/common/lsp/lsp-text-buffer_test.cc
+++ b/common/lsp/lsp-text-buffer_test.cc
@@ -14,6 +14,8 @@
 
 #include "common/lsp/lsp-text-buffer.h"
 
+#include <string>
+
 #include "absl/strings/str_cat.h"
 #include "common/lsp/json-rpc-dispatcher.h"
 #include "gtest/gtest.h"
diff --git a/common/lsp/message-stream-splitter.cc b/common/lsp/message-stream-splitter.cc
index 9bc544793..fd9985777 100644
--- a/common/lsp/message-stream-splitter.cc
+++ b/common/lsp/message-stream-splitter.cc
@@ -17,6 +17,8 @@
 #include <algorithm>
 
 #include "absl/strings/escaping.h"
+#include "absl/strings/numbers.h"
+#include "absl/strings/str_cat.h"
 #include "common/util/status_macros.h"
 
 namespace verible {
diff --git a/common/lsp/message-stream-splitter.h b/common/lsp/message-stream-splitter.h
index 1bd207c8f..339785260 100644
--- a/common/lsp/message-stream-splitter.h
+++ b/common/lsp/message-stream-splitter.h
@@ -18,6 +18,7 @@
 #include <functional>
 #include <memory>
 #include <string>
+#include <vector>
 
 #include "absl/status/status.h"
 #include "absl/strings/numbers.h"
diff --git a/common/lsp/message-stream-splitter_test.cc b/common/lsp/message-stream-splitter_test.cc
index a9ddfd36f..e78bf4c28 100644
--- a/common/lsp/message-stream-splitter_test.cc
+++ b/common/lsp/message-stream-splitter_test.cc
@@ -15,6 +15,7 @@
 #include "common/lsp/message-stream-splitter.h"
 
 #include <algorithm>
+#include <string>
 
 #include "absl/status/status.h"
 #include "absl/strings/string_view.h"
diff --git a/common/parser/parser_param.h b/common/parser/parser_param.h
index 2c7105c0d..e33880ee6 100644
--- a/common/parser/parser_param.h
+++ b/common/parser/parser_param.h
@@ -20,6 +20,7 @@
 #define VERIBLE_COMMON_PARSER_PARSER_PARAM_H_
 
 #include <cstdint>
+#include <string>
 #include <utility>
 #include <vector>
 
diff --git a/common/strings/compare_test.cc b/common/strings/compare_test.cc
index cf57e0815..7470b2a57 100644
--- a/common/strings/compare_test.cc
+++ b/common/strings/compare_test.cc
@@ -14,6 +14,9 @@
 
 #include "common/strings/compare.h"
 
+#include <map>
+#include <string>
+
 #include "gmock/gmock.h"
 #include "gtest/gtest.h"
 
diff --git a/common/strings/diff_test.cc b/common/strings/diff_test.cc
index 5ca6666bc..59cf5d23b 100644
--- a/common/strings/diff_test.cc
+++ b/common/strings/diff_test.cc
@@ -15,7 +15,10 @@
 #include "common/strings/diff.h"
 
 #include <initializer_list>
+#include <ostream>
 #include <sstream>
+#include <string>
+#include <vector>
 
 #include "absl/strings/string_view.h"
 #include "gmock/gmock.h"
diff --git a/common/strings/display_utils_test.cc b/common/strings/display_utils_test.cc
index 1b8c4076a..c879cd192 100644
--- a/common/strings/display_utils_test.cc
+++ b/common/strings/display_utils_test.cc
@@ -16,6 +16,7 @@
 
 #include <sstream>
 #include <utility>
+#include <vector>
 
 #include "gmock/gmock.h"
 #include "gtest/gtest.h"
diff --git a/common/strings/obfuscator_test.cc b/common/strings/obfuscator_test.cc
index c4be497a7..7846afbc3 100644
--- a/common/strings/obfuscator_test.cc
+++ b/common/strings/obfuscator_test.cc
@@ -14,6 +14,8 @@
 
 #include "common/strings/obfuscator.h"
 
+#include <string>
+
 #include "common/strings/random.h"
 #include "common/util/bijective_map.h"
 #include "common/util/logging.h"
diff --git a/common/strings/patch.cc b/common/strings/patch.cc
index 5de558a0b..b65d52e74 100644
--- a/common/strings/patch.cc
+++ b/common/strings/patch.cc
@@ -14,9 +14,13 @@
 
 #include "common/strings/patch.h"
 
+#include <algorithm>
 #include <deque>
+#include <functional>
 #include <iostream>
 #include <iterator>
+#include <string>
+#include <vector>
 
 #include "absl/base/macros.h"
 #include "absl/status/status.h"
diff --git a/common/strings/patch_test.cc b/common/strings/patch_test.cc
index a35f5a7ee..16242d8e8 100644
--- a/common/strings/patch_test.cc
+++ b/common/strings/patch_test.cc
@@ -16,6 +16,8 @@
 
 #include <initializer_list>
 #include <sstream>
+#include <string>
+#include <utility>
 #include <vector>
 
 #include "absl/status/status.h"
diff --git a/common/strings/range.cc b/common/strings/range.cc
index ac88da17c..31f99e1d6 100644
--- a/common/strings/range.cc
+++ b/common/strings/range.cc
@@ -15,6 +15,7 @@
 #include "common/strings/range.h"
 
 #include <algorithm>
+#include <iterator>
 #include <utility>
 
 #include "absl/strings/string_view.h"
diff --git a/common/strings/range_test.cc b/common/strings/range_test.cc
index 2a97d6d6c..461e7a0d8 100644
--- a/common/strings/range_test.cc
+++ b/common/strings/range_test.cc
@@ -14,6 +14,8 @@
 
 #include "common/strings/range.h"
 
+#include <utility>
+
 #include "common/util/range.h"
 #include "gmock/gmock.h"
 #include "gtest/gtest.h"
diff --git a/common/strings/split_test.cc b/common/strings/split_test.cc
index c927f037d..29fa5d960 100644
--- a/common/strings/split_test.cc
+++ b/common/strings/split_test.cc
@@ -14,6 +14,10 @@
 
 #include "common/strings/split.h"
 
+#include <functional>
+#include <utility>
+#include <vector>
+
 #include "common/strings/range.h"
 #include "common/util/range.h"
 #include "gmock/gmock.h"
diff --git a/common/strings/string_memory_map_test.cc b/common/strings/string_memory_map_test.cc
index 013f1e6c7..a4e053210 100644
--- a/common/strings/string_memory_map_test.cc
+++ b/common/strings/string_memory_map_test.cc
@@ -14,6 +14,7 @@
 
 #include "common/strings/string_memory_map.h"
 
+#include <functional>
 #include <memory>
 #include <string>
 
diff --git a/common/text/config_utils.cc b/common/text/config_utils.cc
index a49b3ef1f..e02b3a4e8 100644
--- a/common/text/config_utils.cc
+++ b/common/text/config_utils.cc
@@ -14,10 +14,13 @@
 
 #include "common/text/config_utils.h"
 
+#include <algorithm>
 #include <cstdint>
 #include <initializer_list>
+#include <iterator>
 #include <limits>
 #include <string>
+#include <utility>
 #include <vector>
 
 #include "absl/strings/match.h"
diff --git a/common/text/config_utils_test.cc b/common/text/config_utils_test.cc
index 0bcddc320..319ebb9b1 100644
--- a/common/text/config_utils_test.cc
+++ b/common/text/config_utils_test.cc
@@ -16,6 +16,7 @@
 
 #include <cstdint>
 #include <string>
+#include <utility>
 #include <vector>
 
 #include "absl/status/status.h"
diff --git a/common/text/token_info.cc b/common/text/token_info.cc
index d30124506..bb9a156e5 100644
--- a/common/text/token_info.cc
+++ b/common/text/token_info.cc
@@ -17,6 +17,7 @@
 #include <algorithm>
 #include <cstddef>
 #include <iterator>
+#include <ostream>
 #include <sstream>  // IWYU pragma: keep  // for ostringstream
 #include <string>
 #include <vector>
diff --git a/common/text/token_info.h b/common/text/token_info.h
index 7147a677f..2b74060b1 100644
--- a/common/text/token_info.h
+++ b/common/text/token_info.h
@@ -18,7 +18,9 @@
 #include <algorithm>   // for std::distance, std::copy
 #include <functional>  // for std::function
 #include <iosfwd>
+#include <iterator>
 #include <string>
+#include <utility>
 #include <vector>
 
 #include "absl/strings/string_view.h"
diff --git a/common/text/token_info_json.cc b/common/text/token_info_json.cc
index 260f7e1fa..4a9a09589 100644
--- a/common/text/token_info_json.cc
+++ b/common/text/token_info_json.cc
@@ -15,6 +15,7 @@
 #include "common/text/token_info_json.h"
 
 #include <sstream>
+#include <string>
 
 #include "common/text/token_info.h"
 
diff --git a/common/text/token_info_json_test.cc b/common/text/token_info_json_test.cc
index 9894c961c..a691e1d07 100644
--- a/common/text/token_info_json_test.cc
+++ b/common/text/token_info_json_test.cc
@@ -15,6 +15,7 @@
 #include "common/text/token_info_json.h"
 
 #include <memory>
+#include <ostream>
 
 #include "absl/strings/string_view.h"
 #include "common/text/constants.h"
diff --git a/common/text/token_info_test.cc b/common/text/token_info_test.cc
index 0872b0d00..33ac5048f 100644
--- a/common/text/token_info_test.cc
+++ b/common/text/token_info_test.cc
@@ -16,6 +16,8 @@
 
 #include "common/text/token_info.h"
 
+#include <ostream>
+#include <sstream>
 #include <string>
 #include <vector>
 
diff --git a/common/text/tree_context_visitor.h b/common/text/tree_context_visitor.h
index 687bc8559..b89ceb971 100644
--- a/common/text/tree_context_visitor.h
+++ b/common/text/tree_context_visitor.h
@@ -15,6 +15,8 @@
 #ifndef VERIBLE_COMMON_TEXT_TREE_CONTEXT_VISITOR_H_
 #define VERIBLE_COMMON_TEXT_TREE_CONTEXT_VISITOR_H_
 
+#include <vector>
+
 #include "common/strings/display_utils.h"
 #include "common/text/syntax_tree_context.h"
 #include "common/text/visitors.h"
diff --git a/common/text/tree_context_visitor_test.cc b/common/text/tree_context_visitor_test.cc
index a7fdd22fc..63b1b42bc 100644
--- a/common/text/tree_context_visitor_test.cc
+++ b/common/text/tree_context_visitor_test.cc
@@ -14,6 +14,8 @@
 
 #include "common/text/tree_context_visitor.h"
 
+#include <sstream>
+#include <utility>
 #include <vector>
 
 #include "common/text/tree_builder_test_util.h"
diff --git a/common/text/tree_utils.cc b/common/text/tree_utils.cc
index b7c47e2d6..174d755f5 100644
--- a/common/text/tree_utils.cc
+++ b/common/text/tree_utils.cc
@@ -18,6 +18,7 @@
 #include <cstdlib>
 #include <functional>
 #include <iostream>
+#include <iterator>
 #include <memory>
 #include <string>
 #include <utility>
diff --git a/common/text/tree_utils_test.cc b/common/text/tree_utils_test.cc
index a2a333572..b0b630222 100644
--- a/common/text/tree_utils_test.cc
+++ b/common/text/tree_utils_test.cc
@@ -14,7 +14,9 @@
 
 #include "common/text/tree_utils.h"
 
+#include <cstddef>
 #include <memory>
+#include <ostream>
 #include <sstream>  // IWYU pragma: keep  // for ostringstream
 #include <string>
 #include <vector>
diff --git a/common/tools/jcxxgen.cc b/common/tools/jcxxgen.cc
index 48aabdd27..e8cfe6eb0 100644
--- a/common/tools/jcxxgen.cc
+++ b/common/tools/jcxxgen.cc
@@ -21,6 +21,7 @@
 #include <memory>
 #include <string>
 #include <unordered_map>
+#include <vector>
 
 #include "absl/container/flat_hash_map.h"
 #include "absl/flags/flag.h"
diff --git a/common/tools/jcxxgen_test.cc b/common/tools/jcxxgen_test.cc
index d099f1b69..7f04fed1c 100644
--- a/common/tools/jcxxgen_test.cc
+++ b/common/tools/jcxxgen_test.cc
@@ -12,6 +12,8 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
+#include <exception>
+
 #include "absl/strings/match.h"
 #include "common/tools/jcxxgen_testfile.h"
 #include "gtest/gtest.h"
diff --git a/common/tools/patch_tool.cc b/common/tools/patch_tool.cc
index 73b5007fc..0eaae61c7 100644
--- a/common/tools/patch_tool.cc
+++ b/common/tools/patch_tool.cc
@@ -15,6 +15,7 @@
 #include <functional>
 #include <iostream>
 #include <string>
+#include <utility>
 
 #include "absl/flags/usage.h"
 #include "absl/status/status.h"
diff --git a/common/util/auto_iterator_test.cc b/common/util/auto_iterator_test.cc
index a22d08a00..82bdf4b30 100644
--- a/common/util/auto_iterator_test.cc
+++ b/common/util/auto_iterator_test.cc
@@ -17,6 +17,7 @@
 #include <list>
 #include <map>
 #include <set>
+#include <type_traits>
 #include <vector>
 
 #include "gmock/gmock.h"
diff --git a/common/util/bijective_map_test.cc b/common/util/bijective_map_test.cc
index b567b3d8d..18df78fa8 100644
--- a/common/util/bijective_map_test.cc
+++ b/common/util/bijective_map_test.cc
@@ -14,7 +14,10 @@
 
 #include "common/util/bijective_map.h"
 
+#include <functional>
 #include <string>
+#include <utility>
+#include <vector>
 
 #include "common/strings/compare.h"
 #include "common/util/logging.h"
diff --git a/common/util/container_proxy_test.cc b/common/util/container_proxy_test.cc
index 163b5f800..815e3208b 100644
--- a/common/util/container_proxy_test.cc
+++ b/common/util/container_proxy_test.cc
@@ -15,7 +15,9 @@
 #include "common/util/container_proxy.h"
 
 #include <list>
+#include <ostream>
 #include <string>
+#include <utility>
 #include <vector>
 
 #include "common/strings/display_utils.h"
diff --git a/common/util/enum_flags.h b/common/util/enum_flags.h
index 086912370..e2dd7d7b4 100644
--- a/common/util/enum_flags.h
+++ b/common/util/enum_flags.h
@@ -16,6 +16,7 @@
 #define VERIBLE_COMMON_UTIL_ENUM_FLAGS_H_
 
 #include <initializer_list>
+#include <ostream>
 #include <sstream>
 #include <string>
 #include <utility>
diff --git a/common/util/file_util.cc b/common/util/file_util.cc
index ece65cf2b..ddc4d2e07 100644
--- a/common/util/file_util.cc
+++ b/common/util/file_util.cc
@@ -21,9 +21,11 @@
 #include <filesystem>
 #include <fstream>
 #include <iostream>
+#include <memory>
 #include <streambuf>
 #include <string>
 #include <system_error>
+#include <utility>
 
 #include "absl/status/status.h"
 #include "absl/status/statusor.h"
diff --git a/common/util/file_util.h b/common/util/file_util.h
index 1b88fdf00..677926b3f 100644
--- a/common/util/file_util.h
+++ b/common/util/file_util.h
@@ -17,6 +17,7 @@
 #ifndef VERIBLE_COMMON_UTIL_FILE_UTIL_H_
 #define VERIBLE_COMMON_UTIL_FILE_UTIL_H_
 
+#include <memory>
 #include <string>
 #include <vector>
 
diff --git a/common/util/file_util_test.cc b/common/util/file_util_test.cc
index c7c7b29b0..52fd4c21a 100644
--- a/common/util/file_util_test.cc
+++ b/common/util/file_util_test.cc
@@ -17,6 +17,7 @@
 #include <algorithm>
 #include <filesystem>
 #include <string>
+#include <utility>
 #include <vector>
 
 #include "absl/status/status.h"
diff --git a/common/util/forward_test.cc b/common/util/forward_test.cc
index 9091f0fb5..6b12112af 100644
--- a/common/util/forward_test.cc
+++ b/common/util/forward_test.cc
@@ -15,6 +15,7 @@
 #include "common/util/forward.h"
 
 #include <string>
+#include <type_traits>
 
 #include "absl/strings/string_view.h"
 #include "gmock/gmock.h"
diff --git a/common/util/init_command_line.cc b/common/util/init_command_line.cc
index e8319c9ae..69852114d 100644
--- a/common/util/init_command_line.cc
+++ b/common/util/init_command_line.cc
@@ -16,6 +16,7 @@
 
 #include <algorithm>
 #include <cstdlib>
+#include <string>
 #include <vector>
 
 #include "absl/debugging/failure_signal_handler.h"
diff --git a/common/util/init_command_line.h b/common/util/init_command_line.h
index c87134eae..0d7a8e4ad 100644
--- a/common/util/init_command_line.h
+++ b/common/util/init_command_line.h
@@ -15,6 +15,7 @@
 #ifndef VERIBLE_COMMON_UTIL_INIT_COMMAND_LINE_H_
 #define VERIBLE_COMMON_UTIL_INIT_COMMAND_LINE_H_
 
+#include <string>
 #include <vector>
 
 #include "absl/strings/string_view.h"
diff --git a/common/util/interval_map_test.cc b/common/util/interval_map_test.cc
index 9ed3be268..0a3e3f87a 100644
--- a/common/util/interval_map_test.cc
+++ b/common/util/interval_map_test.cc
@@ -14,9 +14,11 @@
 
 #include "common/util/interval_map.h"
 
+#include <iterator>
 #include <memory>
 #include <string>
 #include <tuple>
+#include <utility>
 #include <vector>
 
 #include "absl/strings/string_view.h"
diff --git a/common/util/interval_set.h b/common/util/interval_set.h
index c73fc7da1..85f9c9a42 100644
--- a/common/util/interval_set.h
+++ b/common/util/interval_set.h
@@ -19,7 +19,9 @@
 #include <iostream>
 #include <map>
 #include <sstream>
+#include <string>
 #include <utility>
+#include <vector>
 
 #include "absl/random/random.h"
 #include "absl/strings/numbers.h"
diff --git a/common/util/interval_set_test.cc b/common/util/interval_set_test.cc
index 5ed32f2c3..b4345a471 100644
--- a/common/util/interval_set_test.cc
+++ b/common/util/interval_set_test.cc
@@ -15,7 +15,11 @@
 #include "common/util/interval_set.h"
 
 #include <initializer_list>
+#include <iterator>
+#include <map>
 #include <sstream>
+#include <utility>
+#include <vector>
 
 #include "gmock/gmock.h"
 #include "gtest/gtest.h"
diff --git a/common/util/map_tree_test.cc b/common/util/map_tree_test.cc
index 19f4d3a69..e54f0f139 100644
--- a/common/util/map_tree_test.cc
+++ b/common/util/map_tree_test.cc
@@ -14,8 +14,10 @@
 
 #include "common/util/map_tree.h"
 
+#include <ostream>
 #include <sstream>
 #include <string>
+#include <utility>
 
 #include "absl/strings/string_view.h"
 #include "common/util/spacer.h"
diff --git a/common/util/range_test.cc b/common/util/range_test.cc
index fc8e32221..00df3c7eb 100644
--- a/common/util/range_test.cc
+++ b/common/util/range_test.cc
@@ -16,6 +16,8 @@
 
 #include <iterator>
 #include <string>
+#include <utility>
+#include <vector>
 
 #include "absl/strings/string_view.h"
 #include "common/util/iterator_range.h"
diff --git a/common/util/sha256.cc b/common/util/sha256.cc
index 892a40865..e8db13169 100644
--- a/common/util/sha256.cc
+++ b/common/util/sha256.cc
@@ -36,6 +36,7 @@
 #include "common/util/sha256.h"
 
 #include <array>
+#include <cstdint>
 #include <string>
 
 #include "absl/strings/escaping.h"
diff --git a/common/util/sha256_test.cc b/common/util/sha256_test.cc
index abc46e376..24eaee8bf 100644
--- a/common/util/sha256_test.cc
+++ b/common/util/sha256_test.cc
@@ -15,9 +15,7 @@
 #include "common/util/sha256.h"
 
 #include <array>
-#include <cstdio>
 #include <string>
-#include <vector>
 
 #include "absl/strings/escaping.h"
 #include "absl/strings/string_view.h"
diff --git a/common/util/simple_zip.cc b/common/util/simple_zip.cc
index feacc6ab9..f0026bc99 100644
--- a/common/util/simple_zip.cc
+++ b/common/util/simple_zip.cc
@@ -19,6 +19,7 @@
 #include <cstdio>
 #include <memory>
 #include <string>
+#include <utility>
 
 #include "absl/strings/string_view.h"
 #include "third_party/portable_endian/portable_endian.h"
diff --git a/common/util/subcommand.cc b/common/util/subcommand.cc
index 00b833762..d2fc977b5 100644
--- a/common/util/subcommand.cc
+++ b/common/util/subcommand.cc
@@ -15,6 +15,7 @@
 #include "common/util/subcommand.h"
 
 #include <iostream>
+#include <string>
 
 #include "absl/status/status.h"
 #include "absl/strings/str_cat.h"
diff --git a/common/util/subcommand.h b/common/util/subcommand.h
index de7fc413b..44fe7c8b3 100644
--- a/common/util/subcommand.h
+++ b/common/util/subcommand.h
@@ -19,6 +19,7 @@
 #include <iosfwd>
 #include <map>
 #include <string>
+#include <utility>
 #include <vector>
 
 #include "absl/status/status.h"
diff --git a/common/util/thread_pool.cc b/common/util/thread_pool.cc
index 091d44ce4..ecc046655 100644
--- a/common/util/thread_pool.cc
+++ b/common/util/thread_pool.cc
@@ -14,6 +14,10 @@
 
 #include "common/util/thread_pool.h"
 
+#include <functional>
+#include <mutex>
+#include <thread>
+
 namespace verible {
 ThreadPool::ThreadPool(int thread_count) {
   for (int i = 0; i < thread_count; ++i) {
diff --git a/common/util/thread_pool.h b/common/util/thread_pool.h
index bcd0c6cf4..e17189394 100644
--- a/common/util/thread_pool.h
+++ b/common/util/thread_pool.h
@@ -15,9 +15,12 @@
 #ifndef VERIBLE_COMMON_UTIL_THREAD_POOL_H
 #define VERIBLE_COMMON_UTIL_THREAD_POOL_H
 
+#include <condition_variable>
 #include <deque>
+#include <exception>
 #include <functional>
 #include <future>
+#include <mutex>
 #include <thread>
 #include <vector>
 
diff --git a/common/util/thread_pool_test.cc b/common/util/thread_pool_test.cc
index b7c61cc1a..4364079c3 100644
--- a/common/util/thread_pool_test.cc
+++ b/common/util/thread_pool_test.cc
@@ -15,6 +15,7 @@
 #include "common/util/thread_pool.h"
 
 #include <chrono>
+#include <future>
 #include <vector>
 
 #include "absl/time/clock.h"
diff --git a/common/util/type_traits_test.cc b/common/util/type_traits_test.cc
index 5ac33575a..bad038066 100644
--- a/common/util/type_traits_test.cc
+++ b/common/util/type_traits_test.cc
@@ -14,6 +14,8 @@
 
 #include "common/util/type_traits.h"
 
+#include <type_traits>
+
 #include "gmock/gmock.h"
 #include "gtest/gtest.h"
 
diff --git a/common/util/vector_tree_iterators.h b/common/util/vector_tree_iterators.h
index d80baa4d9..45f25d70a 100644
--- a/common/util/vector_tree_iterators.h
+++ b/common/util/vector_tree_iterators.h
@@ -17,6 +17,7 @@
 #ifndef VERIBLE_COMMON_UTIL_VECTOR_TREE_ITERATORS_H_
 #define VERIBLE_COMMON_UTIL_VECTOR_TREE_ITERATORS_H_
 
+#include <cstddef>
 #include <iterator>
 
 #include "common/util/iterator_range.h"
diff --git a/common/util/vector_tree_iterators_test.cc b/common/util/vector_tree_iterators_test.cc
index a92dd8f7e..179354cd3 100644
--- a/common/util/vector_tree_iterators_test.cc
+++ b/common/util/vector_tree_iterators_test.cc
@@ -16,6 +16,7 @@
 
 #include <cstddef>
 #include <iterator>
+#include <ostream>
 #include <sstream>
 #include <type_traits>
 #include <vector>
diff --git a/common/util/vector_tree_test.cc b/common/util/vector_tree_test.cc
index db64002fe..65b458105 100644
--- a/common/util/vector_tree_test.cc
+++ b/common/util/vector_tree_test.cc
@@ -16,6 +16,7 @@
 
 #include <cstddef>
 #include <iterator>
+#include <ostream>
 #include <sstream>
 #include <string>
 #include <utility>
diff --git a/verilog/CST/DPI.cc b/verilog/CST/DPI.cc
index c754d5897..e9c88024c 100644
--- a/verilog/CST/DPI.cc
+++ b/verilog/CST/DPI.cc
@@ -14,6 +14,8 @@
 
 #include "verilog/CST/DPI.h"
 
+#include <vector>
+
 #include "verilog/CST/verilog_matchers.h"
 
 namespace verilog {
diff --git a/verilog/CST/DPI_test.cc b/verilog/CST/DPI_test.cc
index acc70ae1f..399259e4e 100644
--- a/verilog/CST/DPI_test.cc
+++ b/verilog/CST/DPI_test.cc
@@ -15,6 +15,7 @@
 #include "verilog/CST/DPI.h"
 
 #include <utility>
+#include <vector>
 
 #include "common/analysis/syntax_tree_search.h"
 #include "common/analysis/syntax_tree_search_test_utils.h"
diff --git a/verilog/CST/class.h b/verilog/CST/class.h
index 9c36f7312..d484df7a1 100644
--- a/verilog/CST/class.h
+++ b/verilog/CST/class.h
@@ -18,6 +18,8 @@
 #ifndef VERIBLE_VERILOG_CST_CLASS_H_
 #define VERIBLE_VERILOG_CST_CLASS_H_
 
+#include <vector>
+
 #include "common/analysis/syntax_tree_search.h"
 #include "common/text/concrete_syntax_tree.h"
 
diff --git a/verilog/CST/declaration.cc b/verilog/CST/declaration.cc
index 10baddf92..2e2caaf02 100644
--- a/verilog/CST/declaration.cc
+++ b/verilog/CST/declaration.cc
@@ -17,6 +17,7 @@
 #include <map>
 #include <memory>
 #include <utility>
+#include <vector>
 
 #include "common/text/concrete_syntax_leaf.h"
 #include "common/text/concrete_syntax_tree.h"
diff --git a/verilog/CST/declaration.h b/verilog/CST/declaration.h
index c212bd91b..ff6ffd8aa 100644
--- a/verilog/CST/declaration.h
+++ b/verilog/CST/declaration.h
@@ -20,6 +20,7 @@
 // of std::forward in Make* helper functions.
 
 #include <utility>
+#include <vector>
 
 #include "common/analysis/syntax_tree_search.h"
 #include "common/text/concrete_syntax_tree.h"
diff --git a/verilog/CST/expression.h b/verilog/CST/expression.h
index e872c354b..c1e248cc1 100644
--- a/verilog/CST/expression.h
+++ b/verilog/CST/expression.h
@@ -20,6 +20,7 @@
 // of std::forward in Make* helper functions.
 
 #include <utility>
+#include <vector>
 
 #include "common/analysis/syntax_tree_search.h"
 #include "common/text/concrete_syntax_tree.h"
diff --git a/verilog/CST/expression_test.cc b/verilog/CST/expression_test.cc
index e4d254bf0..397f568db 100644
--- a/verilog/CST/expression_test.cc
+++ b/verilog/CST/expression_test.cc
@@ -16,6 +16,7 @@
 
 #include <memory>
 #include <utility>
+#include <vector>
 
 #include "common/analysis/syntax_tree_search.h"
 #include "common/analysis/syntax_tree_search_test_utils.h"
diff --git a/verilog/CST/macro.cc b/verilog/CST/macro.cc
index 89681d9f1..2c6ee36eb 100644
--- a/verilog/CST/macro.cc
+++ b/verilog/CST/macro.cc
@@ -17,6 +17,8 @@
 
 #include "verilog/CST/macro.h"
 
+#include <vector>
+
 #include "common/text/tree_utils.h"
 #include "verilog/CST/verilog_matchers.h"
 #include "verilog/CST/verilog_nonterminals.h"
diff --git a/verilog/CST/macro_test.cc b/verilog/CST/macro_test.cc
index e48a81821..8b84b30cb 100644
--- a/verilog/CST/macro_test.cc
+++ b/verilog/CST/macro_test.cc
@@ -14,6 +14,8 @@
 
 #include "verilog/CST/macro.h"
 
+#include <vector>
+
 #include "common/analysis/syntax_tree_search.h"
 #include "common/analysis/syntax_tree_search_test_utils.h"
 #include "common/text/text_structure.h"
diff --git a/verilog/CST/match_test_utils.cc b/verilog/CST/match_test_utils.cc
index dbef328de..c4bc1614f 100644
--- a/verilog/CST/match_test_utils.cc
+++ b/verilog/CST/match_test_utils.cc
@@ -14,6 +14,7 @@
 
 #include "verilog/CST/match_test_utils.h"
 
+#include <functional>
 #include <sstream>
 #include <vector>
 
diff --git a/verilog/CST/numbers.cc b/verilog/CST/numbers.cc
index a411cb4fe..925537a07 100644
--- a/verilog/CST/numbers.cc
+++ b/verilog/CST/numbers.cc
@@ -17,6 +17,7 @@
 #include <algorithm>
 #include <cctype>
 #include <iterator>
+#include <ostream>
 #include <string>
 
 #include "absl/strings/match.h"
diff --git a/verilog/CST/type.cc b/verilog/CST/type.cc
index 2c16b2976..81140e10e 100644
--- a/verilog/CST/type.cc
+++ b/verilog/CST/type.cc
@@ -14,6 +14,7 @@
 
 #include "verilog/CST/type.h"
 
+#include <utility>
 #include <vector>
 
 #include "common/analysis/matcher/matcher.h"
diff --git a/verilog/CST/verilog_tree_json.cc b/verilog/CST/verilog_tree_json.cc
index fae95abd8..1806047ff 100644
--- a/verilog/CST/verilog_tree_json.cc
+++ b/verilog/CST/verilog_tree_json.cc
@@ -14,6 +14,9 @@
 
 #include "verilog/CST/verilog_tree_json.h"
 
+#include <ostream>
+#include <utility>
+
 #include "absl/strings/string_view.h"
 #include "common/text/concrete_syntax_leaf.h"
 #include "common/text/concrete_syntax_tree.h"
diff --git a/verilog/analysis/checkers/always_comb_rule.cc b/verilog/analysis/checkers/always_comb_rule.cc
index 1fdda4bfd..cd3e4385e 100644
--- a/verilog/analysis/checkers/always_comb_rule.cc
+++ b/verilog/analysis/checkers/always_comb_rule.cc
@@ -16,6 +16,7 @@
 
 #include <set>
 #include <string>
+#include <vector>
 
 #include "absl/strings/str_cat.h"
 #include "absl/strings/string_view.h"
diff --git a/verilog/analysis/checkers/always_ff_non_blocking_rule.cc b/verilog/analysis/checkers/always_ff_non_blocking_rule.cc
index 4d3fabb6c..b331cbf18 100644
--- a/verilog/analysis/checkers/always_ff_non_blocking_rule.cc
+++ b/verilog/analysis/checkers/always_ff_non_blocking_rule.cc
@@ -14,6 +14,8 @@
 
 #include "verilog/analysis/checkers/always_ff_non_blocking_rule.h"
 
+#include <algorithm>
+#include <ostream>
 #include <set>
 #include <string>
 
diff --git a/verilog/analysis/checkers/always_ff_non_blocking_rule.h b/verilog/analysis/checkers/always_ff_non_blocking_rule.h
index 5e041bdc1..0ced19c53 100644
--- a/verilog/analysis/checkers/always_ff_non_blocking_rule.h
+++ b/verilog/analysis/checkers/always_ff_non_blocking_rule.h
@@ -18,6 +18,7 @@
 #include <set>
 #include <stack>
 #include <string>
+#include <vector>
 
 #include "common/analysis/lint_rule_status.h"
 #include "common/analysis/syntax_tree_lint_rule.h"
diff --git a/verilog/analysis/checkers/disable_statement_rule.cc b/verilog/analysis/checkers/disable_statement_rule.cc
index 46df21989..b3b7373b9 100644
--- a/verilog/analysis/checkers/disable_statement_rule.cc
+++ b/verilog/analysis/checkers/disable_statement_rule.cc
@@ -14,6 +14,7 @@
 
 #include "verilog/analysis/checkers/disable_statement_rule.h"
 
+#include <iterator>
 #include <set>
 #include <string>
 
diff --git a/verilog/analysis/checkers/explicit_parameter_storage_type_rule.cc b/verilog/analysis/checkers/explicit_parameter_storage_type_rule.cc
index 3998cf024..82e9ee5b7 100644
--- a/verilog/analysis/checkers/explicit_parameter_storage_type_rule.cc
+++ b/verilog/analysis/checkers/explicit_parameter_storage_type_rule.cc
@@ -16,6 +16,7 @@
 
 #include <set>
 #include <string>
+#include <vector>
 
 #include "absl/strings/str_cat.h"
 #include "absl/strings/str_split.h"
diff --git a/verilog/analysis/checkers/numeric_format_string_style_rule.cc b/verilog/analysis/checkers/numeric_format_string_style_rule.cc
index faf3e6035..55271c0c7 100644
--- a/verilog/analysis/checkers/numeric_format_string_style_rule.cc
+++ b/verilog/analysis/checkers/numeric_format_string_style_rule.cc
@@ -14,6 +14,7 @@
 
 #include "verilog/analysis/checkers/numeric_format_string_style_rule.h"
 
+#include <algorithm>
 #include <set>
 #include <string>
 
diff --git a/verilog/analysis/checkers/package_filename_rule.cc b/verilog/analysis/checkers/package_filename_rule.cc
index 53b763008..c216ce73f 100644
--- a/verilog/analysis/checkers/package_filename_rule.cc
+++ b/verilog/analysis/checkers/package_filename_rule.cc
@@ -14,6 +14,7 @@
 
 #include "verilog/analysis/checkers/package_filename_rule.h"
 
+#include <algorithm>
 #include <memory>
 #include <set>
 #include <string>
diff --git a/verilog/analysis/checkers/parameter_name_style_rule.cc b/verilog/analysis/checkers/parameter_name_style_rule.cc
index 3890c612f..dcbf93d1c 100644
--- a/verilog/analysis/checkers/parameter_name_style_rule.cc
+++ b/verilog/analysis/checkers/parameter_name_style_rule.cc
@@ -16,6 +16,8 @@
 
 #include <set>
 #include <string>
+#include <utility>
+#include <vector>
 
 #include "absl/strings/str_cat.h"
 #include "absl/strings/string_view.h"
diff --git a/verilog/analysis/checkers/port_name_suffix_rule.cc b/verilog/analysis/checkers/port_name_suffix_rule.cc
index 8fa0e9bf7..4cd2edada 100644
--- a/verilog/analysis/checkers/port_name_suffix_rule.cc
+++ b/verilog/analysis/checkers/port_name_suffix_rule.cc
@@ -14,8 +14,10 @@
 
 #include "verilog/analysis/checkers/port_name_suffix_rule.h"
 
+#include <map>
 #include <set>
 #include <string>
+#include <vector>
 
 #include "absl/strings/match.h"
 #include "absl/strings/str_cat.h"
diff --git a/verilog/analysis/checkers/suggest_parentheses_rule.h b/verilog/analysis/checkers/suggest_parentheses_rule.h
index 61af79b02..306e71cdd 100644
--- a/verilog/analysis/checkers/suggest_parentheses_rule.h
+++ b/verilog/analysis/checkers/suggest_parentheses_rule.h
@@ -15,6 +15,8 @@
 #ifndef VERIBLE_VERILOG_ANALYSIS_CHECKERS_SUGGEST_PARENTHESES_RULE_H_
 #define VERIBLE_VERILOG_ANALYSIS_CHECKERS_SUGGEST_PARENTHESES_RULE_H_
 
+#include <set>
+
 #include "common/analysis/syntax_tree_lint_rule.h"
 #include "verilog/analysis/descriptions.h"
 
diff --git a/verilog/analysis/checkers/suggest_parentheses_rule_test.cc b/verilog/analysis/checkers/suggest_parentheses_rule_test.cc
index 41030a2e9..ef0d93edd 100644
--- a/verilog/analysis/checkers/suggest_parentheses_rule_test.cc
+++ b/verilog/analysis/checkers/suggest_parentheses_rule_test.cc
@@ -14,6 +14,8 @@
 
 #include "verilog/analysis/checkers/suggest_parentheses_rule.h"
 
+#include <initializer_list>
+
 #include "common/analysis/syntax_tree_linter_test_utils.h"
 #include "verilog/analysis/verilog_analyzer.h"
 
diff --git a/verilog/analysis/checkers/truncated_numeric_literal_rule.cc b/verilog/analysis/checkers/truncated_numeric_literal_rule.cc
index 763949ce2..74afbf475 100644
--- a/verilog/analysis/checkers/truncated_numeric_literal_rule.cc
+++ b/verilog/analysis/checkers/truncated_numeric_literal_rule.cc
@@ -14,6 +14,7 @@
 
 #include "verilog/analysis/checkers/truncated_numeric_literal_rule.h"
 
+#include <algorithm>
 #include <cmath>
 #include <cstddef>
 #include <set>
diff --git a/verilog/analysis/checkers/truncated_numeric_literal_rule_test.cc b/verilog/analysis/checkers/truncated_numeric_literal_rule_test.cc
index 0e3cf8d0c..d994b0586 100644
--- a/verilog/analysis/checkers/truncated_numeric_literal_rule_test.cc
+++ b/verilog/analysis/checkers/truncated_numeric_literal_rule_test.cc
@@ -15,6 +15,7 @@
 #include "verilog/analysis/checkers/truncated_numeric_literal_rule.h"
 
 #include <initializer_list>
+#include <string>
 
 #include "common/analysis/linter_test_utils.h"
 #include "common/analysis/syntax_tree_linter_test_utils.h"
diff --git a/verilog/analysis/checkers/undersized_binary_literal_rule.cc b/verilog/analysis/checkers/undersized_binary_literal_rule.cc
index 1d52f87b0..09a387eb4 100644
--- a/verilog/analysis/checkers/undersized_binary_literal_rule.cc
+++ b/verilog/analysis/checkers/undersized_binary_literal_rule.cc
@@ -18,6 +18,7 @@
 #include <cstddef>
 #include <set>
 #include <string>
+#include <vector>
 
 #include "absl/strings/numbers.h"
 #include "absl/strings/str_cat.h"
diff --git a/verilog/analysis/checkers/uvm_macro_semicolon_rule.h b/verilog/analysis/checkers/uvm_macro_semicolon_rule.h
index 6481c5409..d06915546 100644
--- a/verilog/analysis/checkers/uvm_macro_semicolon_rule.h
+++ b/verilog/analysis/checkers/uvm_macro_semicolon_rule.h
@@ -15,6 +15,7 @@
 #ifndef VERIBLE_VERILOG_ANALYSIS_CHECKERS_UVM_MACRO_SEMICOLON_RULE_H_
 #define VERIBLE_VERILOG_ANALYSIS_CHECKERS_UVM_MACRO_SEMICOLON_RULE_H_
 
+#include <set>
 #include <string>
 
 #include "common/analysis/lint_rule_status.h"
diff --git a/verilog/analysis/checkers/void_cast_rule_test.cc b/verilog/analysis/checkers/void_cast_rule_test.cc
index 27e59aa01..9b15a3c28 100644
--- a/verilog/analysis/checkers/void_cast_rule_test.cc
+++ b/verilog/analysis/checkers/void_cast_rule_test.cc
@@ -14,6 +14,8 @@
 
 #include "verilog/analysis/checkers/void_cast_rule.h"
 
+#include <initializer_list>
+
 #include "common/analysis/linter_test_utils.h"
 #include "common/analysis/syntax_tree_linter_test_utils.h"
 #include "common/text/symbol.h"
diff --git a/verilog/analysis/dependencies.cc b/verilog/analysis/dependencies.cc
index 2dd39430d..1ffa7ba73 100644
--- a/verilog/analysis/dependencies.cc
+++ b/verilog/analysis/dependencies.cc
@@ -14,6 +14,7 @@
 
 #include "verilog/analysis/dependencies.h"
 
+#include <functional>
 #include <iostream>
 
 #include "common/strings/compare.h"
diff --git a/verilog/analysis/dependencies_test.cc b/verilog/analysis/dependencies_test.cc
index 97c7f7c68..d2c294aa1 100644
--- a/verilog/analysis/dependencies_test.cc
+++ b/verilog/analysis/dependencies_test.cc
@@ -14,6 +14,10 @@
 
 #include "verilog/analysis/dependencies.h"
 
+#include <ostream>
+#include <string>
+#include <vector>
+
 #include "absl/status/status.h"
 #include "common/util/file_util.h"
 #include "gmock/gmock.h"
diff --git a/verilog/analysis/extractors.cc b/verilog/analysis/extractors.cc
index 9f74bf10c..fdb3e950a 100644
--- a/verilog/analysis/extractors.cc
+++ b/verilog/analysis/extractors.cc
@@ -14,6 +14,7 @@
 
 #include "verilog/analysis/extractors.h"
 
+#include <set>
 #include <string>
 
 #include "verilog/CST/identifier.h"
diff --git a/verilog/analysis/extractors_test.cc b/verilog/analysis/extractors_test.cc
index 7df644efa..5480140f4 100644
--- a/verilog/analysis/extractors_test.cc
+++ b/verilog/analysis/extractors_test.cc
@@ -14,6 +14,10 @@
 
 #include "verilog/analysis/extractors.h"
 
+#include <set>
+#include <string>
+#include <utility>
+
 #include "absl/strings/string_view.h"
 #include "gtest/gtest.h"
 
diff --git a/verilog/analysis/flow_tree.h b/verilog/analysis/flow_tree.h
index c5ed13a8e..462e2b580 100644
--- a/verilog/analysis/flow_tree.h
+++ b/verilog/analysis/flow_tree.h
@@ -16,8 +16,10 @@
 #define VERIBLE_VERILOG_FLOW_TREE_H_
 
 #include <bitset>
+#include <functional>
 #include <map>
 #include <string>
+#include <utility>
 #include <vector>
 
 #include "absl/status/status.h"
diff --git a/verilog/analysis/lint_rule_registry.cc b/verilog/analysis/lint_rule_registry.cc
index ed09b123e..dab3867dd 100644
--- a/verilog/analysis/lint_rule_registry.cc
+++ b/verilog/analysis/lint_rule_registry.cc
@@ -15,6 +15,7 @@
 #include "verilog/analysis/lint_rule_registry.h"
 
 #include <memory>
+#include <set>
 #include <string>
 #include <vector>
 
diff --git a/verilog/analysis/symbol_table.cc b/verilog/analysis/symbol_table.cc
index 0500771db..15a13154d 100644
--- a/verilog/analysis/symbol_table.cc
+++ b/verilog/analysis/symbol_table.cc
@@ -14,10 +14,14 @@
 
 #include "verilog/analysis/symbol_table.h"
 
+#include <algorithm>
 #include <iostream>
 #include <memory>
 #include <sstream>
 #include <stack>
+#include <string>
+#include <utility>
+#include <vector>
 
 #include "absl/status/status.h"
 #include "absl/strings/str_format.h"
diff --git a/verilog/analysis/symbol_table.h b/verilog/analysis/symbol_table.h
index bdc9d848e..e678a0412 100644
--- a/verilog/analysis/symbol_table.h
+++ b/verilog/analysis/symbol_table.h
@@ -18,6 +18,11 @@
 #include <functional>
 #include <iosfwd>
 #include <map>
+#include <memory>
+#include <set>
+#include <string>
+#include <utility>
+#include <vector>
 
 #include "absl/status/status.h"
 #include "absl/strings/string_view.h"
diff --git a/verilog/analysis/verilog_analyzer.cc b/verilog/analysis/verilog_analyzer.cc
index cbb0ccb86..3f582d527 100644
--- a/verilog/analysis/verilog_analyzer.cc
+++ b/verilog/analysis/verilog_analyzer.cc
@@ -21,6 +21,7 @@
 #include <cstddef>
 #include <iterator>
 #include <memory>
+#include <ostream>
 #include <string>
 #include <utility>
 #include <vector>
diff --git a/verilog/analysis/verilog_analyzer.h b/verilog/analysis/verilog_analyzer.h
index c81d2bbe7..068364538 100644
--- a/verilog/analysis/verilog_analyzer.h
+++ b/verilog/analysis/verilog_analyzer.h
@@ -19,6 +19,7 @@
 #include <iosfwd>
 #include <memory>
 #include <string>
+#include <utility>
 
 #include "absl/status/status.h"
 #include "absl/strings/string_view.h"
diff --git a/verilog/analysis/verilog_equivalence.cc b/verilog/analysis/verilog_equivalence.cc
index 41f9de361..57477599e 100644
--- a/verilog/analysis/verilog_equivalence.cc
+++ b/verilog/analysis/verilog_equivalence.cc
@@ -19,6 +19,7 @@
 
 #include <algorithm>
 #include <cstddef>
+#include <functional>
 #include <iostream>
 #include <iterator>
 #include <string>
diff --git a/verilog/analysis/verilog_equivalence_test.cc b/verilog/analysis/verilog_equivalence_test.cc
index aa4f0c592..954c2dea1 100644
--- a/verilog/analysis/verilog_equivalence_test.cc
+++ b/verilog/analysis/verilog_equivalence_test.cc
@@ -14,8 +14,10 @@
 
 #include "verilog/analysis/verilog_equivalence.h"
 
+#include <functional>
 #include <iostream>
 #include <memory>
+#include <sstream>
 #include <vector>
 
 #include "absl/status/status.h"
diff --git a/verilog/analysis/verilog_filelist.cc b/verilog/analysis/verilog_filelist.cc
index 1b03b736c..648aad4e6 100644
--- a/verilog/analysis/verilog_filelist.cc
+++ b/verilog/analysis/verilog_filelist.cc
@@ -18,6 +18,7 @@
 #include <iostream>
 #include <sstream>
 #include <string>
+#include <utility>
 #include <vector>
 
 #include "absl/status/status.h"
diff --git a/verilog/analysis/verilog_filelist.h b/verilog/analysis/verilog_filelist.h
index 028b22a0c..11af3cb08 100644
--- a/verilog/analysis/verilog_filelist.h
+++ b/verilog/analysis/verilog_filelist.h
@@ -16,6 +16,7 @@
 #define VERIBLE_VERILOG_ANALYSIS_VERILOG_FILELIST_H_
 
 #include <string>
+#include <utility>
 #include <vector>
 
 #include "absl/status/status.h"
diff --git a/verilog/analysis/verilog_filelist_test.cc b/verilog/analysis/verilog_filelist_test.cc
index d945b642a..26b0fe77e 100644
--- a/verilog/analysis/verilog_filelist_test.cc
+++ b/verilog/analysis/verilog_filelist_test.cc
@@ -14,6 +14,9 @@
 
 #include "verilog/analysis/verilog_filelist.h"
 
+#include <string>
+#include <vector>
+
 #include "common/util/file_util.h"
 #include "gmock/gmock.h"
 #include "gtest/gtest.h"
diff --git a/verilog/analysis/verilog_linter.cc b/verilog/analysis/verilog_linter.cc
index d5fe1bd34..4ef502957 100644
--- a/verilog/analysis/verilog_linter.cc
+++ b/verilog/analysis/verilog_linter.cc
@@ -17,8 +17,11 @@
 #include <cstddef>
 #include <fstream>
 #include <iomanip>
+#include <ios>
 #include <map>
 #include <memory>
+#include <ostream>
+#include <set>
 #include <sstream>
 #include <string>
 #include <utility>
diff --git a/verilog/analysis/verilog_linter.h b/verilog/analysis/verilog_linter.h
index 49ffaee5a..417e22c06 100644
--- a/verilog/analysis/verilog_linter.h
+++ b/verilog/analysis/verilog_linter.h
@@ -16,6 +16,7 @@
 #define VERIBLE_VERILOG_ANALYSIS_VERILOG_LINTER_H_
 
 #include <iosfwd>
+#include <set>
 #include <string>
 #include <vector>
 
diff --git a/verilog/analysis/verilog_linter_configuration.cc b/verilog/analysis/verilog_linter_configuration.cc
index 3f8a001f5..04f0b687b 100644
--- a/verilog/analysis/verilog_linter_configuration.cc
+++ b/verilog/analysis/verilog_linter_configuration.cc
@@ -16,8 +16,10 @@
 
 #include <algorithm>
 #include <functional>
+#include <iostream>
 #include <map>
 #include <memory>
+#include <set>
 #include <sstream>
 #include <string>
 #include <vector>
diff --git a/verilog/analysis/verilog_linter_test.cc b/verilog/analysis/verilog_linter_test.cc
index b7352fb47..c66729827 100644
--- a/verilog/analysis/verilog_linter_test.cc
+++ b/verilog/analysis/verilog_linter_test.cc
@@ -24,6 +24,8 @@
 #include <fstream>
 #include <iterator>
 #include <memory>
+#include <ostream>
+#include <set>
 #include <sstream>  // IWYU pragma: keep  // for ostringstream
 #include <string>
 #include <utility>
diff --git a/verilog/analysis/verilog_project.cc b/verilog/analysis/verilog_project.cc
index 43b30f6e7..97bd9f043 100644
--- a/verilog/analysis/verilog_project.cc
+++ b/verilog/analysis/verilog_project.cc
@@ -18,6 +18,7 @@
 #include <iostream>
 #include <memory>
 #include <string>
+#include <utility>
 #include <vector>
 
 #include "absl/status/status.h"
diff --git a/verilog/analysis/verilog_project.h b/verilog/analysis/verilog_project.h
index 24210e55e..3f1aca422 100644
--- a/verilog/analysis/verilog_project.h
+++ b/verilog/analysis/verilog_project.h
@@ -15,9 +15,12 @@
 #ifndef VERIBLE_VERILOG_ANALYSIS_VERILOG_PROJECT_H_
 #define VERIBLE_VERILOG_ANALYSIS_VERILOG_PROJECT_H_
 
+#include <algorithm>
 #include <map>
 #include <memory>
+#include <ostream>
 #include <string>
+#include <utility>
 #include <vector>
 
 #include "absl/status/status.h"
diff --git a/verilog/analysis/verilog_project_test.cc b/verilog/analysis/verilog_project_test.cc
index 5b1702f95..13eeace0f 100644
--- a/verilog/analysis/verilog_project_test.cc
+++ b/verilog/analysis/verilog_project_test.cc
@@ -15,6 +15,9 @@
 #include "verilog/analysis/verilog_project.h"
 
 #include <memory>
+#include <sstream>
+#include <string>
+#include <vector>
 
 #include "absl/strings/match.h"
 #include "common/text/text_structure.h"
diff --git a/verilog/formatting/align.cc b/verilog/formatting/align.cc
index 5997e5cae..c78f92e78 100644
--- a/verilog/formatting/align.cc
+++ b/verilog/formatting/align.cc
@@ -18,6 +18,7 @@
 #include <functional>
 #include <iostream>
 #include <iterator>
+#include <limits>
 #include <map>
 #include <vector>
 
diff --git a/verilog/formatting/comment_controls.cc b/verilog/formatting/comment_controls.cc
index 5363b7dbd..a641521ff 100644
--- a/verilog/formatting/comment_controls.cc
+++ b/verilog/formatting/comment_controls.cc
@@ -14,7 +14,9 @@
 
 #include "verilog/formatting/comment_controls.h"
 
+#include <algorithm>
 #include <iostream>
+#include <iterator>
 #include <vector>
 
 #include "absl/strings/match.h"
diff --git a/verilog/formatting/comment_controls.h b/verilog/formatting/comment_controls.h
index d14397822..828d1c70f 100644
--- a/verilog/formatting/comment_controls.h
+++ b/verilog/formatting/comment_controls.h
@@ -15,6 +15,8 @@
 #ifndef VERIBLE_VERILOG_FORMATTING_COMMENT_CONTROLS_H_
 #define VERIBLE_VERILOG_FORMATTING_COMMENT_CONTROLS_H_
 
+#include <ostream>
+
 #include "absl/strings/string_view.h"
 #include "common/strings/line_column_map.h"
 #include "common/strings/position.h"  // for ByteOffsetSet, LineNumberSet
diff --git a/verilog/formatting/comment_controls_test.cc b/verilog/formatting/comment_controls_test.cc
index a41c76637..48560f088 100644
--- a/verilog/formatting/comment_controls_test.cc
+++ b/verilog/formatting/comment_controls_test.cc
@@ -15,6 +15,8 @@
 #include "verilog/formatting/comment_controls.h"
 
 #include <initializer_list>
+#include <sstream>
+#include <utility>
 
 #include "absl/strings/str_join.h"
 #include "common/strings/line_column_map.h"
diff --git a/verilog/formatting/formatter.cc b/verilog/formatting/formatter.cc
index dafe89a79..bbd1debbd 100644
--- a/verilog/formatting/formatter.cc
+++ b/verilog/formatting/formatter.cc
@@ -16,8 +16,13 @@
 
 #include <algorithm>
 #include <cstddef>
+#include <cstdlib>
+#include <functional>
 #include <iostream>
 #include <iterator>
+#include <memory>
+#include <sstream>
+#include <string>
 #include <vector>
 
 #include "absl/status/status.h"
diff --git a/verilog/formatting/formatter.h b/verilog/formatting/formatter.h
index 69e21256c..ff1789b5b 100644
--- a/verilog/formatting/formatter.h
+++ b/verilog/formatting/formatter.h
@@ -16,6 +16,7 @@
 #define VERIBLE_VERILOG_FORMATTING_FORMATTER_H_
 
 #include <iosfwd>
+#include <string>
 #include <vector>
 
 #include "absl/status/status.h"
diff --git a/verilog/formatting/formatter_test.cc b/verilog/formatting/formatter_test.cc
index b72202d40..9a0f431b9 100644
--- a/verilog/formatting/formatter_test.cc
+++ b/verilog/formatting/formatter_test.cc
@@ -20,6 +20,7 @@
 
 #include "verilog/formatting/formatter.h"
 
+#include <cstddef>
 #include <memory>
 #include <sstream>
 #include <string>
diff --git a/verilog/formatting/token_annotator.cc b/verilog/formatting/token_annotator.cc
index 8e418a8e8..eb65ec27d 100644
--- a/verilog/formatting/token_annotator.cc
+++ b/verilog/formatting/token_annotator.cc
@@ -14,7 +14,9 @@
 
 #include "verilog/formatting/token_annotator.h"
 
+#include <algorithm>
 #include <iterator>
+#include <utility>
 #include <vector>
 
 #include "absl/strings/match.h"
diff --git a/verilog/formatting/tree_unwrapper.cc b/verilog/formatting/tree_unwrapper.cc
index 6ca906b4a..5e217f777 100644
--- a/verilog/formatting/tree_unwrapper.cc
+++ b/verilog/formatting/tree_unwrapper.cc
@@ -15,9 +15,12 @@
 #include "verilog/formatting/tree_unwrapper.h"
 
 #include <algorithm>
+#include <cstddef>
+#include <functional>
 #include <initializer_list>
 #include <iterator>
 #include <ostream>
+#include <string>
 #include <type_traits>
 #include <utility>
 #include <vector>
diff --git a/verilog/parser/verilog_lexer.cc b/verilog/parser/verilog_lexer.cc
index 82cba8a09..e1e8ae073 100644
--- a/verilog/parser/verilog_lexer.cc
+++ b/verilog/parser/verilog_lexer.cc
@@ -14,6 +14,8 @@
 
 #include "verilog/parser/verilog_lexer.h"
 
+#include <functional>
+
 #include "absl/strings/string_view.h"
 #include "common/text/token_info.h"
 #include "verilog/parser/verilog_token_enum.h"
diff --git a/verilog/parser/verilog_lexer.h b/verilog/parser/verilog_lexer.h
index 46713ab33..5779dcc86 100644
--- a/verilog/parser/verilog_lexer.h
+++ b/verilog/parser/verilog_lexer.h
@@ -29,6 +29,8 @@
 #  undef yyFlexLexer  // this is how FlexLexer.h says to do things
 #  define yyFlexLexer verilogFlexLexer
 #  include <FlexLexer.h>
+
+#include <functional>
 #endif
 // clang-format on
 
diff --git a/verilog/parser/verilog_lexer_unittest.cc b/verilog/parser/verilog_lexer_unittest.cc
index 670e6c535..3f974099a 100644
--- a/verilog/parser/verilog_lexer_unittest.cc
+++ b/verilog/parser/verilog_lexer_unittest.cc
@@ -17,6 +17,7 @@
 
 #include <initializer_list>
 #include <utility>
+#include <vector>
 
 #include "absl/strings/string_view.h"
 #include "common/lexer/lexer_test_util.h"
diff --git a/verilog/preprocessor/verilog_preprocess.cc b/verilog/preprocessor/verilog_preprocess.cc
index b8e2b21f4..3133cf19a 100644
--- a/verilog/preprocessor/verilog_preprocess.cc
+++ b/verilog/preprocessor/verilog_preprocess.cc
@@ -18,6 +18,7 @@
 #include <filesystem>
 #include <functional>
 #include <iterator>
+#include <map>
 #include <memory>
 #include <string>
 #include <utility>
diff --git a/verilog/preprocessor/verilog_preprocess_test.cc b/verilog/preprocessor/verilog_preprocess_test.cc
index cb72019ca..e97d1059e 100644
--- a/verilog/preprocessor/verilog_preprocess_test.cc
+++ b/verilog/preprocessor/verilog_preprocess_test.cc
@@ -16,6 +16,7 @@
 
 #include <algorithm>
 #include <map>
+#include <string>
 #include <vector>
 
 #include "absl/status/status.h"
diff --git a/verilog/tools/diff/verilog_diff.cc b/verilog/tools/diff/verilog_diff.cc
index 683eb3a5d..30bff7835 100644
--- a/verilog/tools/diff/verilog_diff.cc
+++ b/verilog/tools/diff/verilog_diff.cc
@@ -21,7 +21,9 @@
 // Example usage:
 // verilog_diff [options] file1 file2
 
+#include <functional>
 #include <iostream>
+#include <map>
 #include <sstream>  // IWYU pragma: keep  // for ostringstream
 #include <string>   // for string, allocator, etc
 
diff --git a/verilog/tools/kythe/indexing_facts_tree.cc b/verilog/tools/kythe/indexing_facts_tree.cc
index da99147fd..c03506593 100644
--- a/verilog/tools/kythe/indexing_facts_tree.cc
+++ b/verilog/tools/kythe/indexing_facts_tree.cc
@@ -16,6 +16,8 @@
 
 #include <algorithm>
 #include <iostream>
+#include <string>
+#include <tuple>
 
 #include "absl/memory/memory.h"
 #include "absl/strings/str_cat.h"
diff --git a/verilog/tools/kythe/indexing_facts_tree.h b/verilog/tools/kythe/indexing_facts_tree.h
index 4e6f5bf1c..eaf56c68e 100644
--- a/verilog/tools/kythe/indexing_facts_tree.h
+++ b/verilog/tools/kythe/indexing_facts_tree.h
@@ -18,6 +18,7 @@
 #include <cstddef>
 #include <memory>
 #include <optional>
+#include <ostream>
 #include <string>
 #include <utility>
 #include <vector>
diff --git a/verilog/tools/kythe/indexing_facts_tree_extractor.cc b/verilog/tools/kythe/indexing_facts_tree_extractor.cc
index 810512d85..75008740d 100644
--- a/verilog/tools/kythe/indexing_facts_tree_extractor.cc
+++ b/verilog/tools/kythe/indexing_facts_tree_extractor.cc
@@ -15,7 +15,10 @@
 #include "verilog/tools/kythe/indexing_facts_tree_extractor.h"
 
 #include <iostream>
+#include <iterator>
+#include <set>
 #include <string>
+#include <utility>
 #include <vector>
 
 #include "absl/status/status.h"
diff --git a/verilog/tools/kythe/indexing_facts_tree_extractor_test.cc b/verilog/tools/kythe/indexing_facts_tree_extractor_test.cc
index 6b13ff1a2..7cf158702 100644
--- a/verilog/tools/kythe/indexing_facts_tree_extractor_test.cc
+++ b/verilog/tools/kythe/indexing_facts_tree_extractor_test.cc
@@ -16,6 +16,7 @@
 
 #include <functional>
 #include <string>
+#include <vector>
 
 #include "absl/status/status.h"
 #include "common/analysis/syntax_tree_search_test_utils.h"
diff --git a/verilog/tools/kythe/indexing_facts_tree_test.cc b/verilog/tools/kythe/indexing_facts_tree_test.cc
index a0ba9de17..0440341a3 100644
--- a/verilog/tools/kythe/indexing_facts_tree_test.cc
+++ b/verilog/tools/kythe/indexing_facts_tree_test.cc
@@ -15,6 +15,7 @@
 #include "verilog/tools/kythe/indexing_facts_tree.h"
 
 #include <sstream>
+#include <string>
 
 #include "absl/memory/memory.h"
 #include "absl/strings/match.h"
diff --git a/verilog/tools/kythe/kythe_facts.cc b/verilog/tools/kythe/kythe_facts.cc
index 5621e87b0..f587d4cc3 100644
--- a/verilog/tools/kythe/kythe_facts.cc
+++ b/verilog/tools/kythe/kythe_facts.cc
@@ -20,6 +20,7 @@
 #include <string>
 #include <tuple>
 #include <utility>
+#include <vector>
 
 #include "absl/hash/hash.h"
 #include "absl/log/check.h"
diff --git a/verilog/tools/kythe/kythe_proto_output.cc b/verilog/tools/kythe/kythe_proto_output.cc
index a2b807dca..65a295f79 100644
--- a/verilog/tools/kythe/kythe_proto_output.cc
+++ b/verilog/tools/kythe/kythe_proto_output.cc
@@ -14,6 +14,8 @@
 
 #include "verilog/tools/kythe/kythe_proto_output.h"
 
+#include <string>
+
 #include "google/protobuf/io/coded_stream.h"
 #include "google/protobuf/io/zero_copy_stream_impl.h"
 #include "third_party/proto/kythe/storage.pb.h"
diff --git a/verilog/tools/kythe/scope_resolver.cc b/verilog/tools/kythe/scope_resolver.cc
index b371e0945..70aed78cf 100644
--- a/verilog/tools/kythe/scope_resolver.cc
+++ b/verilog/tools/kythe/scope_resolver.cc
@@ -15,6 +15,7 @@
 #include "verilog/tools/kythe/scope_resolver.h"
 
 #include <optional>
+#include <string>
 #include <vector>
 
 #include "absl/container/flat_hash_set.h"
diff --git a/verilog/tools/kythe/scope_resolver.h b/verilog/tools/kythe/scope_resolver.h
index 0acbbc5fb..4571ca330 100644
--- a/verilog/tools/kythe/scope_resolver.h
+++ b/verilog/tools/kythe/scope_resolver.h
@@ -18,6 +18,7 @@
 #include <map>
 #include <optional>
 #include <set>
+#include <string>
 #include <utility>
 #include <vector>
 
diff --git a/verilog/tools/kythe/verilog_kythe_extractor.cc b/verilog/tools/kythe/verilog_kythe_extractor.cc
index d2582f850..17cdf487b 100644
--- a/verilog/tools/kythe/verilog_kythe_extractor.cc
+++ b/verilog/tools/kythe/verilog_kythe_extractor.cc
@@ -15,7 +15,9 @@
 #include <deque>
 #include <fstream>
 #include <iostream>
+#include <sstream>
 #include <string>
+#include <vector>
 
 #include "absl/flags/flag.h"
 #include "absl/status/status.h"
diff --git a/verilog/tools/lint/verilog_lint.cc b/verilog/tools/lint/verilog_lint.cc
index fce9f48dc..81fc2ff09 100644
--- a/verilog/tools/lint/verilog_lint.cc
+++ b/verilog/tools/lint/verilog_lint.cc
@@ -18,6 +18,7 @@
 // Example usage:
 // verilog_lint files...
 
+#include <algorithm>
 #include <fstream>
 #include <iostream>
 #include <memory>
diff --git a/verilog/tools/ls/autoexpand.cc b/verilog/tools/ls/autoexpand.cc
index a8ab9ba55..e635ea919 100644
--- a/verilog/tools/ls/autoexpand.cc
+++ b/verilog/tools/ls/autoexpand.cc
@@ -17,6 +17,16 @@
 
 #include <algorithm>
 #include <cstdint>
+#include <functional>
+#include <iterator>
+#include <memory>
+#include <optional>
+#include <ostream>
+#include <sstream>
+#include <string>
+#include <utility>
+#include <variant>
+#include <vector>
 
 #include "absl/container/flat_hash_map.h"
 #include "absl/container/flat_hash_set.h"
diff --git a/verilog/tools/ls/autoexpand_test.cc b/verilog/tools/ls/autoexpand_test.cc
index 6b3d0fe13..12144d042 100644
--- a/verilog/tools/ls/autoexpand_test.cc
+++ b/verilog/tools/ls/autoexpand_test.cc
@@ -14,7 +14,13 @@
 
 #include "verilog/tools/ls/autoexpand.h"
 
+#include <algorithm>
 #include <deque>
+#include <functional>
+#include <memory>
+#include <sstream>
+#include <string>
+#include <vector>
 
 #include "common/lsp/lsp-protocol.h"
 #include "gtest/gtest.h"
diff --git a/verilog/tools/ls/document-symbol-filler.cc b/verilog/tools/ls/document-symbol-filler.cc
index 689935505..ee501906c 100644
--- a/verilog/tools/ls/document-symbol-filler.cc
+++ b/verilog/tools/ls/document-symbol-filler.cc
@@ -14,6 +14,8 @@
 
 #include "verilog/tools/ls/document-symbol-filler.h"
 
+#include <string>
+
 #include "absl/flags/flag.h"
 #include "common/lsp/lsp-protocol-enums.h"
 #include "common/lsp/lsp-protocol.h"
diff --git a/verilog/tools/ls/lsp-parse-buffer.cc b/verilog/tools/ls/lsp-parse-buffer.cc
index ed9799f63..4359b1be9 100644
--- a/verilog/tools/ls/lsp-parse-buffer.cc
+++ b/verilog/tools/ls/lsp-parse-buffer.cc
@@ -15,6 +15,12 @@
 
 #include "verilog/tools/ls/lsp-parse-buffer.h"
 
+#include <memory>
+#include <ostream>
+#include <string>
+#include <utility>
+#include <vector>
+
 #include "absl/status/status.h"
 #include "common/lsp/lsp-file-utils.h"
 #include "common/util/logging.h"
diff --git a/verilog/tools/ls/lsp-parse-buffer.h b/verilog/tools/ls/lsp-parse-buffer.h
index c85c5c764..4e263ba4a 100644
--- a/verilog/tools/ls/lsp-parse-buffer.h
+++ b/verilog/tools/ls/lsp-parse-buffer.h
@@ -17,6 +17,11 @@
 #define VERILOG_TOOLS_LS_LSP_PARSE_BUFFER_H
 
 #include <cstdint>
+#include <functional>
+#include <memory>
+#include <string>
+#include <unordered_map>
+#include <vector>
 
 #include "common/lsp/lsp-text-buffer.h"
 #include "verilog/analysis/verilog_analyzer.h"
diff --git a/verilog/tools/ls/symbol-table-handler.cc b/verilog/tools/ls/symbol-table-handler.cc
index 1f9f3d881..f9a89d100 100644
--- a/verilog/tools/ls/symbol-table-handler.cc
+++ b/verilog/tools/ls/symbol-table-handler.cc
@@ -16,6 +16,10 @@
 #include "verilog/tools/ls/symbol-table-handler.h"
 
 #include <filesystem>
+#include <memory>
+#include <optional>
+#include <string>
+#include <vector>
 
 #include "absl/flags/flag.h"
 #include "absl/time/clock.h"
diff --git a/verilog/tools/ls/symbol-table-handler.h b/verilog/tools/ls/symbol-table-handler.h
index b80889a2b..11cab5cae 100644
--- a/verilog/tools/ls/symbol-table-handler.h
+++ b/verilog/tools/ls/symbol-table-handler.h
@@ -18,6 +18,8 @@
 
 #include <filesystem>
 #include <memory>
+#include <optional>
+#include <string>
 #include <vector>
 
 #include "absl/container/flat_hash_set.h"
diff --git a/verilog/tools/ls/symbol-table-handler_test.cc b/verilog/tools/ls/symbol-table-handler_test.cc
index 2a40026d4..8d96d5610 100644
--- a/verilog/tools/ls/symbol-table-handler_test.cc
+++ b/verilog/tools/ls/symbol-table-handler_test.cc
@@ -15,6 +15,8 @@
 #include "verilog/tools/ls/symbol-table-handler.h"
 
 #include <memory>
+#include <string>
+#include <vector>
 
 #include "absl/strings/string_view.h"
 #include "common/util/file_util.h"
diff --git a/verilog/tools/ls/verible-lsp-adapter.cc b/verilog/tools/ls/verible-lsp-adapter.cc
index 46976ac64..395d06d92 100644
--- a/verilog/tools/ls/verible-lsp-adapter.cc
+++ b/verilog/tools/ls/verible-lsp-adapter.cc
@@ -15,6 +15,10 @@
 
 #include "verilog/tools/ls/verible-lsp-adapter.h"
 
+#include <iterator>
+#include <string>
+#include <vector>
+
 #include "common/lsp/lsp-protocol-enums.h"
 #include "common/lsp/lsp-protocol-operators.h"
 #include "common/lsp/lsp-protocol.h"
diff --git a/verilog/tools/ls/verilog-language-server.cc b/verilog/tools/ls/verilog-language-server.cc
index f33de737a..b8e141cb7 100644
--- a/verilog/tools/ls/verilog-language-server.cc
+++ b/verilog/tools/ls/verilog-language-server.cc
@@ -15,7 +15,9 @@
 #include "verilog/tools/ls/verilog-language-server.h"
 
 #include <functional>
+#include <iostream>
 #include <memory>
+#include <string>
 
 #include "absl/flags/flag.h"
 #include "absl/strings/string_view.h"
diff --git a/verilog/tools/ls/verilog-language-server.h b/verilog/tools/ls/verilog-language-server.h
index 83c807b99..f63b6a27a 100644
--- a/verilog/tools/ls/verilog-language-server.h
+++ b/verilog/tools/ls/verilog-language-server.h
@@ -15,6 +15,8 @@
 #ifndef VERILOG_TOOLS_LS_LS_WRAPPER_H
 #define VERILOG_TOOLS_LS_LS_WRAPPER_H
 
+#include <string>
+
 #include "absl/status/status.h"
 #include "common/lsp/json-rpc-dispatcher.h"
 #include "common/lsp/lsp-text-buffer.h"
diff --git a/verilog/tools/ls/verilog-language-server_test.cc b/verilog/tools/ls/verilog-language-server_test.cc
index 646714e44..b6a52c24d 100644
--- a/verilog/tools/ls/verilog-language-server_test.cc
+++ b/verilog/tools/ls/verilog-language-server_test.cc
@@ -14,7 +14,12 @@
 
 #include "verilog/tools/ls/verilog-language-server.h"
 
+#include <algorithm>
 #include <filesystem>
+#include <memory>
+#include <sstream>
+#include <string>
+#include <vector>
 
 #include "absl/flags/flag.h"
 #include "absl/strings/match.h"
diff --git a/verilog/tools/preprocessor/verilog_preprocessor.cc b/verilog/tools/preprocessor/verilog_preprocessor.cc
index bc33adf7f..9eb039b97 100644
--- a/verilog/tools/preprocessor/verilog_preprocessor.cc
+++ b/verilog/tools/preprocessor/verilog_preprocessor.cc
@@ -15,6 +15,7 @@
 #include <functional>
 #include <iostream>
 #include <string>
+#include <utility>
 #include <vector>
 
 #include "absl/flags/flag.h"
diff --git a/verilog/tools/project/project_tool.cc b/verilog/tools/project/project_tool.cc
index 0fd72955b..28060c95e 100644
--- a/verilog/tools/project/project_tool.cc
+++ b/verilog/tools/project/project_tool.cc
@@ -16,6 +16,8 @@
 #include <iostream>
 #include <memory>
 #include <string>
+#include <utility>
+#include <vector>
 
 #include "absl/flags/flag.h"
 #include "absl/flags/usage.h"
diff --git a/verilog/tools/syntax/export_json_examples/BUILD b/verilog/tools/syntax/export_json_examples/BUILD
index 9ec970aff..f18821366 100644
--- a/verilog/tools/syntax/export_json_examples/BUILD
+++ b/verilog/tools/syntax/export_json_examples/BUILD
@@ -1,4 +1,6 @@
-load("@rules_python//python:defs.bzl", "py_binary", "py_library", "py_test")
+load("@rules_python//python:defs.bzl", "py_binary")
+load("@rules_python//python:defs.bzl", "py_library")
+load("@rules_python//python:defs.bzl", "py_test")
 
 package(
     default_applicable_licenses = ["//:license"],
diff --git a/verilog/tools/syntax/verilog_syntax.cc b/verilog/tools/syntax/verilog_syntax.cc
index 702a25207..dd580f685 100644
--- a/verilog/tools/syntax/verilog_syntax.cc
+++ b/verilog/tools/syntax/verilog_syntax.cc
@@ -19,12 +19,14 @@
 // verilog_syntax --verilog_trace_parser files...
 
 #include <algorithm>
+#include <functional>
 #include <iomanip>
 #include <iostream>
 #include <iterator>
 #include <memory>
 #include <sstream>  // IWYU pragma: keep  // for ostringstream
 #include <string>   // for string, allocator, etc
+#include <utility>
 #include <vector>
 
 #include "absl/flags/flag.h"
diff --git a/verilog/transform/obfuscate.cc b/verilog/transform/obfuscate.cc
index 7c4dab006..b47c9bea8 100644
--- a/verilog/transform/obfuscate.cc
+++ b/verilog/transform/obfuscate.cc
@@ -16,6 +16,7 @@
 
 #include <iostream>
 #include <sstream>
+#include <string>
 
 #include "absl/status/status.h"
 #include "absl/strings/str_cat.h"
diff --git a/verilog/transform/obfuscate.h b/verilog/transform/obfuscate.h
index 7b350e0ea..46272708c 100644
--- a/verilog/transform/obfuscate.h
+++ b/verilog/transform/obfuscate.h
@@ -16,6 +16,7 @@
 #define VERIBLE_VERILOG_TRANSFORM_OBFUSCATE_H_
 
 #include <iosfwd>
+#include <string>
 
 #include "absl/status/status.h"
 #include "absl/strings/string_view.h"
diff --git a/verilog/transform/obfuscate_test.cc b/verilog/transform/obfuscate_test.cc
index b7a1e8adc..4a3bdcbfb 100644
--- a/verilog/transform/obfuscate_test.cc
+++ b/verilog/transform/obfuscate_test.cc
@@ -15,6 +15,8 @@
 #include "verilog/transform/obfuscate.h"
 
 #include <sstream>
+#include <string>
+#include <utility>
 
 #include "common/strings/obfuscator.h"
 #include "gmock/gmock.h"