Revert "Fix sst_dump and reduce_levels_test compile errors"

This reverts commit d8f00b4109.

Makefile

@@ -374,8 +374,8 @@ version_edit_test: db/version_edit_test.o $(LIBOBJECTS) $(TESTHARNESS)
 version_set_test: db/version_set_test.o $(LIBOBJECTS) $(TESTHARNESS)
 	$(CXX) db/version_set_test.o $(LIBOBJECTS) $(TESTHARNESS) $(EXEC_LDFLAGS) -o $@ $(LDFLAGS) $(COVERAGEFLAGS)
 
-reduce_levels_test: tools/reduce_levels_test.o $(LIBOBJECTS) $(LDB_OBJECTS) $(TESTHARNESS)
-	$(CXX) tools/reduce_levels_test.o $(LIBOBJECTS) $(LDB_OBJECTS) $(TESTHARNESS) $(EXEC_LDFLAGS) -o $@ $(LDFLAGS) $(COVERAGEFLAGS)
+reduce_levels_test: tools/reduce_levels_test.o $(LIBOBJECTS) $(TESTHARNESS)
+	$(CXX) tools/reduce_levels_test.o $(LIBOBJECTS) $(TESTHARNESS) $(EXEC_LDFLAGS) -o $@ $(LDFLAGS) $(COVERAGEFLAGS)
 
 write_batch_test: db/write_batch_test.o $(LIBOBJECTS) $(TESTHARNESS)
 	$(CXX) db/write_batch_test.o $(LIBOBJECTS) $(TESTHARNESS) $(EXEC_LDFLAGS) -o $@ $(LDFLAGS) $(COVERAGEFLAGS)
@@ -411,8 +411,8 @@ filelock_test: util/filelock_test.o $(LIBOBJECTS) $(TESTHARNESS)
 auto_roll_logger_test: util/auto_roll_logger_test.o $(LIBOBJECTS) $(TESTHARNESS)
 	$(CXX) util/auto_roll_logger_test.o $(LIBOBJECTS) $(TESTHARNESS) $(EXEC_LDFLAGS) -o $@ $(LDFLAGS) $(COVERAGEFLAGS)
 
-sst_dump: tools/sst_dump.o $(LIBOBJECTS) $(LDB_OBJECTS)
-	$(CXX) tools/sst_dump.o $(LIBOBJECTS) $(LDB_OBJECTS) $(EXEC_LDFLAGS) -o $@ $(LDFLAGS) $(COVERAGEFLAGS)
+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)

tools/reduce_levels_test.cc

@@ -9,7 +9,7 @@
 #include "util/logging.h"
 #include "util/testutil.h"
 #include "util/testharness.h"
-#include "tools/ldb_cmd.h"
+#include "util/ldb_cmd.h"
 
 namespace rocksdb {
 

tools/sst_dump.cc

@@ -24,7 +24,7 @@
 #include "table/block_builder.h"
 #include "table/meta_blocks.h"
 #include "table/format.h"
-#include "tools/ldb_cmd.h"
+#include "util/ldb_cmd.h"
 #include "util/random.h"
 #include "util/testharness.h"
 #include "util/testutil.h"