Run iwyu & build_cleaner
PiperOrigin-RevId: 407019977
diff --git a/rs_bindings_from_cc/ast_consumer.cc b/rs_bindings_from_cc/ast_consumer.cc
index 8be7be7..a935ee5 100644
--- a/rs_bindings_from_cc/ast_consumer.cc
+++ b/rs_bindings_from_cc/ast_consumer.cc
@@ -4,9 +4,12 @@
#include "rs_bindings_from_cc/ast_consumer.h"
+#include "base/logging.h"
#include "rs_bindings_from_cc/ast_visitor.h"
+#include "third_party/absl/strings/string_view.h"
#include "third_party/llvm/llvm-project/clang/include/clang/AST/ASTContext.h"
#include "third_party/llvm/llvm-project/clang/include/clang/AST/Decl.h"
+#include "third_party/llvm/llvm-project/clang/include/clang/Frontend/CompilerInstance.h"
namespace rs_bindings_from_cc {
diff --git a/rs_bindings_from_cc/ast_convert.cc b/rs_bindings_from_cc/ast_convert.cc
index 998436d..5abe74a 100644
--- a/rs_bindings_from_cc/ast_convert.cc
+++ b/rs_bindings_from_cc/ast_convert.cc
@@ -4,8 +4,12 @@
#include "rs_bindings_from_cc/ast_convert.h"
+#include <assert.h>
+
+#include "rs_bindings_from_cc/ir.h"
#include "third_party/absl/functional/function_ref.h"
#include "third_party/llvm/llvm-project/clang/include/clang/AST/Decl.h"
+#include "third_party/llvm/llvm-project/clang/include/clang/AST/DeclCXX.h"
namespace rs_bindings_from_cc {
namespace {
diff --git a/rs_bindings_from_cc/ast_convert.h b/rs_bindings_from_cc/ast_convert.h
index 67df49d..d0d2116 100644
--- a/rs_bindings_from_cc/ast_convert.h
+++ b/rs_bindings_from_cc/ast_convert.h
@@ -12,7 +12,7 @@
#include "rs_bindings_from_cc/ir.h"
#include "third_party/llvm/llvm-project/clang/include/clang/AST/Decl.h"
-#include "third_party/llvm/llvm-project/clang/include/clang/AST/DeclCXX.h"
+#include "third_party/llvm/llvm-project/clang/include/clang/Basic/Specifiers.h"
namespace rs_bindings_from_cc {
diff --git a/rs_bindings_from_cc/ast_visitor.cc b/rs_bindings_from_cc/ast_visitor.cc
index 011993c..f6c882a 100644
--- a/rs_bindings_from_cc/ast_visitor.cc
+++ b/rs_bindings_from_cc/ast_visitor.cc
@@ -5,13 +5,18 @@
#include "rs_bindings_from_cc/ast_visitor.h"
#include <memory>
+#include <optional>
#include <string>
+#include <utility>
+#include <variant>
#include <vector>
-#include "base/logging.h"
#include "rs_bindings_from_cc/ast_convert.h"
#include "rs_bindings_from_cc/ir.h"
#include "third_party/absl/container/flat_hash_set.h"
+#include "third_party/absl/status/status.h"
+#include "third_party/absl/status/statusor.h"
+#include "third_party/absl/strings/cord.h"
#include "third_party/absl/strings/string_view.h"
#include "third_party/absl/strings/substitute.h"
#include "third_party/llvm/llvm-project/clang/include/clang/AST/ASTContext.h"
@@ -24,6 +29,7 @@
#include "third_party/llvm/llvm-project/clang/include/clang/Basic/SourceLocation.h"
#include "third_party/llvm/llvm-project/clang/include/clang/Basic/SourceManager.h"
#include "third_party/llvm/llvm-project/clang/include/clang/Basic/Specifiers.h"
+#include "third_party/llvm/llvm-project/clang/include/clang/Sema/Sema.h"
#include "third_party/llvm/llvm-project/llvm/include/llvm/Support/Casting.h"
namespace rs_bindings_from_cc {
diff --git a/rs_bindings_from_cc/ast_visitor.h b/rs_bindings_from_cc/ast_visitor.h
index 0e3a539..9ddd856 100644
--- a/rs_bindings_from_cc/ast_visitor.h
+++ b/rs_bindings_from_cc/ast_visitor.h
@@ -6,7 +6,11 @@
#define CRUBIT_RS_BINDINGS_FROM_CC_AST_VISITOR_H_
#include <memory>
+#include <optional>
#include <string>
+#include <utility>
+#include <variant>
+#include <vector>
#include "rs_bindings_from_cc/ir.h"
#include "third_party/absl/container/flat_hash_set.h"
@@ -20,6 +24,7 @@
#include "third_party/llvm/llvm-project/clang/include/clang/AST/RecursiveASTVisitor.h"
#include "third_party/llvm/llvm-project/clang/include/clang/AST/Type.h"
#include "third_party/llvm/llvm-project/clang/include/clang/Basic/SourceLocation.h"
+#include "third_party/llvm/llvm-project/clang/include/clang/Basic/Specifiers.h"
#include "third_party/llvm/llvm-project/clang/include/clang/Sema/Sema.h"
namespace rs_bindings_from_cc {
diff --git a/rs_bindings_from_cc/ast_visitor_test.cc b/rs_bindings_from_cc/ast_visitor_test.cc
index c6ff67a..25f57b4 100644
--- a/rs_bindings_from_cc/ast_visitor_test.cc
+++ b/rs_bindings_from_cc/ast_visitor_test.cc
@@ -2,19 +2,20 @@
// Exceptions. See /LICENSE for license information.
// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
-#include <memory>
#include <string>
-#include <utility>
+#include <type_traits>
+#include <variant>
#include <vector>
#include "rs_bindings_from_cc/ir.h"
#include "rs_bindings_from_cc/ir_from_cc.h"
#include "testing/base/public/gmock.h"
#include "testing/base/public/gunit.h"
-#include "third_party/absl/container/flat_hash_map.h"
+#include "third_party/absl/status/status.h"
+#include "third_party/absl/status/statusor.h"
#include "third_party/absl/strings/string_view.h"
-#include "third_party/absl/strings/substitute.h"
#include "third_party/absl/types/span.h"
+#include "util/task/status_macros.h"
namespace rs_bindings_from_cc {
namespace {
diff --git a/rs_bindings_from_cc/ir.cc b/rs_bindings_from_cc/ir.cc
index 26ac05b..7e0ae65 100644
--- a/rs_bindings_from_cc/ir.cc
+++ b/rs_bindings_from_cc/ir.cc
@@ -4,12 +4,16 @@
#include "rs_bindings_from_cc/ir.h"
+#include <stdint.h>
+
#include <optional>
+#include <ostream>
#include <string>
-#include <type_traits>
+#include <utility>
#include <variant>
#include <vector>
+#include "base/integral_types.h"
#include "third_party/absl/strings/string_view.h"
#include "third_party/json/src/json.hpp"
diff --git a/rs_bindings_from_cc/ir.h b/rs_bindings_from_cc/ir.h
index 52a63e9..c597698 100644
--- a/rs_bindings_from_cc/ir.h
+++ b/rs_bindings_from_cc/ir.h
@@ -11,11 +11,15 @@
#ifndef CRUBIT_RS_BINDINGS_FROM_CC_IR_H_
#define CRUBIT_RS_BINDINGS_FROM_CC_IR_H_
+#include <stdint.h>
+
+#include <optional>
#include <string>
-#include <string_view>
#include <utility>
+#include <variant>
#include <vector>
+#include "base/integral_types.h"
#include "base/logging.h"
#include "third_party/absl/strings/string_view.h"
#include "third_party/json/src/json.hpp"
diff --git a/rs_bindings_from_cc/ir_from_cc.cc b/rs_bindings_from_cc/ir_from_cc.cc
index 8ff68dd..cf370f3 100644
--- a/rs_bindings_from_cc/ir_from_cc.cc
+++ b/rs_bindings_from_cc/ir_from_cc.cc
@@ -4,10 +4,21 @@
#include "rs_bindings_from_cc/ir_from_cc.h"
+#include <memory>
+#include <string>
+#include <utility>
+#include <vector>
+
#include "devtools/cymbal/common/clang_tool.h"
#include "rs_bindings_from_cc/frontend_action.h"
+#include "rs_bindings_from_cc/ir.h"
#include "third_party/absl/container/flat_hash_map.h"
+#include "third_party/absl/status/status.h"
+#include "third_party/absl/status/statusor.h"
+#include "third_party/absl/strings/string_view.h"
#include "third_party/absl/strings/substitute.h"
+#include "third_party/absl/types/span.h"
+#include "third_party/llvm/llvm-project/clang/include/clang/Frontend/FrontendAction.h"
namespace rs_bindings_from_cc {
diff --git a/rs_bindings_from_cc/ir_from_cc.h b/rs_bindings_from_cc/ir_from_cc.h
index efbf023..1697823 100644
--- a/rs_bindings_from_cc/ir_from_cc.h
+++ b/rs_bindings_from_cc/ir_from_cc.h
@@ -5,8 +5,6 @@
#ifndef CRUBIT_RS_BINDINGS_FROM_CC_IR_FROM_CC_H_
#define CRUBIT_RS_BINDINGS_FROM_CC_IR_FROM_CC_H_
-#include <vector>
-
#include "rs_bindings_from_cc/ir.h"
#include "third_party/absl/status/statusor.h"
#include "third_party/absl/strings/string_view.h"
diff --git a/rs_bindings_from_cc/ir_test.cc b/rs_bindings_from_cc/ir_test.cc
index 5b07688..7f702d2 100644
--- a/rs_bindings_from_cc/ir_test.cc
+++ b/rs_bindings_from_cc/ir_test.cc
@@ -4,8 +4,6 @@
#include "rs_bindings_from_cc/ir.h"
-#include <string>
-
#include "testing/base/public/gunit.h"
#include "third_party/json/src/json.hpp"
diff --git a/rs_bindings_from_cc/json_from_cc.cc b/rs_bindings_from_cc/json_from_cc.cc
index 37e4d1d..2c33ad0 100644
--- a/rs_bindings_from_cc/json_from_cc.cc
+++ b/rs_bindings_from_cc/json_from_cc.cc
@@ -2,8 +2,15 @@
// Exceptions. See /LICENSE for license information.
// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
+#include <string>
+
+#include "base/logging.h"
#include "rs_bindings_from_cc/ffi_types.h"
+#include "rs_bindings_from_cc/ir.h"
#include "rs_bindings_from_cc/ir_from_cc.h"
+#include "third_party/absl/status/statusor.h"
+#include "third_party/absl/types/span.h"
+#include "third_party/json/src/json.hpp"
#include "util/task/status.h"
namespace rs_bindings_from_cc {
diff --git a/rs_bindings_from_cc/rs_bindings_from_cc.cc b/rs_bindings_from_cc/rs_bindings_from_cc.cc
index b5ce039..638e3a3 100644
--- a/rs_bindings_from_cc/rs_bindings_from_cc.cc
+++ b/rs_bindings_from_cc/rs_bindings_from_cc.cc
@@ -6,25 +6,22 @@
// * a Rust source file with bindings for the C++ API
// * a C++ source file with the implementation of the bindings
-#include <memory>
#include <string>
#include <vector>
#include "base/init_google.h"
#include "base/logging.h"
-#include "devtools/cymbal/common/clang_tool.h"
-#include "rs_bindings_from_cc/frontend_action.h"
#include "rs_bindings_from_cc/ir.h"
#include "rs_bindings_from_cc/ir_from_cc.h"
#include "rs_bindings_from_cc/src_code_gen.h"
#include "file/base/filesystem.h"
#include "file/base/helpers.h"
#include "file/base/options.h"
-#include "third_party/absl/container/flat_hash_map.h"
#include "third_party/absl/flags/flag.h"
+#include "third_party/absl/status/status.h"
+#include "third_party/absl/status/statusor.h"
#include "third_party/absl/strings/string_view.h"
-#include "third_party/absl/strings/substitute.h"
-#include "third_party/llvm/llvm-project/clang/include/clang/Frontend/FrontendAction.h"
+#include "third_party/json/src/json.hpp"
#include "util/task/status.h"
ABSL_FLAG(std::string, rs_out, "",
diff --git a/rs_bindings_from_cc/src_code_gen_test.cc b/rs_bindings_from_cc/src_code_gen_test.cc
index ac8ded7..eab2608 100644
--- a/rs_bindings_from_cc/src_code_gen_test.cc
+++ b/rs_bindings_from_cc/src_code_gen_test.cc
@@ -4,8 +4,6 @@
#include "rs_bindings_from_cc/src_code_gen.h"
-#include <string>
-
#include "rs_bindings_from_cc/ir.h"
#include "testing/base/public/gmock.h"
#include "testing/base/public/gunit.h"
