diff --git a/kythe/cxx/verifier/BUILD b/kythe/cxx/verifier/BUILD
index 8ddaf342af..3930edd2d2 100644
--- a/kythe/cxx/verifier/BUILD
+++ b/kythe/cxx/verifier/BUILD
@@ -93,6 +93,7 @@ cc_library(
     ],
     deps = [
         ":lexparse",
+        "@com_google_absl//absl/container:flat_hash_map",
         "@com_google_absl//absl/strings",
     ],
 )
diff --git a/kythe/cxx/verifier/verifier.cc b/kythe/cxx/verifier/verifier.cc
index 758680ce88..8737e0b3dc 100644
--- a/kythe/cxx/verifier/verifier.cc
+++ b/kythe/cxx/verifier/verifier.cc
@@ -1157,7 +1157,10 @@ bool Verifier::ProcessFactTupleForFastSolver(Tuple* tuple) {
 }
 
 bool Verifier::PrepareDatabase() {
-  if (database_prepared_ || use_fast_solver_) {
+  if (database_prepared_) {
+    return true;
+  }
+  if (use_fast_solver_) {
     LOG(WARNING) << "PrepareDatabase() called when fast solver was enabled";
     return true;
   }