diff --git a/rs_bindings_from_cc/BUILD b/rs_bindings_from_cc/BUILD
index f891e0e..bd3c0c2 100644
--- a/rs_bindings_from_cc/BUILD
+++ b/rs_bindings_from_cc/BUILD
@@ -158,8 +158,7 @@
     hdrs = ["frontend_action.h"],
     deps = [
         ":ast_consumer",
-        ":importer",
-        "//lifetime_annotations",
+        ":decl_importer",
         "@llvm///clang:ast",
         "@llvm///clang:frontend",
     ],
@@ -170,6 +169,7 @@
     srcs = ["ast_consumer.cc"],
     hdrs = ["ast_consumer.h"],
     deps = [
+        ":decl_importer",
         ":importer",
         "//common:check",
         "@llvm///clang:ast",
diff --git a/rs_bindings_from_cc/ast_consumer.h b/rs_bindings_from_cc/ast_consumer.h
index 8a7891f..4e9808a 100644
--- a/rs_bindings_from_cc/ast_consumer.h
+++ b/rs_bindings_from_cc/ast_consumer.h
@@ -5,7 +5,7 @@
 #ifndef CRUBIT_RS_BINDINGS_FROM_CC_AST_CONSUMER_H_
 #define CRUBIT_RS_BINDINGS_FROM_CC_AST_CONSUMER_H_
 
-#include "rs_bindings_from_cc/importer.h"
+#include "rs_bindings_from_cc/decl_importer.h"
 #include "clang/AST/ASTConsumer.h"
 #include "clang/AST/ASTContext.h"
 #include "clang/Frontend/CompilerInstance.h"
diff --git a/rs_bindings_from_cc/collect_instantiations.cc b/rs_bindings_from_cc/collect_instantiations.cc
index 4fbecef..926f842 100644
--- a/rs_bindings_from_cc/collect_instantiations.cc
+++ b/rs_bindings_from_cc/collect_instantiations.cc
@@ -6,7 +6,6 @@
 
 #include "absl/status/statusor.h"
 #include "absl/types/span.h"
-#include "common/check.h"
 #include "common/ffi_types.h"
 #include "llvm/Support/FormatVariadic.h"
 #include "llvm/Support/JSON.h"
diff --git a/rs_bindings_from_cc/decl_importer.h b/rs_bindings_from_cc/decl_importer.h
index 7b1592b..c1e8809 100644
--- a/rs_bindings_from_cc/decl_importer.h
+++ b/rs_bindings_from_cc/decl_importer.h
@@ -110,8 +110,8 @@
  public:
   ImportContext(Invocation& invocation, clang::ASTContext& ctx,
                 clang::Sema& sema)
-      : invocation_(invocation), ctx_(ctx), sema_(sema), type_mapper_(&ctx){};
-  virtual ~ImportContext(){};
+      : invocation_(invocation), ctx_(ctx), sema_(sema), type_mapper_(&ctx) {}
+  virtual ~ImportContext() {}
 
   // Imports all decls contained in a `DeclContext`.
   virtual void ImportDeclsFromDeclContext(
@@ -172,8 +172,8 @@
 // Interface for components that can import decls of a certain category.
 class DeclImporter {
  public:
-  DeclImporter(ImportContext& ictx) : ictx_(ictx){};
-  virtual ~DeclImporter(){};
+  DeclImporter(ImportContext& ictx) : ictx_(ictx) {}
+  virtual ~DeclImporter() {}
 
   // Determines whether this importer is autoritative for a decl. This does not
   // imply that the import will be succesful.
diff --git a/rs_bindings_from_cc/frontend_action.cc b/rs_bindings_from_cc/frontend_action.cc
index d761e27..4dd9dc5 100644
--- a/rs_bindings_from_cc/frontend_action.cc
+++ b/rs_bindings_from_cc/frontend_action.cc
@@ -6,7 +6,6 @@
 
 #include <memory>
 
-#include "lifetime_annotations/lifetime_annotations.h"
 #include "rs_bindings_from_cc/ast_consumer.h"
 #include "clang/AST/ASTConsumer.h"
 #include "clang/Frontend/CompilerInstance.h"
diff --git a/rs_bindings_from_cc/frontend_action.h b/rs_bindings_from_cc/frontend_action.h
index 3ddcd61..3ba2c44 100644
--- a/rs_bindings_from_cc/frontend_action.h
+++ b/rs_bindings_from_cc/frontend_action.h
@@ -7,7 +7,7 @@
 
 #include <memory>
 
-#include "rs_bindings_from_cc/importer.h"
+#include "rs_bindings_from_cc/decl_importer.h"
 #include "clang/AST/ASTConsumer.h"
 #include "clang/Frontend/CompilerInstance.h"
 #include "clang/Frontend/FrontendAction.h"
diff --git a/rs_bindings_from_cc/importer.h b/rs_bindings_from_cc/importer.h
index 03353e1..aecf1a7 100644
--- a/rs_bindings_from_cc/importer.h
+++ b/rs_bindings_from_cc/importer.h
@@ -21,7 +21,6 @@
 #include "rs_bindings_from_cc/importers/namespace.h"
 #include "rs_bindings_from_cc/importers/typedef_name.h"
 #include "rs_bindings_from_cc/ir.h"
-#include "clang/AST/DeclCXX.h"
 #include "clang/AST/Mangle.h"
 
 namespace crubit {
diff --git a/rs_bindings_from_cc/importer_test.cc b/rs_bindings_from_cc/importer_test.cc
index 56a9232..13d24c1 100644
--- a/rs_bindings_from_cc/importer_test.cc
+++ b/rs_bindings_from_cc/importer_test.cc
@@ -17,7 +17,6 @@
 #include "rs_bindings_from_cc/bazel_types.h"
 #include "rs_bindings_from_cc/ir.h"
 #include "rs_bindings_from_cc/ir_from_cc.h"
-#include "clang/AST/ASTContext.h"
 
 namespace crubit {
 namespace {
diff --git a/rs_bindings_from_cc/rs_bindings_from_cc.cc b/rs_bindings_from_cc/rs_bindings_from_cc.cc
index 891add6..1383fdc 100644
--- a/rs_bindings_from_cc/rs_bindings_from_cc.cc
+++ b/rs_bindings_from_cc/rs_bindings_from_cc.cc
@@ -10,18 +10,14 @@
 #include <utility>
 #include <vector>
 
-#include "absl/container/flat_hash_map.h"
 #include "absl/flags/parse.h"
 #include "absl/status/status.h"
 #include "absl/status/statusor.h"
 #include "absl/strings/string_view.h"
 #include "common/file_io.h"
 #include "common/status_macros.h"
-#include "rs_bindings_from_cc/bazel_types.h"
 #include "rs_bindings_from_cc/cmdline.h"
 #include "rs_bindings_from_cc/generate_bindings_and_metadata.h"
-#include "llvm/Support/FormatVariadic.h"
-#include "llvm/Support/JSON.h"
 #include "llvm/Support/raw_ostream.h"
 
 namespace crubit {