Move include files into a leveldb subdir.

git-svn-id: https://leveldb.googlecode.com/svn/trunk@18 62dab493-f737-651d-591e-8d6aee1b9529

56 files changed, 123 insertions, 117 deletions

diff --git a/Makefile b/Makefile
index 8fbcddf..7569701 100644
--- a/Makefile
+++ b/Makefile
@@ -8,7 +8,7 @@ CC = g++
 #OPT = -O2 -DNDEBUG
 OPT = -g2
 
-CFLAGS = -c -DLEVELDB_PLATFORM_POSIX -I. -std=c++0x $(OPT)
+CFLAGS = -c -DLEVELDB_PLATFORM_POSIX -I. -I./include -std=c++0x $(OPT)
 
 LDFLAGS=-lpthread
 
diff --git a/db/builder.cc b/db/builder.cc
index d5585c3..6c8e6b8 100644
--- a/db/builder.cc
+++ b/db/builder.cc
@@ -8,9 +8,9 @@
 #include "db/dbformat.h"
 #include "db/table_cache.h"
 #include "db/version_edit.h"
-#include "include/db.h"
-#include "include/env.h"
-#include "include/iterator.h"
+#include "leveldb/db.h"
+#include "leveldb/env.h"
+#include "leveldb/iterator.h"
 
 namespace leveldb {
 
diff --git a/db/builder.h b/db/builder.h
index 2d8afdf..4efcb04 100644
--- a/db/builder.h
+++ b/db/builder.h
@@ -5,7 +5,7 @@
 #ifndef STORAGE_LEVELDB_DB_BUILDER_H_
 #define STORAGE_LEVELDB_DB_BUILDER_H_
 
-#include "include/status.h"
+#include "leveldb/status.h"
 
 namespace leveldb {
 
diff --git a/db/corruption_test.cc b/db/corruption_test.cc
index 1f4f26c..de9408c 100644
--- a/db/corruption_test.cc
+++ b/db/corruption_test.cc
@@ -2,15 +2,15 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file. See the AUTHORS file for names of contributors.
 
-#include "include/db.h"
+#include "leveldb/db.h"
 
 #include <errno.h>
 #include <fcntl.h>
 #include <sys/stat.h>
 #include <sys/types.h>
-#include "include/env.h"
-#include "include/table.h"
-#include "include/write_batch.h"
+#include "leveldb/env.h"
+#include "leveldb/table.h"
+#include "leveldb/write_batch.h"
 #include "db/db_impl.h"
 #include "db/filename.h"
 #include "db/log_format.h"
diff --git a/db/db_bench.cc b/db/db_bench.cc
index c7a662d..411493c 100644
--- a/db/db_bench.cc
+++ b/db/db_bench.cc
@@ -7,10 +7,10 @@
 #include <stdlib.h>
 #include "db/db_impl.h"
 #include "db/version_set.h"
-#include "include/cache.h"
-#include "include/db.h"
-#include "include/env.h"
-#include "include/write_batch.h"
+#include "leveldb/cache.h"
+#include "leveldb/db.h"
+#include "leveldb/env.h"
+#include "leveldb/write_batch.h"
 #include "port/port.h"
 #include "util/crc32c.h"
 #include "util/histogram.h"
diff --git a/db/db_impl.cc b/db/db_impl.cc
index f14167a..cf5471b 100644
--- a/db/db_impl.cc
+++ b/db/db_impl.cc
@@ -20,11 +20,11 @@
 #include "db/table_cache.h"
 #include "db/version_set.h"
 #include "db/write_batch_internal.h"
-#include "include/db.h"
-#include "include/env.h"
-#include "include/status.h"
-#include "include/table.h"
-#include "include/table_builder.h"
+#include "leveldb/db.h"
+#include "leveldb/env.h"
+#include "leveldb/status.h"
+#include "leveldb/table.h"
+#include "leveldb/table_builder.h"
 #include "port/port.h"
 #include "table/block.h"
 #include "table/merger.h"
diff --git a/db/db_impl.h b/db/db_impl.h
index 6e98e3c..49ac37b 100644
--- a/db/db_impl.h
+++ b/db/db_impl.h
@@ -9,8 +9,8 @@
 #include "db/dbformat.h"
 #include "db/log_writer.h"
 #include "db/snapshot.h"
-#include "include/db.h"
-#include "include/env.h"
+#include "leveldb/db.h"
+#include "leveldb/env.h"
 #include "port/port.h"
 
 namespace leveldb {
diff --git a/db/db_iter.cc b/db/db_iter.cc
index beb4d74..31c2a38 100644
--- a/db/db_iter.cc
+++ b/db/db_iter.cc
@@ -6,8 +6,8 @@
 
 #include "db/filename.h"
 #include "db/dbformat.h"
-#include "include/env.h"
-#include "include/iterator.h"
+#include "leveldb/env.h"
+#include "leveldb/iterator.h"
 #include "port/port.h"
 #include "util/logging.h"
 #include "util/mutexlock.h"
diff --git a/db/db_iter.h b/db/db_iter.h
index a0be50e..195f3d3 100644
--- a/db/db_iter.h
+++ b/db/db_iter.h
@@ -6,7 +6,7 @@
 #define STORAGE_LEVELDB_DB_DB_ITER_H_
 
 #include <stdint.h>
-#include "include/db.h"
+#include "leveldb/db.h"
 #include "db/dbformat.h"
 
 namespace leveldb {
diff --git a/db/db_test.cc b/db/db_test.cc
index 0414176..f68e759 100644
--- a/db/db_test.cc
+++ b/db/db_test.cc
@@ -2,14 +2,14 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file. See the AUTHORS file for names of contributors.
 
-#include "include/db.h"
+#include "leveldb/db.h"
 
 #include "db/db_impl.h"
 #include "db/filename.h"
 #include "db/version_set.h"
 #include "db/write_batch_internal.h"
-#include "include/env.h"
-#include "include/table.h"
+#include "leveldb/env.h"
+#include "leveldb/table.h"
 #include "util/logging.h"
 #include "util/testharness.h"
 #include "util/testutil.h"
diff --git a/db/dbformat.h b/db/dbformat.h
index e784457..6f34cd1 100644
--- a/db/dbformat.h
+++ b/db/dbformat.h
@@ -6,10 +6,10 @@
 #define STORAGE_LEVELDB_DB_FORMAT_H_
 
 #include <stdio.h>
-#include "include/comparator.h"
-#include "include/db.h"
-#include "include/slice.h"
-#include "include/table_builder.h"
+#include "leveldb/comparator.h"
+#include "leveldb/db.h"
+#include "leveldb/slice.h"
+#include "leveldb/table_builder.h"
 #include "util/coding.h"
 #include "util/logging.h"
 
diff --git a/db/filename.cc b/db/filename.cc
index 55e6d28..d21918c 100644
--- a/db/filename.cc
+++ b/db/filename.cc
@@ -6,7 +6,7 @@
 #include <stdio.h>
 #include "db/filename.h"
 #include "db/dbformat.h"
-#include "include/env.h"
+#include "leveldb/env.h"
 #include "util/logging.h"
 
 namespace leveldb {
diff --git a/db/filename.h b/db/filename.h
index 3fd2ea4..81ab2fc 100644
--- a/db/filename.h
+++ b/db/filename.h
@@ -9,8 +9,8 @@
 
 #include <stdint.h>
 #include <string>
-#include "include/slice.h"
-#include "include/status.h"
+#include "leveldb/slice.h"
+#include "leveldb/status.h"
 #include "port/port.h"
 
 namespace leveldb {
diff --git a/db/log_reader.cc b/db/log_reader.cc
index 407700d..75e1d28 100644
--- a/db/log_reader.cc
+++ b/db/log_reader.cc
@@ -5,7 +5,7 @@
 #include "db/log_reader.h"
 
 #include <stdint.h>
-#include "include/env.h"
+#include "leveldb/env.h"
 #include "util/coding.h"
 #include "util/crc32c.h"
 
diff --git a/db/log_reader.h b/db/log_reader.h
index 515d2af..baf1475 100644
--- a/db/log_reader.h
+++ b/db/log_reader.h
@@ -6,8 +6,8 @@
 #define STORAGE_LEVELDB_DB_LOG_READER_H_
 
 #include "db/log_format.h"
-#include "include/slice.h"
-#include "include/status.h"
+#include "leveldb/slice.h"
+#include "leveldb/status.h"
 
 namespace leveldb {
 
diff --git a/db/log_test.cc b/db/log_test.cc
index 5fa20aa..025a5ff 100644
--- a/db/log_test.cc
+++ b/db/log_test.cc
@@ -4,7 +4,7 @@
 
 #include "db/log_reader.h"
 #include "db/log_writer.h"
-#include "include/env.h"
+#include "leveldb/env.h"
 #include "util/coding.h"
 #include "util/crc32c.h"
 #include "util/random.h"
diff --git a/db/log_writer.cc b/db/log_writer.cc
index fc33e6e..18ca37a 100644
--- a/db/log_writer.cc
+++ b/db/log_writer.cc
@@ -5,7 +5,7 @@
 #include "db/log_writer.h"
 
 #include <stdint.h>
-#include "include/env.h"
+#include "leveldb/env.h"
 #include "util/coding.h"
 #include "util/crc32c.h"
 
diff --git a/db/log_writer.h b/db/log_writer.h
index 13c64ba..d3cf27d 100644
--- a/db/log_writer.h
+++ b/db/log_writer.h
@@ -7,8 +7,8 @@
 
 #include <stdint.h>
 #include "db/log_format.h"
-#include "include/slice.h"
-#include "include/status.h"
+#include "leveldb/slice.h"
+#include "leveldb/status.h"
 
 namespace leveldb {
 
diff --git a/db/memtable.cc b/db/memtable.cc
index 349cfcc..a3b618a 100644
--- a/db/memtable.cc
+++ b/db/memtable.cc
@@ -4,9 +4,9 @@
 
 #include "db/memtable.h"
 #include "db/dbformat.h"
-#include "include/comparator.h"
-#include "include/env.h"
-#include "include/iterator.h"
+#include "leveldb/comparator.h"
+#include "leveldb/env.h"
+#include "leveldb/iterator.h"
 #include "util/coding.h"
 
 namespace leveldb {
diff --git a/db/memtable.h b/db/memtable.h
index fa95e15..45b3342 100644
--- a/db/memtable.h
+++ b/db/memtable.h
@@ -6,7 +6,7 @@
 #define STORAGE_LEVELDB_DB_MEMTABLE_H_
 
 #include <string>
-#include "include/db.h"
+#include "leveldb/db.h"
 #include "db/dbformat.h"
 #include "db/skiplist.h"
 #include "util/arena.h"
diff --git a/db/repair.cc b/db/repair.cc
index 745b31a..014e00e 100644
--- a/db/repair.cc
+++ b/db/repair.cc
@@ -36,9 +36,9 @@
 #include "db/table_cache.h"
 #include "db/version_edit.h"
 #include "db/write_batch_internal.h"
-#include "include/comparator.h"
-#include "include/db.h"
-#include "include/env.h"
+#include "leveldb/comparator.h"
+#include "leveldb/db.h"
+#include "leveldb/env.h"
 
 namespace leveldb {
 
diff --git a/db/skiplist_test.cc b/db/skiplist_test.cc
index 0cfc893..5f9ec0d 100644
--- a/db/skiplist_test.cc
+++ b/db/skiplist_test.cc
@@ -4,7 +4,7 @@
 
 #include "db/skiplist.h"
 #include <set>
-#include "include/env.h"
+#include "leveldb/env.h"
 #include "util/arena.h"
 #include "util/hash.h"
 #include "util/random.h"
diff --git a/db/snapshot.h b/db/snapshot.h
index 6a07f80..9a90756 100644
--- a/db/snapshot.h
+++ b/db/snapshot.h
@@ -5,7 +5,7 @@
 #ifndef STORAGE_LEVELDB_DB_SNAPSHOT_H_
 #define STORAGE_LEVELDB_DB_SNAPSHOT_H_
 
-#include "include/db.h"
+#include "leveldb/db.h"
 
 namespace leveldb {
 
diff --git a/db/table_cache.cc b/db/table_cache.cc
index 6f750d6..325d707 100644
--- a/db/table_cache.cc
+++ b/db/table_cache.cc
@@ -5,8 +5,8 @@
 #include "db/table_cache.h"
 
 #include "db/filename.h"
-#include "include/env.h"
-#include "include/table.h"
+#include "leveldb/env.h"
+#include "leveldb/table.h"
 #include "util/coding.h"
 
 namespace leveldb {
diff --git a/db/table_cache.h b/db/table_cache.h
index 5564dfc..5376194 100644
--- a/db/table_cache.h
+++ b/db/table_cache.h
@@ -10,8 +10,8 @@
 #include <string>
 #include <stdint.h>
 #include "db/dbformat.h"
-#include "include/cache.h"
-#include "include/table.h"
+#include "leveldb/cache.h"
+#include "leveldb/table.h"
 #include "port/port.h"
 
 namespace leveldb {
diff --git a/db/version_set.cc b/db/version_set.cc
index b826e5b..dc9b418 100644
--- a/db/version_set.cc
+++ b/db/version_set.cc
@@ -11,8 +11,8 @@
 #include "db/log_writer.h"
 #include "db/memtable.h"
 #include "db/table_cache.h"
-#include "include/env.h"
-#include "include/table_builder.h"
+#include "leveldb/env.h"
+#include "leveldb/table_builder.h"
 #include "table/merger.h"
 #include "table/two_level_iterator.h"
 #include "util/coding.h"
diff --git a/db/write_batch.cc b/db/write_batch.cc
index b6c4979..e84e548 100644
--- a/db/write_batch.cc
+++ b/db/write_batch.cc
@@ -14,9 +14,9 @@
 //    len: varint32
 //    data: uint8[len]
 
-#include "include/write_batch.h"
+#include "leveldb/write_batch.h"
 
-#include "include/db.h"
+#include "leveldb/db.h"
 #include "db/dbformat.h"
 #include "db/memtable.h"
 #include "db/write_batch_internal.h"
diff --git a/db/write_batch_internal.h b/db/write_batch_internal.h
index df750c7..ea28e2d 100644
--- a/db/write_batch_internal.h
+++ b/db/write_batch_internal.h
@@ -5,7 +5,7 @@
 #ifndef STORAGE_LEVELDB_DB_WRITE_BATCH_INTERNAL_H_
 #define STORAGE_LEVELDB_DB_WRITE_BATCH_INTERNAL_H_
 
-#include "include/write_batch.h"
+#include "leveldb/write_batch.h"
 
 namespace leveldb {
 
diff --git a/db/write_batch_test.cc b/db/write_batch_test.cc
index 4963579..deb8411 100644
--- a/db/write_batch_test.cc
+++ b/db/write_batch_test.cc
@@ -2,11 +2,11 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file. See the AUTHORS file for names of contributors.
 
-#include "include/db.h"
+#include "leveldb/db.h"
 
 #include "db/memtable.h"
 #include "db/write_batch_internal.h"
-#include "include/env.h"
+#include "leveldb/env.h"
 #include "util/logging.h"
 #include "util/testharness.h"
 
diff --git a/leveldb.gyp b/leveldb.gyp
index eb809f3..d10ac33 100644
--- a/leveldb.gyp
+++ b/leveldb.gyp
@@ -12,6 +12,7 @@
     ],
     'include_dirs': [
       '.',
+      'include/',
     ],
     'conditions': [
       ['OS == "win"', {
@@ -42,6 +43,11 @@
           ],
         }],
       ],
+      'direct_dependent_settings': {
+        'include_dirs': [
+          'include/',
+        ],
+      },
       'sources': [
         # Include and then exclude so that all files show up in IDEs, even if
         # they don't build.
@@ -73,17 +79,17 @@
         'db/version_set.h',
         'db/write_batch.cc',
         'db/write_batch_internal.h',
-        'include/cache.h',
-        'include/comparator.h',
-        'include/db.h',
-        'include/env.h',
-        'include/iterator.h',
-        'include/options.h',
-        'include/slice.h',
-        'include/status.h',
-        'include/table.h',
-        'include/table_builder.h',
-        'include/write_batch.h',
+        'include/leveldb/cache.h',
+        'include/leveldb/comparator.h',
+        'include/leveldb/db.h',
+        'include/leveldb/env.h',
+        'include/leveldb/iterator.h',
+        'include/leveldb/options.h',
+        'include/leveldb/slice.h',
+        'include/leveldb/status.h',
+        'include/leveldb/table.h',
+        'include/leveldb/table_builder.h',
+        'include/leveldb/write_batch.h',
         'port/port.h',
         'port/port_chromium.cc',
         'port/port_chromium.h',
diff --git a/table/block.cc b/table/block.cc
index 351eb48..0525d2d 100644
--- a/table/block.cc
+++ b/table/block.cc
@@ -8,7 +8,7 @@
 
 #include <vector>
 #include <algorithm>
-#include "include/comparator.h"
+#include "leveldb/comparator.h"
 #include "util/coding.h"
 #include "util/logging.h"
 
diff --git a/table/block.h b/table/block.h
index 9372001..cdf0598 100644
--- a/table/block.h
+++ b/table/block.h
@@ -7,7 +7,7 @@
 
 #include <stddef.h>
 #include <stdint.h>
-#include "include/iterator.h"
+#include "leveldb/iterator.h"
 
 namespace leveldb {
 
diff --git a/table/block_builder.cc b/table/block_builder.cc
index 2c33492..ae18b36 100644
--- a/table/block_builder.cc
+++ b/table/block_builder.cc
@@ -30,8 +30,8 @@
 
 #include <algorithm>
 #include <assert.h>
-#include "include/comparator.h"
-#include "include/table_builder.h"
+#include "leveldb/comparator.h"
+#include "leveldb/table_builder.h"
 #include "util/coding.h"
 
 namespace leveldb {
diff --git a/table/block_builder.h b/table/block_builder.h
index beab168..bf92a0f 100644
--- a/table/block_builder.h
+++ b/table/block_builder.h
@@ -8,7 +8,7 @@
 #include <vector>
 
 #include <stdint.h>
-#include "include/slice.h"
+#include "leveldb/slice.h"
 
 namespace leveldb {
 
diff --git a/table/format.cc b/table/format.cc
index 191a9bd..8c6b0f3 100644
--- a/table/format.cc
+++ b/table/format.cc
@@ -4,7 +4,7 @@
 
 #include "table/format.h"
 
-#include "include/env.h"
+#include "leveldb/env.h"
 #include "port/port.h"
 #include "table/block.h"
 #include "util/coding.h"
diff --git a/table/format.h b/table/format.h
index 03e3ee2..a6ab964 100644
--- a/table/format.h
+++ b/table/format.h
@@ -7,9 +7,9 @@
 
 #include <string>
 #include <stdint.h>
-#include "include/slice.h"
-#include "include/status.h"
-#include "include/table_builder.h"
+#include "leveldb/slice.h"
+#include "leveldb/status.h"
+#include "leveldb/table_builder.h"
 
 namespace leveldb {
 
diff --git a/table/iterator.cc b/table/iterator.cc
index f3c0856..4ddd55f 100644
--- a/table/iterator.cc
+++ b/table/iterator.cc
@@ -2,7 +2,7 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file. See the AUTHORS file for names of contributors.
 
-#include "include/iterator.h"
+#include "leveldb/iterator.h"
 #include "util/logging.h"
 
 namespace leveldb {
diff --git a/table/merger.cc b/table/merger.cc
index afa8b77..6ce06bb 100644
--- a/table/merger.cc
+++ b/table/merger.cc
@@ -4,8 +4,8 @@
 
 #include "table/merger.h"
 
-#include "include/comparator.h"
-#include "include/iterator.h"
+#include "leveldb/comparator.h"
+#include "leveldb/iterator.h"
 #include "table/iterator_wrapper.h"
 
 namespace leveldb {
diff --git a/table/table.cc b/table/table.cc
index bd0fbb5..9820753 100644
--- a/table/table.cc
+++ b/table/table.cc
@@ -2,10 +2,10 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file. See the AUTHORS file for names of contributors.
 
-#include "include/table.h"
+#include "leveldb/table.h"
 
-#include "include/cache.h"
-#include "include/env.h"
+#include "leveldb/cache.h"
+#include "leveldb/env.h"
 #include "table/block.h"
 #include "table/format.h"
 #include "table/two_level_iterator.h"
diff --git a/table/table_builder.cc b/table/table_builder.cc
index 3bc1b88..7ec7ad2 100644
--- a/table/table_builder.cc
+++ b/table/table_builder.cc
@@ -2,12 +2,12 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file. See the AUTHORS file for names of contributors.
 
-#include "include/table_builder.h"
+#include "leveldb/table_builder.h"
 
 #include <assert.h>
 #include <stdio.h>
-#include "include/comparator.h"
-#include "include/env.h"
+#include "leveldb/comparator.h"
+#include "leveldb/env.h"
 #include "table/block_builder.h"
 #include "table/format.h"
 #include "util/coding.h"
diff --git a/table/table_test.cc b/table/table_test.cc
index d67c58b..e0c7134 100644
--- a/table/table_test.cc
+++ b/table/table_test.cc
@@ -2,16 +2,16 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file. See the AUTHORS file for names of contributors.
 
-#include "include/table.h"
+#include "leveldb/table.h"
 
 #include <map>
 #include "db/dbformat.h"
 #include "db/memtable.h"
 #include "db/write_batch_internal.h"
-#include "include/db.h"
-#include "include/env.h"
-#include "include/iterator.h"
-#include "include/table_builder.h"
+#include "leveldb/db.h"
+#include "leveldb/env.h"
+#include "leveldb/iterator.h"
+#include "leveldb/table_builder.h"
 #include "table/block.h"
 #include "table/block_builder.h"
 #include "table/format.h"
diff --git a/table/two_level_iterator.cc b/table/two_level_iterator.cc
index 9b081f4..24a1241 100644
--- a/table/two_level_iterator.cc
+++ b/table/two_level_iterator.cc
@@ -4,7 +4,7 @@
 
 #include "table/two_level_iterator.h"
 
-#include "include/table.h"
+#include "leveldb/table.h"
 #include "table/block.h"
 #include "table/format.h"
 #include "table/iterator_wrapper.h"
diff --git a/table/two_level_iterator.h b/table/two_level_iterator.h
index 57e439c..5909e2b 100644
--- a/table/two_level_iterator.h
+++ b/table/two_level_iterator.h
@@ -5,7 +5,7 @@
 #ifndef STORAGE_LEVELDB_TABLE_TWO_LEVEL_ITERATOR_H_
 #define STORAGE_LEVELDB_TABLE_TWO_LEVEL_ITERATOR_H_
 
-#include "include/iterator.h"
+#include "leveldb/iterator.h"
 
 namespace leveldb {
 
diff --git a/util/cache.cc b/util/cache.cc
index 958de66..d8a4426 100644
--- a/util/cache.cc
+++ b/util/cache.cc
@@ -12,7 +12,7 @@
 
 #include <assert.h>
 
-#include "include/cache.h"
+#include "leveldb/cache.h"
 #include "port/port.h"
 #include "util/hash.h"
 #include "util/mutexlock.h"
diff --git a/util/cache_test.cc b/util/cache_test.cc
index 05de5d9..dbab988 100644
--- a/util/cache_test.cc
+++ b/util/cache_test.cc
@@ -2,7 +2,7 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file. See the AUTHORS file for names of contributors.
 
-#include "include/cache.h"
+#include "leveldb/cache.h"
 
 #include <vector>
 #include "util/coding.h"
diff --git a/util/coding.h b/util/coding.h
index a42e714..8755968 100644
--- a/util/coding.h
+++ b/util/coding.h
@@ -13,7 +13,7 @@
 #include <stdint.h>
 #include <string.h>
 #include <string>
-#include "include/slice.h"
+#include "leveldb/slice.h"
 #include "port/port.h"
 
 namespace leveldb {
diff --git a/util/comparator.cc b/util/comparator.cc
index dca3b4d..e2b27e3 100644
--- a/util/comparator.cc
+++ b/util/comparator.cc
@@ -3,8 +3,8 @@
 // found in the LICENSE file. See the AUTHORS file for names of contributors.
 
 #include <stdint.h>
-#include "include/comparator.h"
-#include "include/slice.h"
+#include "leveldb/comparator.h"
+#include "leveldb/slice.h"
 #include "util/logging.h"
 
 namespace leveldb {
diff --git a/util/env.cc b/util/env.cc
index 3c2ca89..e5297e7 100644
--- a/util/env.cc
+++ b/util/env.cc
@@ -2,7 +2,7 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file. See the AUTHORS file for names of contributors.
 
-#include "include/env.h"
+#include "leveldb/env.h"
 
 namespace leveldb {
 
diff --git a/util/env_chromium.cc b/util/env_chromium.cc
index 3cbf190..7edc7a9 100644
--- a/util/env_chromium.cc
+++ b/util/env_chromium.cc
@@ -19,8 +19,8 @@
 #include "base/threading/platform_thread.h"
 #include "base/threading/thread.h"
 #include "base/utf_string_conversions.h"
-#include "include/env.h"
-#include "include/slice.h"
+#include "leveldb/env.h"
+#include "leveldb/slice.h"
 #include "port/port.h"
 #include "util/logging.h"
 
diff --git a/util/env_posix.cc b/util/env_posix.cc
index 5c58449..5cddb0c 100644
--- a/util/env_posix.cc
+++ b/util/env_posix.cc
@@ -19,8 +19,8 @@
 #if defined(LEVELDB_PLATFORM_ANDROID)
 #include <sys/stat.h>
 #endif
-#include "include/env.h"
-#include "include/slice.h"
+#include "leveldb/env.h"
+#include "leveldb/slice.h"
 #include "port/port.h"
 #include "util/logging.h"
 
diff --git a/util/env_test.cc b/util/env_test.cc
index 4d17564..3c253be 100644
--- a/util/env_test.cc
+++ b/util/env_test.cc
@@ -2,7 +2,7 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file. See the AUTHORS file for names of contributors.
 
-#include "include/env.h"
+#include "leveldb/env.h"
 
 #include "port/port.h"
 #include "util/testharness.h"
diff --git a/util/logging.cc b/util/logging.cc
index 6b7c410..5c9bd4a 100644
--- a/util/logging.cc
+++ b/util/logging.cc
@@ -8,8 +8,8 @@
 #include <stdarg.h>
 #include <stdio.h>
 #include <stdlib.h>
-#include "include/env.h"
-#include "include/slice.h"
+#include "leveldb/env.h"
+#include "leveldb/slice.h"
 
 namespace leveldb {
 
diff --git a/util/options.cc b/util/options.cc
index 9fb7e0a..421608b 100644
--- a/util/options.cc
+++ b/util/options.cc
@@ -2,10 +2,10 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file. See the AUTHORS file for names of contributors.
 
-#include "include/options.h"
+#include "leveldb/options.h"
 
-#include "include/comparator.h"
-#include "include/env.h"
+#include "leveldb/comparator.h"
+#include "leveldb/env.h"
 
 namespace leveldb {
 
diff --git a/util/status.cc b/util/status.cc
index 2ed799d..d9b7195 100644
--- a/util/status.cc
+++ b/util/status.cc
@@ -4,7 +4,7 @@
 
 #include <stdio.h>
 #include "port/port.h"
-#include "include/status.h"
+#include "leveldb/status.h"
 
 namespace leveldb {
 
diff --git a/util/testharness.h b/util/testharness.h
index 93309dc..13ab914 100644
--- a/util/testharness.h
+++ b/util/testharness.h
@@ -8,8 +8,8 @@
 #include <stdio.h>
 #include <stdlib.h>
 #include <sstream>
-#include "include/env.h"
-#include "include/slice.h"
+#include "leveldb/env.h"
+#include "leveldb/slice.h"
 #include "util/random.h"
 
 namespace leveldb {
diff --git a/util/testutil.h b/util/testutil.h
index 0e8a177..a150c1a 100644
--- a/util/testutil.h
+++ b/util/testutil.h
@@ -5,8 +5,8 @@
 #ifndef STORAGE_LEVELDB_UTIL_TESTUTIL_H_
 #define STORAGE_LEVELDB_UTIL_TESTUTIL_H_
 
-#include "include/env.h"
-#include "include/slice.h"
+#include "leveldb/env.h"
+#include "leveldb/slice.h"
 #include "util/random.h"
 
 namespace leveldb {