diff --git a/src/cache.h b/src/cache.h
index af2e5951..46ad7ec0 100644
--- a/src/cache.h
+++ b/src/cache.h
@@ -3,7 +3,7 @@
 #include <memory>
 #include <string>
 
-class IndexedFile;
+struct IndexedFile;
 
 std::string GetCachedFileName(std::string source_file);
 
diff --git a/src/command_line.cc b/src/command_line.cc
index c199605c..2ec3f125 100644
--- a/src/command_line.cc
+++ b/src/command_line.cc
@@ -351,23 +351,6 @@ void AddCodeLens(
     result->push_back(code_lens);
 }
 
-// TODO: clean these overrides up...
-void AddCodeLens(
-  QueryableDatabase* db,
-  std::vector<TCodeLens>* result,
-  QueryableLocation loc,
-  const std::vector<UsrRef>& uses,
-  bool exclude_loc,
-  bool only_interesting,
-  const char* singular,
-  const char* plural) {
-  std::vector<QueryableLocation> uses0;
-  uses0.reserve(uses.size());
-  for (const UsrRef& use : uses)
-    uses0.push_back(use.loc);
-  AddCodeLens(db, result, loc, uses0, exclude_loc, only_interesting, singular, plural);
-}
-
 void AddCodeLens(
   QueryableDatabase* db,
   std::vector<TCodeLens>* result,
diff --git a/src/query.h b/src/query.h
index ead9945d..48d8d84e 100644
--- a/src/query.h
+++ b/src/query.h
@@ -103,21 +103,6 @@ struct QueryFuncRef {
   }
 };
 
-struct UsrRef {
-  Usr usr;
-  QueryableLocation loc;
-
-  UsrRef(Usr usr, QueryableLocation loc) : usr(usr), loc(loc) {}
-
-  bool operator==(const UsrRef& other) const {
-    return usr == other.usr && loc.range.start == other.loc.range.start;
-  }
-  bool operator!=(const UsrRef& other) const { return !(*this == other); }
-  bool operator<(const UsrRef& other) const {
-    return usr < other.usr && loc.range.start < other.loc.range.start;
-  }
-};
-
 // There are two sources of reindex updates: the (single) definition of a
 // symbol has changed, or one of many users of the symbol has changed.
 //
diff --git a/src/utils.h b/src/utils.h
index 13aba67a..15ecf4f7 100644
--- a/src/utils.h
+++ b/src/utils.h
@@ -3,7 +3,7 @@
 #include <functional>
 #include <memory>
 #include <string>
-#include <unordered_map>>
+#include <unordered_map>
 #include <vector>
 
 // Returns true if |value| starts/ends with |start| or |ending|.