diff --git a/Makefile b/Makefile
index 9a09d3e02..a8f451b58 100644
--- a/Makefile
+++ b/Makefile
@@ -106,17 +106,13 @@ TESTS = \
         geodb_test
 
 TOOLS = \
-	sst_dump \
+        sst_dump \
 	db_sanity_test \
-	db_stress \
-	ldb \
+        db_stress \
+        ldb \
 	db_repl_stress \
 	blob_store_bench
 
-LDB_OBJECTS = \
-		tools/ldb_cmd.o \
-		tools/ldb_tool.o
-
 
 PROGRAMS = db_bench signal_test table_reader_bench $(TESTS) $(TOOLS)
 BENCHMARKS = db_bench_sqlite3 db_bench_tree_db table_reader_bench
@@ -414,8 +410,8 @@ auto_roll_logger_test: util/auto_roll_logger_test.o $(LIBOBJECTS) $(TESTHARNESS)
 sst_dump: tools/sst_dump.o $(LIBOBJECTS)
 	$(CXX) tools/sst_dump.o $(LIBOBJECTS) $(EXEC_LDFLAGS) -o $@ $(LDFLAGS) $(COVERAGEFLAGS)
 
-ldb: tools/ldb.o $(LDB_OBJECTS) $(LIBOBJECTS)
-	$(CXX) tools/ldb.o $(LDB_OBJECTS) $(LIBOBJECTS) $(EXEC_LDFLAGS) -o $@ $(LDFLAGS) $(COVERAGEFLAGS)
+ldb: tools/ldb.o $(LIBOBJECTS)
+	$(CXX) tools/ldb.o $(LIBOBJECTS) $(EXEC_LDFLAGS) -o $@ $(LDFLAGS) $(COVERAGEFLAGS)
 
 # ---------------------------------------------------------------------------
 # Jni stuff
diff --git a/tools/ldb_tool.h b/include/rocksdb/ldb_tool.h
similarity index 77%
rename from tools/ldb_tool.h
rename to include/rocksdb/ldb_tool.h
index ba1e88288..a46b6a758 100644
--- a/tools/ldb_tool.h
+++ b/include/rocksdb/ldb_tool.h
@@ -2,8 +2,8 @@
 // This source code is licensed under the BSD-style license found in the
 // LICENSE file in the root directory of this source tree. An additional grant
 // of patent rights can be found in the PATENTS file in the same directory.
-#pragma once
-
+#ifndef STORAGE_ROCKSDB_INCLUDE_LDB_TOOL_H
+#define STORAGE_ROCKSDB_INCLUDE_LDB_TOOL_H
 #include "rocksdb/options.h"
 
 namespace rocksdb {
@@ -14,3 +14,5 @@ class LDBTool {
 };
 
 } // namespace rocksdb
+
+#endif // STORAGE_ROCKSDB_INCLUDE_LDB_TOOL_H
diff --git a/tools/ldb.cc b/tools/ldb.cc
index e19708880..4581b8011 100644
--- a/tools/ldb.cc
+++ b/tools/ldb.cc
@@ -4,7 +4,7 @@
 //  of patent rights can be found in the PATENTS file in the same directory.
 //
 
-#include "tools/ldb_tool.h"
+#include "rocksdb/ldb_tool.h"
 
 int main(int argc, char** argv) {
   rocksdb::LDBTool tool;
diff --git a/tools/ldb_cmd.cc b/util/ldb_cmd.cc
similarity index 99%
rename from tools/ldb_cmd.cc
rename to util/ldb_cmd.cc
index da67d1190..8ed8014f2 100644
--- a/tools/ldb_cmd.cc
+++ b/util/ldb_cmd.cc
@@ -3,7 +3,7 @@
 //  LICENSE file in the root directory of this source tree. An additional grant
 //  of patent rights can be found in the PATENTS file in the same directory.
 //
-#include "tools/ldb_cmd.h"
+#include "util/ldb_cmd.h"
 
 #include "db/dbformat.h"
 #include "db/db_impl.h"
diff --git a/tools/ldb_cmd.h b/util/ldb_cmd.h
similarity index 99%
rename from tools/ldb_cmd.h
rename to util/ldb_cmd.h
index bf5c80256..f0ac59158 100644
--- a/tools/ldb_cmd.h
+++ b/util/ldb_cmd.h
@@ -17,7 +17,7 @@
 #include "rocksdb/iterator.h"
 #include "rocksdb/slice.h"
 #include "util/logging.h"
-#include "tools/ldb_cmd_execute_result.h"
+#include "util/ldb_cmd_execute_result.h"
 #include "util/string_util.h"
 #include "utilities/utility_db.h"
 #include "utilities/ttl/db_ttl.h"
diff --git a/tools/ldb_cmd_execute_result.h b/util/ldb_cmd_execute_result.h
similarity index 100%
rename from tools/ldb_cmd_execute_result.h
rename to util/ldb_cmd_execute_result.h
diff --git a/tools/ldb_tool.cc b/util/ldb_tool.cc
similarity index 98%
rename from tools/ldb_tool.cc
rename to util/ldb_tool.cc
index 55abec422..134547b19 100644
--- a/tools/ldb_tool.cc
+++ b/util/ldb_tool.cc
@@ -3,8 +3,8 @@
 //  LICENSE file in the root directory of this source tree. An additional grant
 //  of patent rights can be found in the PATENTS file in the same directory.
 //
-#include "tools/ldb_tool.h"
-#include "tools/ldb_cmd.h"
+#include "rocksdb/ldb_tool.h"
+#include "util/ldb_cmd.h"
 
 namespace rocksdb {