diff --git a/src/backends/policy_engine/souffle/datalog_lowering_visitor.cc b/src/backends/policy_engine/souffle/datalog_lowering_visitor.cc
index 7d20a9d7..bd812f8a 100644
--- a/src/backends/policy_engine/souffle/datalog_lowering_visitor.cc
+++ b/src/backends/policy_engine/souffle/datalog_lowering_visitor.cc
@@ -16,6 +16,11 @@
 
 #include "src/backends/policy_engine/souffle/datalog_lowering_visitor.h"
 
+#include <algorithm>
+#include <string>
+#include <utility>
+#include <vector>
+
 #include "src/common/utils/fold.h"
 #include "src/ir/attributes/attribute.h"
 #include "src/ir/attributes/float_attribute.h"
diff --git a/src/backends/policy_engine/souffle/datalog_lowering_visitor.h b/src/backends/policy_engine/souffle/datalog_lowering_visitor.h
index adec31d6..2f9c149e 100644
--- a/src/backends/policy_engine/souffle/datalog_lowering_visitor.h
+++ b/src/backends/policy_engine/souffle/datalog_lowering_visitor.h
@@ -17,6 +17,8 @@
 #ifndef SRC_BACKENDS_POLICY_ENGINE_SOUFFLE_DATALOG_LOWERING_VISITOR_H_
 #define SRC_BACKENDS_POLICY_ENGINE_SOUFFLE_DATALOG_LOWERING_VISITOR_H_
 
+#include <utility>
+
 #include "src/backends/policy_engine/souffle/raksha_datalog_facts.h"
 #include "src/common/logging/logging.h"
 #include "src/common/utils/types.h"
diff --git a/src/backends/policy_engine/souffle/datalog_lowering_visitor_test.cc b/src/backends/policy_engine/souffle/datalog_lowering_visitor_test.cc
index f172703a..da138875 100644
--- a/src/backends/policy_engine/souffle/datalog_lowering_visitor_test.cc
+++ b/src/backends/policy_engine/souffle/datalog_lowering_visitor_test.cc
@@ -16,6 +16,10 @@
 
 #include "datalog_lowering_visitor.h"
 
+#include <functional>
+#include <memory>
+#include <vector>
+
 #include "absl/strings/string_view.h"
 #include "src/common/testing/gtest.h"
 #include "src/ir/attributes/float_attribute.h"
diff --git a/src/backends/policy_engine/souffle/raksha_datalog_facts.cc b/src/backends/policy_engine/souffle/raksha_datalog_facts.cc
index db77b2ad..54a2862d 100644
--- a/src/backends/policy_engine/souffle/raksha_datalog_facts.cc
+++ b/src/backends/policy_engine/souffle/raksha_datalog_facts.cc
@@ -19,6 +19,9 @@
 #include <cstring>
 #include <filesystem>
 #include <fstream>
+#include <string>
+#include <system_error>
+#include <vector>
 
 #include "src/backends/policy_engine/souffle/utils.h"
 #include "src/common/logging/logging.h"
diff --git a/src/backends/policy_engine/souffle/raksha_datalog_facts_test.cc b/src/backends/policy_engine/souffle/raksha_datalog_facts_test.cc
index 94a5fec7..731ef1f8 100644
--- a/src/backends/policy_engine/souffle/raksha_datalog_facts_test.cc
+++ b/src/backends/policy_engine/souffle/raksha_datalog_facts_test.cc
@@ -16,6 +16,9 @@
 #include "src/backends/policy_engine/souffle/raksha_datalog_facts.h"
 
 #include <filesystem>
+#include <string>
+#include <utility>
+#include <vector>
 
 #include "src/common/logging/logging.h"
 #include "src/common/testing/gtest.h"
diff --git a/src/backends/policy_engine/souffle/raksha_policy_datalog_emitter.cc b/src/backends/policy_engine/souffle/raksha_policy_datalog_emitter.cc
index 6fa15068..857b4f06 100644
--- a/src/backends/policy_engine/souffle/raksha_policy_datalog_emitter.cc
+++ b/src/backends/policy_engine/souffle/raksha_policy_datalog_emitter.cc
@@ -19,6 +19,7 @@
 #include <iostream>
 #include <optional>
 #include <sstream>
+#include <string>
 
 #include "absl/flags/flag.h"
 #include "absl/flags/parse.h"
diff --git a/src/backends/policy_engine/souffle/souffle_policy_checker.cc b/src/backends/policy_engine/souffle/souffle_policy_checker.cc
index c7ce955f..12f876a2 100644
--- a/src/backends/policy_engine/souffle/souffle_policy_checker.cc
+++ b/src/backends/policy_engine/souffle/souffle_policy_checker.cc
@@ -17,6 +17,9 @@
 #include "src/backends/policy_engine/souffle/souffle_policy_checker.h"
 
 #include <cstdlib>
+#include <memory>
+#include <optional>
+#include <string>
 
 #include "souffle/SouffleInterface.h"
 #include "src/backends/policy_engine/policy.h"
diff --git a/src/backends/policy_engine/souffle/souffle_policy_checker_test.cc b/src/backends/policy_engine/souffle/souffle_policy_checker_test.cc
index 1d57396d..10b29807 100644
--- a/src/backends/policy_engine/souffle/souffle_policy_checker_test.cc
+++ b/src/backends/policy_engine/souffle/souffle_policy_checker_test.cc
@@ -16,6 +16,7 @@
 #include "src/backends/policy_engine/souffle/souffle_policy_checker.h"
 
 #include <limits>
+#include <memory>
 
 #include "src/backends/policy_engine/dp_parameter_policy.h"
 #include "src/backends/policy_engine/sql_policy_rule_policy.h"
diff --git a/src/backends/policy_engine/souffle/utils.cc b/src/backends/policy_engine/souffle/utils.cc
index 8ee0820b..d69bf5af 100644
--- a/src/backends/policy_engine/souffle/utils.cc
+++ b/src/backends/policy_engine/souffle/utils.cc
@@ -16,7 +16,10 @@
 
 #include "src/backends/policy_engine/souffle/utils.h"
 
+#include <cstring>
 #include <fstream>
+#include <ios>
+#include <string>
 
 #include "absl/strings/str_format.h"
 
diff --git a/src/backends/policy_engine/souffle/utils_test.cc b/src/backends/policy_engine/souffle/utils_test.cc
index 866a05f8..da84f58b 100644
--- a/src/backends/policy_engine/souffle/utils_test.cc
+++ b/src/backends/policy_engine/souffle/utils_test.cc
@@ -18,7 +18,9 @@
 
 #include <cstdio>
 #include <fstream>
+#include <ios>
 #include <sstream>
+#include <string>
 
 #include "absl/status/statusor.h"
 #include "src/common/logging/logging.h"
diff --git a/src/frontends/sql/decode.cc b/src/frontends/sql/decode.cc
index a2dc8348..edbb1f00 100644
--- a/src/frontends/sql/decode.cc
+++ b/src/frontends/sql/decode.cc
@@ -16,6 +16,9 @@
 
 #include "src/frontends/sql/decode.h"
 
+#include <optional>
+#include <string>
+
 #include "src/frontends/sql/decoder_context.h"
 #include "src/frontends/sql/ops/sql_output_op.h"
 #include "src/ir/value.h"
diff --git a/src/frontends/sql/decode_expr_death_test.cc b/src/frontends/sql/decode_expr_death_test.cc
index 020ce32a..ff3f9244 100644
--- a/src/frontends/sql/decode_expr_death_test.cc
+++ b/src/frontends/sql/decode_expr_death_test.cc
@@ -14,6 +14,8 @@
 // limitations under the License.
 //----------------------------------------------------------------------------
 
+#include <string>
+
 #include "google/protobuf/text_format.h"
 #include "absl/strings/string_view.h"
 #include "src/common/testing/gtest.h"
diff --git a/src/frontends/sql/decode_literal_test.cc b/src/frontends/sql/decode_literal_test.cc
index ad94562f..47dd9281 100644
--- a/src/frontends/sql/decode_literal_test.cc
+++ b/src/frontends/sql/decode_literal_test.cc
@@ -14,6 +14,8 @@
 // limitations under the License.
 //----------------------------------------------------------------------------
 
+#include <optional>
+
 #include "absl/strings/string_view.h"
 #include "src/common/testing/gtest.h"
 #include "src/frontends/sql/decoder_context.h"
diff --git a/src/frontends/sql/decode_merge_operation_test.cc b/src/frontends/sql/decode_merge_operation_test.cc
index 7774a24d..272167ba 100644
--- a/src/frontends/sql/decode_merge_operation_test.cc
+++ b/src/frontends/sql/decode_merge_operation_test.cc
@@ -13,10 +13,13 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 //----------------------------------------------------------------------------
+#include <optional>
 #include <string>
+#include <tuple>
+#include <vector>
 
-#include "absl/strings/string_view.h"
 #include "google/protobuf/text_format.h"
+#include "absl/strings/string_view.h"
 #include "src/common/testing/gtest.h"
 #include "src/frontends/sql/decode.h"
 #include "src/frontends/sql/decoder_context.h"
diff --git a/src/frontends/sql/decode_source_column_test.cc b/src/frontends/sql/decode_source_column_test.cc
index 355317fb..dbca5313 100644
--- a/src/frontends/sql/decode_source_column_test.cc
+++ b/src/frontends/sql/decode_source_column_test.cc
@@ -14,6 +14,8 @@
 // limitations under the License.
 //----------------------------------------------------------------------------
 
+#include <optional>
+
 #include "absl/strings/string_view.h"
 #include "src/common/testing/gtest.h"
 #include "src/frontends/sql/decoder_context.h"
diff --git a/src/frontends/sql/decode_sql_policy_rules.cc b/src/frontends/sql/decode_sql_policy_rules.cc
index b95db117..c01d2b58 100644
--- a/src/frontends/sql/decode_sql_policy_rules.cc
+++ b/src/frontends/sql/decode_sql_policy_rules.cc
@@ -1,5 +1,9 @@
 #include "src/frontends/sql/decode_sql_policy_rules.h"
 
+#include <string>
+#include <utility>
+#include <vector>
+
 #include "absl/strings/str_cat.h"
 #include "absl/strings/string_view.h"
 #include "src/analysis/taint/inference_rules.h"
diff --git a/src/frontends/sql/decode_sql_policy_rules_test.cc b/src/frontends/sql/decode_sql_policy_rules_test.cc
index 2b2a0afe..373e84a8 100644
--- a/src/frontends/sql/decode_sql_policy_rules_test.cc
+++ b/src/frontends/sql/decode_sql_policy_rules_test.cc
@@ -1,6 +1,9 @@
 #include "src/frontends/sql/decode_sql_policy_rules.h"
 
 #include <cstdint>
+#include <string>
+#include <tuple>
+#include <vector>
 
 #include "google/protobuf/text_format.h"
 #include "absl/log/die_if_null.h"
diff --git a/src/frontends/sql/decode_tag_transform_operation_test.cc b/src/frontends/sql/decode_tag_transform_operation_test.cc
index d4dff470..329d999c 100644
--- a/src/frontends/sql/decode_tag_transform_operation_test.cc
+++ b/src/frontends/sql/decode_tag_transform_operation_test.cc
@@ -14,6 +14,11 @@
 // limitations under the License.
 //----------------------------------------------------------------------------
 
+#include <string>
+#include <tuple>
+#include <utility>
+#include <vector>
+
 #include "google/protobuf/text_format.h"
 #include "absl/container/flat_hash_map.h"
 #include "absl/strings/str_format.h"
diff --git a/src/frontends/sql/decoder_context.cc b/src/frontends/sql/decoder_context.cc
index 0ff2948e..2016b778 100644
--- a/src/frontends/sql/decoder_context.cc
+++ b/src/frontends/sql/decoder_context.cc
@@ -16,6 +16,9 @@
 #include "src/frontends/sql/decoder_context.h"
 
 #include <limits>
+#include <string>
+#include <utility>
+#include <vector>
 
 #include "src/common/utils/map_iter.h"
 #include "src/frontends/sql/ops/merge_op.h"
diff --git a/src/frontends/sql/decoder_context_test.cc b/src/frontends/sql/decoder_context_test.cc
index 889ded2d..95950bde 100644
--- a/src/frontends/sql/decoder_context_test.cc
+++ b/src/frontends/sql/decoder_context_test.cc
@@ -16,6 +16,11 @@
 
 #include "src/frontends/sql/decoder_context.h"
 
+#include <algorithm>
+#include <string>
+#include <tuple>
+#include <vector>
+
 #include "src/common/testing/gtest.h"
 #include "src/common/utils/map_iter.h"
 #include "src/frontends/sql/ops/merge_op.h"
diff --git a/src/frontends/sql/driver_test.cc b/src/frontends/sql/driver_test.cc
index 95a53ed8..183f3614 100644
--- a/src/frontends/sql/driver_test.cc
+++ b/src/frontends/sql/driver_test.cc
@@ -16,6 +16,8 @@
 
 #include "src/frontends/sql/driver.h"
 
+#include <string>
+
 #include "google/protobuf/text_format.h"
 #include "src/backends/policy_engine/policy.h"
 #include "src/backends/policy_engine/sql_policy_rule_policy.h"
diff --git a/src/ir/access_path_selectors_set_test.cc b/src/ir/access_path_selectors_set_test.cc
index 115a7cd2..104bda75 100644
--- a/src/ir/access_path_selectors_set_test.cc
+++ b/src/ir/access_path_selectors_set_test.cc
@@ -15,6 +15,13 @@
 //----------------------------------------------------------------------------
 #include "src/ir/access_path_selectors_set.h"
 
+#include <algorithm>
+#include <iterator>
+#include <string>
+#include <tuple>
+#include <utility>
+#include <vector>
+
 #include "absl/container/btree_set.h"
 #include "absl/container/flat_hash_set.h"
 #include "absl/strings/str_cat.h"
diff --git a/src/ir/access_path_selectors_test.cc b/src/ir/access_path_selectors_test.cc
index c3596e10..5602bed3 100644
--- a/src/ir/access_path_selectors_test.cc
+++ b/src/ir/access_path_selectors_test.cc
@@ -16,6 +16,8 @@
 #include "src/ir/access_path_selectors.h"
 
 #include <string>
+#include <tuple>
+#include <utility>
 #include <vector>
 
 #include "absl/hash/hash_testing.h"
diff --git a/src/ir/auth_logic/ast_construction_query_test.cc b/src/ir/auth_logic/ast_construction_query_test.cc
index 4ac02362..767babb3 100644
--- a/src/ir/auth_logic/ast_construction_query_test.cc
+++ b/src/ir/auth_logic/ast_construction_query_test.cc
@@ -19,6 +19,8 @@
 #include <memory>
 #include <optional>
 #include <stdexcept>
+#include <string>
+#include <variant>
 
 #include "absl/strings/str_cat.h"
 #include "absl/strings/str_join.h"
diff --git a/src/ir/auth_logic/ast_construction_relation_declaration_test.cc b/src/ir/auth_logic/ast_construction_relation_declaration_test.cc
index 6a383274..ac8e122c 100644
--- a/src/ir/auth_logic/ast_construction_relation_declaration_test.cc
+++ b/src/ir/auth_logic/ast_construction_relation_declaration_test.cc
@@ -19,6 +19,8 @@
 #include <memory>
 #include <optional>
 #include <stdexcept>
+#include <string>
+#include <vector>
 
 #include "absl/strings/str_cat.h"
 #include "absl/strings/str_join.h"
diff --git a/src/ir/auth_logic/ast_construction_says_assertion_test.cc b/src/ir/auth_logic/ast_construction_says_assertion_test.cc
index b708fc0f..bde2c40e 100644
--- a/src/ir/auth_logic/ast_construction_says_assertion_test.cc
+++ b/src/ir/auth_logic/ast_construction_says_assertion_test.cc
@@ -20,6 +20,8 @@
 #include <memory>
 #include <optional>
 #include <stdexcept>
+#include <string>
+#include <vector>
 
 #include "src/common/testing/gtest.h"
 #include "src/common/utils/map_iter.h"
diff --git a/src/ir/auth_logic/ast_equality_test.cc b/src/ir/auth_logic/ast_equality_test.cc
index ebe97a75..d3ca2292 100644
--- a/src/ir/auth_logic/ast_equality_test.cc
+++ b/src/ir/auth_logic/ast_equality_test.cc
@@ -14,6 +14,9 @@
 // limitations under the License.
 //----------------------------------------------------------------------------
 
+#include <tuple>
+#include <utility>
+
 #include "src/common/testing/gtest.h"
 #include "src/ir/auth_logic/ast.h"
 
diff --git a/src/ir/auth_logic/ast_string.cc b/src/ir/auth_logic/ast_string.cc
index 90c2ddb9..8d70d955 100644
--- a/src/ir/auth_logic/ast_string.cc
+++ b/src/ir/auth_logic/ast_string.cc
@@ -17,6 +17,11 @@
 
 #include "ast_string.h"
 
+#include <algorithm>
+#include <string>
+#include <variant>
+#include <vector>
+
 #include "src/common/logging/logging.h"
 
 namespace raksha::ir::auth_logic {
diff --git a/src/ir/auth_logic/auth_logic_ast_traversing_visitor_test.cc b/src/ir/auth_logic/auth_logic_ast_traversing_visitor_test.cc
index 1d1df54b..99933f33 100644
--- a/src/ir/auth_logic/auth_logic_ast_traversing_visitor_test.cc
+++ b/src/ir/auth_logic/auth_logic_ast_traversing_visitor_test.cc
@@ -17,6 +17,10 @@
 #include "src/ir/auth_logic/auth_logic_ast_traversing_visitor.h"
 
 #include <iostream>
+#include <string>
+#include <utility>
+#include <variant>
+#include <vector>
 
 #include "absl/container/btree_set.h"
 #include "src/common/testing/gtest.h"
diff --git a/src/ir/auth_logic/declaration_environment.cc b/src/ir/auth_logic/declaration_environment.cc
index 67370745..443072e0 100644
--- a/src/ir/auth_logic/declaration_environment.cc
+++ b/src/ir/auth_logic/declaration_environment.cc
@@ -16,6 +16,8 @@
 
 #include "src/ir/auth_logic/declaration_environment.h"
 
+#include <string>
+
 namespace raksha::ir::auth_logic {
 
 namespace {
diff --git a/src/ir/auth_logic/lowering_ast_datalog.cc b/src/ir/auth_logic/lowering_ast_datalog.cc
index 43d000b9..8bd840c3 100644
--- a/src/ir/auth_logic/lowering_ast_datalog.cc
+++ b/src/ir/auth_logic/lowering_ast_datalog.cc
@@ -16,7 +16,14 @@
 
 #include "src/ir/auth_logic/lowering_ast_datalog.h"
 
+#include <algorithm>
 #include <iostream>
+#include <iterator>
+#include <string>
+#include <string_view>
+#include <utility>
+#include <variant>
+#include <vector>
 
 #include "absl/algorithm/container.h"
 #include "src/common/utils/map_iter.h"
diff --git a/src/ir/auth_logic/souffle_emitter.h b/src/ir/auth_logic/souffle_emitter.h
index 2bf7bef9..7acdd9b2 100644
--- a/src/ir/auth_logic/souffle_emitter.h
+++ b/src/ir/auth_logic/souffle_emitter.h
@@ -17,6 +17,11 @@
 #ifndef SRC_IR_AUTH_LOGIC_SOUFFLE_EMITTER_H_
 #define SRC_IR_AUTH_LOGIC_SOUFFLE_EMITTER_H_
 
+#include <algorithm>
+#include <string>
+#include <utility>
+#include <vector>
+
 #include "absl/container/flat_hash_set.h"
 #include "absl/strings/str_cat.h"
 #include "absl/strings/str_join.h"
diff --git a/src/ir/auth_logic/souffle_emitter_test.cc b/src/ir/auth_logic/souffle_emitter_test.cc
index a6700ff4..9ec19059 100644
--- a/src/ir/auth_logic/souffle_emitter_test.cc
+++ b/src/ir/auth_logic/souffle_emitter_test.cc
@@ -18,6 +18,8 @@
 
 #include <iostream>
 #include <string>
+#include <utility>
+#include <vector>
 
 #include "src/common/testing/gtest.h"
 #include "src/ir/auth_logic/ast.h"
diff --git a/src/ir/auth_logic/type_environment.cc b/src/ir/auth_logic/type_environment.cc
index 7b5a97b5..6b0042f3 100644
--- a/src/ir/auth_logic/type_environment.cc
+++ b/src/ir/auth_logic/type_environment.cc
@@ -16,6 +16,8 @@
 
 #include "src/ir/auth_logic/type_environment.h"
 
+#include <string>
+
 #include "src/ir/auth_logic/is_name_constant.h"
 
 namespace raksha::ir::auth_logic {
diff --git a/src/ir/auth_logic/universe_relation_insertion.cc b/src/ir/auth_logic/universe_relation_insertion.cc
index fab9395d..33fb67b8 100644
--- a/src/ir/auth_logic/universe_relation_insertion.cc
+++ b/src/ir/auth_logic/universe_relation_insertion.cc
@@ -16,6 +16,12 @@
 
 #include "src/ir/auth_logic/universe_relation_insertion.h"
 
+#include <iterator>
+#include <string>
+#include <utility>
+#include <variant>
+#include <vector>
+
 #include "absl/container/flat_hash_map.h"
 #include "absl/container/flat_hash_set.h"
 #include "src/ir/auth_logic/auth_logic_ast_traversing_visitor.h"
diff --git a/src/ir/block_builder_test.cc b/src/ir/block_builder_test.cc
index 35838eeb..6fe4de5b 100644
--- a/src/ir/block_builder_test.cc
+++ b/src/ir/block_builder_test.cc
@@ -16,6 +16,8 @@
 #include "src/ir/block_builder.h"
 
 #include <memory>
+#include <string>
+#include <utility>
 
 #include "src/common/testing/gtest.h"
 #include "src/ir/attributes/attribute.h"
diff --git a/src/ir/data_decl_test.cc b/src/ir/data_decl_test.cc
index aa6dce38..aeace7d9 100644
--- a/src/ir/data_decl_test.cc
+++ b/src/ir/data_decl_test.cc
@@ -15,6 +15,8 @@
 //----------------------------------------------------------------------------
 #include "src/ir/data_decl.h"
 
+#include <string>
+
 #include "src/common/testing/gtest.h"
 #include "src/ir/types/entity_type.h"
 #include "src/ir/types/type.h"
diff --git a/src/ir/field_selector_test.cc b/src/ir/field_selector_test.cc
index 613aad70..b8d3aea2 100644
--- a/src/ir/field_selector_test.cc
+++ b/src/ir/field_selector_test.cc
@@ -16,6 +16,8 @@
 #include "src/ir/field_selector.h"
 
 #include <string>
+#include <tuple>
+#include <vector>
 
 #include "absl/hash/hash_testing.h"
 #include "src/common/testing/gtest.h"
diff --git a/src/ir/ir_context_test.cc b/src/ir/ir_context_test.cc
index f5bd1b95..e801e7fd 100644
--- a/src/ir/ir_context_test.cc
+++ b/src/ir/ir_context_test.cc
@@ -15,6 +15,9 @@
 //----------------------------------------------------------------------------
 #include "src/ir/ir_context.h"
 
+#include <array>
+#include <memory>
+
 #include "src/common/testing/gtest.h"
 #include "src/ir/types/type_factory.h"
 
diff --git a/src/ir/ir_printer_test.cc b/src/ir/ir_printer_test.cc
index 38893b92..cee7a11d 100644
--- a/src/ir/ir_printer_test.cc
+++ b/src/ir/ir_printer_test.cc
@@ -15,6 +15,10 @@
 //----------------------------------------------------------------------------
 #include "src/ir/ir_printer.h"
 
+#include <memory>
+#include <sstream>
+#include <string>
+
 #include "absl/container/flat_hash_map.h"
 #include "absl/strings/string_view.h"
 #include "src/common/testing/gtest.h"
diff --git a/src/ir/ir_to_proto.cc b/src/ir/ir_to_proto.cc
index a9b58bce..e91a196f 100644
--- a/src/ir/ir_to_proto.cc
+++ b/src/ir/ir_to_proto.cc
@@ -14,15 +14,17 @@
 // limitations under the License.
 //----------------------------------------------------------------------------
 
-#include "src/ir/attributes/float_attribute.h"
-#include "src/ir/attributes/int_attribute.h"
-#include "src/ir/attributes/string_attribute.h"
 #include "src/ir/ir_to_proto.h"
-#include "src/ir/ssa_names.h"
 
 #include <memory>
+#include <string>
 #include <variant>
 
+#include "src/ir/attributes/float_attribute.h"
+#include "src/ir/attributes/int_attribute.h"
+#include "src/ir/attributes/string_attribute.h"
+#include "src/ir/ssa_names.h"
+
 namespace raksha::ir {
 
 proto::Module IRToProto::ModuleToProto(const Module& module) {
diff --git a/src/ir/ir_to_proto_test.cc b/src/ir/ir_to_proto_test.cc
index c0c8cf52..54c55b6d 100644
--- a/src/ir/ir_to_proto_test.cc
+++ b/src/ir/ir_to_proto_test.cc
@@ -17,6 +17,7 @@
 #include "src/ir/ir_to_proto.h"
 
 #include <string>
+#include <string_view>
 
 #include "google/protobuf/text_format.h"
 #include "google/protobuf/util/message_differencer.h"
diff --git a/src/ir/ir_traversing_visitor_test.cc b/src/ir/ir_traversing_visitor_test.cc
index 387e800e..18a938d3 100644
--- a/src/ir/ir_traversing_visitor_test.cc
+++ b/src/ir/ir_traversing_visitor_test.cc
@@ -16,6 +16,7 @@
 #include "src/ir/ir_traversing_visitor.h"
 
 #include <memory>
+#include <vector>
 
 #include "src/common/testing/gtest.h"
 #include "src/ir/block_builder.h"
diff --git a/src/ir/module_test.cc b/src/ir/module_test.cc
index a8f5a798..02c8a5ea 100644
--- a/src/ir/module_test.cc
+++ b/src/ir/module_test.cc
@@ -15,7 +15,9 @@
 //----------------------------------------------------------------------------
 #include "src/ir/module.h"
 
+#include <memory>
 #include <string>
+#include <utility>
 #include <vector>
 
 #include "fuzztest/fuzztest.h"
diff --git a/src/ir/proto_to_ir.cc b/src/ir/proto_to_ir.cc
index d002670f..1149e61e 100644
--- a/src/ir/proto_to_ir.cc
+++ b/src/ir/proto_to_ir.cc
@@ -18,6 +18,7 @@
 
 #include <memory>
 #include <optional>
+#include <utility>
 #include <variant>
 
 #include "src/ir/attributes/float_attribute.h"
diff --git a/src/ir/selector_test.cc b/src/ir/selector_test.cc
index 993895e1..384f91a7 100644
--- a/src/ir/selector_test.cc
+++ b/src/ir/selector_test.cc
@@ -15,6 +15,10 @@
 //----------------------------------------------------------------------------
 #include "src/ir/selector.h"
 
+#include <string>
+#include <tuple>
+#include <vector>
+
 #include "absl/hash/hash_testing.h"
 #include "src/common/testing/gtest.h"
 
diff --git a/src/ir/value_string_converter.cc b/src/ir/value_string_converter.cc
index 5baaf7f0..a21d9cd3 100644
--- a/src/ir/value_string_converter.cc
+++ b/src/ir/value_string_converter.cc
@@ -1,5 +1,8 @@
 #include "src/ir/value_string_converter.h"
 
+#include <string>
+#include <variant>
+
 #include "src/common/utils/overloaded.h"
 #include "src/ir/storage.h"
 #include "src/ir/value.h"
diff --git a/src/ir/value_test.cc b/src/ir/value_test.cc
index 1262a3b8..69167754 100644
--- a/src/ir/value_test.cc
+++ b/src/ir/value_test.cc
@@ -15,6 +15,10 @@
 //----------------------------------------------------------------------------
 #include "src/ir/value.h"
 
+#include <tuple>
+#include <utility>
+#include <vector>
+
 #include "absl/hash/hash_testing.h"
 #include "src/common/testing/gtest.h"
 #include "src/ir/ir_printer.h"