diff --git a/db/column_family_test.cc b/db/column_family_test.cc
index 010933959..3465ab2d4 100644
--- a/db/column_family_test.cc
+++ b/db/column_family_test.cc
@@ -15,6 +15,7 @@
 #include "rocksdb/db.h"
 #include "rocksdb/env.h"
 #include "rocksdb/iterator.h"
+#include "util/string_util.h"
 #include "util/testharness.h"
 #include "util/testutil.h"
 #include "util/coding.h"
diff --git a/db/compaction_job_test.cc b/db/compaction_job_test.cc
index 1f0bdc0fd..9b05bdff4 100644
--- a/db/compaction_job_test.cc
+++ b/db/compaction_job_test.cc
@@ -13,6 +13,7 @@
 #include "rocksdb/cache.h"
 #include "rocksdb/options.h"
 #include "rocksdb/db.h"
+#include "util/string_util.h"
 #include "util/testharness.h"
 #include "util/testutil.h"
 #include "table/mock_table.h"
diff --git a/db/compaction_picker_test.cc b/db/compaction_picker_test.cc
index 7be3a17ea..2d6ac0068 100644
--- a/db/compaction_picker_test.cc
+++ b/db/compaction_picker_test.cc
@@ -7,6 +7,7 @@
 #include <limits>
 #include <string>
 #include "util/logging.h"
+#include "util/string_util.h"
 #include "util/testharness.h"
 #include "util/testutil.h"
 
diff --git a/db/comparator_db_test.cc b/db/comparator_db_test.cc
index 4d28d7c80..6013f75dc 100644
--- a/db/comparator_db_test.cc
+++ b/db/comparator_db_test.cc
@@ -10,6 +10,7 @@
 #include "rocksdb/db.h"
 #include "rocksdb/env.h"
 #include "util/hash.h"
+#include "util/string_util.h"
 #include "util/testharness.h"
 #include "util/testutil.h"
 #include "utilities/merge_operators.h"
diff --git a/db/db_iter_test.cc b/db/db_iter_test.cc
index aa7cad3de..18b38ac5d 100644
--- a/db/db_iter_test.cc
+++ b/db/db_iter_test.cc
@@ -14,6 +14,7 @@
 #include "rocksdb/slice.h"
 #include "rocksdb/statistics.h"
 #include "db/db_iter.h"
+#include "util/string_util.h"
 #include "util/testharness.h"
 #include "utilities/merge_operators.h"
 
diff --git a/db/deletefile_test.cc b/db/deletefile_test.cc
index 4b39cbaa6..83d7b0f22 100644
--- a/db/deletefile_test.cc
+++ b/db/deletefile_test.cc
@@ -12,6 +12,7 @@
 #include "db/filename.h"
 #include "db/version_set.h"
 #include "db/write_batch_internal.h"
+#include "util/string_util.h"
 #include "util/testharness.h"
 #include "util/testutil.h"
 #include "rocksdb/env.h"
diff --git a/db/flush_job_test.cc b/db/flush_job_test.cc
index e08d02ecc..6946ae0aa 100644
--- a/db/flush_job_test.cc
+++ b/db/flush_job_test.cc
@@ -11,6 +11,7 @@
 #include "db/version_set.h"
 #include "db/writebuffer.h"
 #include "rocksdb/cache.h"
+#include "util/string_util.h"
 #include "util/testharness.h"
 #include "util/testutil.h"
 #include "table/mock_table.h"
diff --git a/db/listener_test.cc b/db/listener_test.cc
index 0714b1938..088bb0f51 100644
--- a/db/listener_test.cc
+++ b/db/listener_test.cc
@@ -27,6 +27,7 @@
 #include "util/mutexlock.h"
 #include "util/rate_limiter.h"
 #include "util/statistics.h"
+#include "util/string_util.h"
 #include "util/testharness.h"
 #include "util/sync_point.h"
 #include "util/testutil.h"
diff --git a/db/plain_table_db_test.cc b/db/plain_table_db_test.cc
index 72395609a..edcfde722 100644
--- a/db/plain_table_db_test.cc
+++ b/db/plain_table_db_test.cc
@@ -29,6 +29,7 @@
 #include "util/hash.h"
 #include "util/logging.h"
 #include "util/mutexlock.h"
+#include "util/string_util.h"
 #include "util/testharness.h"
 #include "util/testutil.h"
 #include "utilities/merge_operators.h"
diff --git a/db/prefix_test.cc b/db/prefix_test.cc
index bb15d69bc..3cc4e8938 100644
--- a/db/prefix_test.cc
+++ b/db/prefix_test.cc
@@ -23,6 +23,7 @@ int main() {
 #include "rocksdb/memtablerep.h"
 #include "util/histogram.h"
 #include "util/stop_watch.h"
+#include "util/string_util.h"
 #include "util/testharness.h"
 
 using GFLAGS::ParseCommandLineFlags;
diff --git a/db/version_builder_test.cc b/db/version_builder_test.cc
index c92cad20d..099bb7863 100644
--- a/db/version_builder_test.cc
+++ b/db/version_builder_test.cc
@@ -7,6 +7,7 @@
 #include "db/version_edit.h"
 #include "db/version_set.h"
 #include "util/logging.h"
+#include "util/string_util.h"
 #include "util/testharness.h"
 #include "util/testutil.h"
 
diff --git a/db/wal_manager_test.cc b/db/wal_manager_test.cc
index 20b3f4b56..28f29c7dd 100644
--- a/db/wal_manager_test.cc
+++ b/db/wal_manager_test.cc
@@ -14,6 +14,7 @@
 #include "db/column_family.h"
 #include "db/version_set.h"
 #include "db/writebuffer.h"
+#include "util/string_util.h"
 #include "util/testharness.h"
 #include "util/testutil.h"
 #include "table/mock_table.h"
diff --git a/db/write_batch_test.cc b/db/write_batch_test.cc
index 7c138455f..649fb89a8 100644
--- a/db/write_batch_test.cc
+++ b/db/write_batch_test.cc
@@ -18,6 +18,7 @@
 #include "rocksdb/memtablerep.h"
 #include "rocksdb/utilities/write_batch_with_index.h"
 #include "util/logging.h"
+#include "util/string_util.h"
 #include "util/testharness.h"
 #include "util/scoped_arena_iterator.h"
 
diff --git a/table/cuckoo_table_reader_test.cc b/table/cuckoo_table_reader_test.cc
index 91bca7e46..1bafdd0b9 100644
--- a/table/cuckoo_table_reader_test.cc
+++ b/table/cuckoo_table_reader_test.cc
@@ -28,6 +28,7 @@ int main() {
 #include "table/get_context.h"
 #include "util/arena.h"
 #include "util/random.h"
+#include "util/string_util.h"
 #include "util/testharness.h"
 #include "util/testutil.h"
 
diff --git a/table/table_test.cc b/table/table_test.cc
index e713f19bf..aba7f7133 100644
--- a/table/table_test.cc
+++ b/table/table_test.cc
@@ -43,6 +43,7 @@
 #include "util/compression.h"
 #include "util/random.h"
 #include "util/statistics.h"
+#include "util/string_util.h"
 #include "util/testharness.h"
 #include "util/testutil.h"
 #include "util/scoped_arena_iterator.h"
diff --git a/util/autovector_test.cc b/util/autovector_test.cc
index 5a347725a..1c23c4335 100644
--- a/util/autovector_test.cc
+++ b/util/autovector_test.cc
@@ -9,6 +9,7 @@
 
 #include "rocksdb/env.h"
 #include "util/autovector.h"
+#include "util/string_util.h"
 #include "util/testharness.h"
 #include "util/testutil.h"
 
diff --git a/util/cache_test.cc b/util/cache_test.cc
index 834973659..e11829d26 100644
--- a/util/cache_test.cc
+++ b/util/cache_test.cc
@@ -13,6 +13,7 @@
 #include <string>
 #include <iostream>
 #include "util/coding.h"
+#include "util/string_util.h"
 #include "util/testharness.h"
 
 namespace rocksdb {
diff --git a/util/env_test.cc b/util/env_test.cc
index 23c3726d9..0d4f6acbe 100644
--- a/util/env_test.cc
+++ b/util/env_test.cc
@@ -28,6 +28,7 @@
 #include "util/coding.h"
 #include "util/log_buffer.h"
 #include "util/mutexlock.h"
+#include "util/string_util.h"
 #include "util/testharness.h"
 
 namespace rocksdb {
diff --git a/util/testharness.h b/util/testharness.h
index 8724ac568..1600ff3e1 100644
--- a/util/testharness.h
+++ b/util/testharness.h
@@ -13,7 +13,6 @@
 
 #include <string>
 #include "rocksdb/env.h"
-#include "util/string_util.h"
 
 namespace rocksdb {
 namespace test {