Clean up include paths
Remove runtime/globals.h and make clients point to the right globals.h
(libartbase/base/globals.h). Also make within-libartbase includes
relative rather than using base/, etc.
Bug: 22322814
Test: make -j 40 checkbuild
Change-Id: I99de63fc851d48946ab401e2369de944419041c7
diff --git a/libartbase/base/allocator.cc b/libartbase/base/allocator.cc
index c7be4e0..c4ac180 100644
--- a/libartbase/base/allocator.cc
+++ b/libartbase/base/allocator.cc
@@ -21,7 +21,7 @@
#include <android-base/logging.h>
-#include "base/atomic.h"
+#include "atomic.h"
namespace art {
diff --git a/libartbase/base/allocator.h b/libartbase/base/allocator.h
index 662f78e..5eb6ea6 100644
--- a/libartbase/base/allocator.h
+++ b/libartbase/base/allocator.h
@@ -19,8 +19,8 @@
#include <type_traits>
-#include "base/atomic.h"
-#include "base/macros.h"
+#include "atomic.h"
+#include "macros.h"
namespace art {
diff --git a/libartbase/base/arena_allocator.h b/libartbase/base/arena_allocator.h
index 4d535df..211ff4f 100644
--- a/libartbase/base/arena_allocator.h
+++ b/libartbase/base/arena_allocator.h
@@ -20,11 +20,11 @@
#include <stddef.h>
#include <stdint.h>
-#include "base/bit_utils.h"
-#include "base/debug_stack.h"
-#include "base/dchecked_vector.h"
-#include "base/macros.h"
-#include "base/memory_tool.h"
+#include "bit_utils.h"
+#include "debug_stack.h"
+#include "dchecked_vector.h"
+#include "macros.h"
+#include "memory_tool.h"
namespace art {
diff --git a/libartbase/base/arena_allocator_test.cc b/libartbase/base/arena_allocator_test.cc
index 68e99f4..e358710 100644
--- a/libartbase/base/arena_allocator_test.cc
+++ b/libartbase/base/arena_allocator_test.cc
@@ -14,11 +14,11 @@
* limitations under the License.
*/
-#include "base/arena_allocator-inl.h"
-#include "base/arena_bit_vector.h"
-#include "base/malloc_arena_pool.h"
-#include "base/memory_tool.h"
+#include "arena_allocator-inl.h"
+#include "arena_bit_vector.h"
#include "gtest/gtest.h"
+#include "malloc_arena_pool.h"
+#include "memory_tool.h"
namespace art {
diff --git a/libartbase/base/arena_bit_vector.cc b/libartbase/base/arena_bit_vector.cc
index 1542e9d..01f9013 100644
--- a/libartbase/base/arena_bit_vector.cc
+++ b/libartbase/base/arena_bit_vector.cc
@@ -16,8 +16,8 @@
#include "arena_bit_vector.h"
-#include "base/allocator.h"
-#include "base/arena_allocator.h"
+#include "allocator.h"
+#include "arena_allocator.h"
namespace art {
diff --git a/libartbase/base/arena_bit_vector.h b/libartbase/base/arena_bit_vector.h
index 2b2322e..0fb6bbf 100644
--- a/libartbase/base/arena_bit_vector.h
+++ b/libartbase/base/arena_bit_vector.h
@@ -17,8 +17,8 @@
#ifndef ART_LIBARTBASE_BASE_ARENA_BIT_VECTOR_H_
#define ART_LIBARTBASE_BASE_ARENA_BIT_VECTOR_H_
-#include "base/arena_object.h"
-#include "base/bit_vector.h"
+#include "arena_object.h"
+#include "bit_vector.h"
namespace art {
diff --git a/libartbase/base/arena_containers.h b/libartbase/base/arena_containers.h
index 40cf23c..bd57fb1 100644
--- a/libartbase/base/arena_containers.h
+++ b/libartbase/base/arena_containers.h
@@ -25,10 +25,10 @@
#include <utility>
#include "arena_allocator.h"
-#include "base/dchecked_vector.h"
-#include "base/hash_map.h"
-#include "base/hash_set.h"
-#include "base/safe_map.h"
+#include "dchecked_vector.h"
+#include "hash_map.h"
+#include "hash_set.h"
+#include "safe_map.h"
namespace art {
diff --git a/libartbase/base/arena_object.h b/libartbase/base/arena_object.h
index de7cb64..ed09225 100644
--- a/libartbase/base/arena_object.h
+++ b/libartbase/base/arena_object.h
@@ -20,7 +20,7 @@
#include <android-base/logging.h>
#include "arena_allocator.h"
-#include "base/macros.h"
+#include "macros.h"
#include "scoped_arena_allocator.h"
namespace art {
diff --git a/libartbase/base/array_slice.h b/libartbase/base/array_slice.h
index 1ef2fba..fb3da6b 100644
--- a/libartbase/base/array_slice.h
+++ b/libartbase/base/array_slice.h
@@ -17,9 +17,9 @@
#ifndef ART_LIBARTBASE_BASE_ARRAY_SLICE_H_
#define ART_LIBARTBASE_BASE_ARRAY_SLICE_H_
-#include "base/bit_utils.h"
-#include "base/casts.h"
-#include "base/iteration_range.h"
+#include "bit_utils.h"
+#include "casts.h"
+#include "iteration_range.h"
#include "stride_iterator.h"
namespace art {
diff --git a/libartbase/base/atomic.h b/libartbase/base/atomic.h
index f736667..b68f867 100644
--- a/libartbase/base/atomic.h
+++ b/libartbase/base/atomic.h
@@ -24,7 +24,7 @@
#include <android-base/logging.h>
-#include "base/macros.h"
+#include "macros.h"
namespace art {
diff --git a/libartbase/base/bit_string.h b/libartbase/base/bit_string.h
index 0e051f3..d995f8d 100644
--- a/libartbase/base/bit_string.h
+++ b/libartbase/base/bit_string.h
@@ -17,8 +17,8 @@
#ifndef ART_LIBARTBASE_BASE_BIT_STRING_H_
#define ART_LIBARTBASE_BASE_BIT_STRING_H_
-#include "base/bit_struct.h"
-#include "base/bit_utils.h"
+#include "bit_struct.h"
+#include "bit_utils.h"
#include <ostream>
diff --git a/libartbase/base/bit_string_test.cc b/libartbase/base/bit_string_test.cc
index 23274e3..89a71a1 100644
--- a/libartbase/base/bit_string_test.cc
+++ b/libartbase/base/bit_string_test.cc
@@ -14,7 +14,7 @@
* limitations under the License.
*/
-#include "base/bit_string.h"
+#include "bit_string.h"
#include "gtest/gtest.h"
#include "android-base/logging.h"
diff --git a/libartbase/base/bit_struct.h b/libartbase/base/bit_struct.h
index 386b896..9814fd4 100644
--- a/libartbase/base/bit_struct.h
+++ b/libartbase/base/bit_struct.h
@@ -17,8 +17,8 @@
#ifndef ART_LIBARTBASE_BASE_BIT_STRUCT_H_
#define ART_LIBARTBASE_BASE_BIT_STRUCT_H_
-#include "base/bit_utils.h"
#include "bit_struct_detail.h"
+#include "bit_utils.h"
//
// Zero-cost, type-safe, well-defined "structs" of bit fields.
diff --git a/libartbase/base/bit_struct_detail.h b/libartbase/base/bit_struct_detail.h
index facfa61..68c2e44 100644
--- a/libartbase/base/bit_struct_detail.h
+++ b/libartbase/base/bit_struct_detail.h
@@ -17,7 +17,7 @@
#ifndef ART_LIBARTBASE_BASE_BIT_STRUCT_DETAIL_H_
#define ART_LIBARTBASE_BASE_BIT_STRUCT_DETAIL_H_
-#include "base/bit_utils.h"
+#include "bit_utils.h"
#include "globals.h"
#include <type_traits>
diff --git a/libartbase/base/bit_utils.h b/libartbase/base/bit_utils.h
index ff6c160..04f0e85 100644
--- a/libartbase/base/bit_utils.h
+++ b/libartbase/base/bit_utils.h
@@ -22,7 +22,7 @@
#include <android-base/logging.h>
-#include "base/stl_util_identity.h"
+#include "stl_util_identity.h"
namespace art {
diff --git a/libartbase/base/bit_utils_iterator.h b/libartbase/base/bit_utils_iterator.h
index 3fab15a..4975ebf 100644
--- a/libartbase/base/bit_utils_iterator.h
+++ b/libartbase/base/bit_utils_iterator.h
@@ -23,9 +23,9 @@
#include <android-base/logging.h>
-#include "base/bit_utils.h"
-#include "base/iteration_range.h"
-#include "base/stl_util.h"
+#include "bit_utils.h"
+#include "iteration_range.h"
+#include "stl_util.h"
namespace art {
diff --git a/libartbase/base/bit_vector-inl.h b/libartbase/base/bit_vector-inl.h
index 7a9f465..2bdc14e 100644
--- a/libartbase/base/bit_vector-inl.h
+++ b/libartbase/base/bit_vector-inl.h
@@ -21,7 +21,7 @@
#include <android-base/logging.h>
-#include "base/bit_utils.h"
+#include "bit_utils.h"
namespace art {
diff --git a/libartbase/base/bit_vector.h b/libartbase/base/bit_vector.h
index 2ffa2aa..a930f4e 100644
--- a/libartbase/base/bit_vector.h
+++ b/libartbase/base/bit_vector.h
@@ -20,7 +20,7 @@
#include <stdint.h>
#include <iterator>
-#include "base/bit_utils.h"
+#include "bit_utils.h"
#include "globals.h"
namespace art {
diff --git a/libartbase/base/bounded_fifo.h b/libartbase/base/bounded_fifo.h
index 444f31a..43d14f4 100644
--- a/libartbase/base/bounded_fifo.h
+++ b/libartbase/base/bounded_fifo.h
@@ -19,7 +19,7 @@
#include <android-base/logging.h>
-#include "base/bit_utils.h"
+#include "bit_utils.h"
namespace art {
diff --git a/libartbase/base/dumpable.h b/libartbase/base/dumpable.h
index 6621397..0c00505 100644
--- a/libartbase/base/dumpable.h
+++ b/libartbase/base/dumpable.h
@@ -19,7 +19,7 @@
#include <ostream>
-#include "base/macros.h"
+#include "macros.h"
namespace art {
diff --git a/libartbase/base/file_magic.cc b/libartbase/base/file_magic.cc
index 2b9bed0..d8d843b 100644
--- a/libartbase/base/file_magic.cc
+++ b/libartbase/base/file_magic.cc
@@ -23,7 +23,7 @@
#include <android-base/logging.h>
#include <android-base/stringprintf.h>
-#include "base/unix_file/fd_file.h"
+#include "unix_file/fd_file.h"
namespace art {
diff --git a/libartbase/base/file_magic.h b/libartbase/base/file_magic.h
index 53f551c..0d0322c 100644
--- a/libartbase/base/file_magic.h
+++ b/libartbase/base/file_magic.h
@@ -20,7 +20,7 @@
#include <stdint.h>
#include <string>
-#include "base/os.h"
+#include "os.h"
namespace art {
diff --git a/libartbase/base/hex_dump.h b/libartbase/base/hex_dump.h
index 55f4d53..d13595d 100644
--- a/libartbase/base/hex_dump.h
+++ b/libartbase/base/hex_dump.h
@@ -17,7 +17,7 @@
#ifndef ART_LIBARTBASE_BASE_HEX_DUMP_H_
#define ART_LIBARTBASE_BASE_HEX_DUMP_H_
-#include "base/macros.h"
+#include "macros.h"
#include <ostream>
diff --git a/libartbase/base/histogram-inl.h b/libartbase/base/histogram-inl.h
index 26d01b2..9832f03 100644
--- a/libartbase/base/histogram-inl.h
+++ b/libartbase/base/histogram-inl.h
@@ -26,9 +26,9 @@
#include <android-base/logging.h>
-#include "base/bit_utils.h"
-#include "base/time_utils.h"
-#include "base/utils.h"
+#include "bit_utils.h"
+#include "time_utils.h"
+#include "utils.h"
namespace art {
diff --git a/libartbase/base/indenter.h b/libartbase/base/indenter.h
index 850b7c4..06e7340 100644
--- a/libartbase/base/indenter.h
+++ b/libartbase/base/indenter.h
@@ -22,7 +22,7 @@
#include <android-base/logging.h>
-#include "base/macros.h"
+#include "macros.h"
namespace art {
diff --git a/libartbase/base/leb128.h b/libartbase/base/leb128.h
index ab19daa..d5847fd 100644
--- a/libartbase/base/leb128.h
+++ b/libartbase/base/leb128.h
@@ -21,9 +21,9 @@
#include <android-base/logging.h>
-#include "base/bit_utils.h"
-#include "base/globals.h"
-#include "base/macros.h"
+#include "bit_utils.h"
+#include "globals.h"
+#include "macros.h"
namespace art {
diff --git a/libartbase/base/leb128_test.cc b/libartbase/base/leb128_test.cc
index 747fc19..58b0d07 100644
--- a/libartbase/base/leb128_test.cc
+++ b/libartbase/base/leb128_test.cc
@@ -17,9 +17,8 @@
#include "leb128.h"
#include "gtest/gtest.h"
-
-#include "base/histogram-inl.h"
-#include "base/time_utils.h"
+#include "histogram-inl.h"
+#include "time_utils.h"
namespace art {
diff --git a/libartbase/base/length_prefixed_array.h b/libartbase/base/length_prefixed_array.h
index 7c09bdd..9238e81 100644
--- a/libartbase/base/length_prefixed_array.h
+++ b/libartbase/base/length_prefixed_array.h
@@ -20,10 +20,10 @@
#include <stddef.h> // for offsetof()
#include <string.h> // for memset()
-#include "base/bit_utils.h"
-#include "base/casts.h"
-#include "base/iteration_range.h"
-#include "base/stride_iterator.h"
+#include "bit_utils.h"
+#include "casts.h"
+#include "iteration_range.h"
+#include "stride_iterator.h"
namespace art {
diff --git a/libartbase/base/logging.cc b/libartbase/base/logging.cc
index fd2cc20..a66a7e3 100644
--- a/libartbase/base/logging.cc
+++ b/libartbase/base/logging.cc
@@ -21,8 +21,8 @@
#include <sstream>
#include "aborting.h"
-#include "base/os.h"
-#include "base/unix_file/fd_file.h"
+#include "os.h"
+#include "unix_file/fd_file.h"
// Headers for LogMessage::LogLine.
#ifdef ART_TARGET_ANDROID
diff --git a/libartbase/base/logging.h b/libartbase/base/logging.h
index 986704e..d2c0a02 100644
--- a/libartbase/base/logging.h
+++ b/libartbase/base/logging.h
@@ -21,7 +21,7 @@
#include <sstream>
#include "android-base/logging.h"
-#include "base/macros.h"
+#include "macros.h"
namespace art {
diff --git a/libartbase/base/logging_test.cc b/libartbase/base/logging_test.cc
index 1456eb3..46ba41b 100644
--- a/libartbase/base/logging_test.cc
+++ b/libartbase/base/logging_test.cc
@@ -19,9 +19,9 @@
#include <type_traits>
#include "android-base/logging.h"
-#include "base/bit_utils.h"
-#include "base/macros.h"
+#include "bit_utils.h"
#include "gtest/gtest.h"
+#include "macros.h"
#include "runtime_debug.h"
namespace art {
diff --git a/libartbase/base/malloc_arena_pool.cc b/libartbase/base/malloc_arena_pool.cc
index 7df4aef..144b06c 100644
--- a/libartbase/base/malloc_arena_pool.cc
+++ b/libartbase/base/malloc_arena_pool.cc
@@ -24,7 +24,7 @@
#include <numeric>
#include <android-base/logging.h>
-#include "base/arena_allocator-inl.h"
+#include "arena_allocator-inl.h"
namespace art {
diff --git a/libartbase/base/malloc_arena_pool.h b/libartbase/base/malloc_arena_pool.h
index 8720189..c48be59 100644
--- a/libartbase/base/malloc_arena_pool.h
+++ b/libartbase/base/malloc_arena_pool.h
@@ -19,7 +19,7 @@
#include <mutex>
-#include "base/arena_allocator.h"
+#include "arena_allocator.h"
namespace art {
diff --git a/libartbase/base/mem_map.cc b/libartbase/base/mem_map.cc
index 21634f8..9a1392c 100644
--- a/libartbase/base/mem_map.cc
+++ b/libartbase/base/mem_map.cc
@@ -32,12 +32,12 @@
#include "backtrace/BacktraceMap.h"
#include "cutils/ashmem.h"
-#include "base/allocator.h"
-#include "base/bit_utils.h"
-#include "base/globals.h"
-#include "base/logging.h" // For VLOG_IS_ON.
-#include "base/memory_tool.h"
-#include "base/utils.h"
+#include "allocator.h"
+#include "bit_utils.h"
+#include "globals.h"
+#include "logging.h" // For VLOG_IS_ON.
+#include "memory_tool.h"
+#include "utils.h"
#ifndef MAP_ANONYMOUS
#define MAP_ANONYMOUS MAP_ANON
diff --git a/libartbase/base/mem_map.h b/libartbase/base/mem_map.h
index b7beb08..3a324b2 100644
--- a/libartbase/base/mem_map.h
+++ b/libartbase/base/mem_map.h
@@ -25,7 +25,7 @@
#include <string>
#include "android-base/thread_annotations.h"
-#include "base/macros.h"
+#include "macros.h"
namespace art {
diff --git a/libartbase/base/mem_map_test.cc b/libartbase/base/mem_map_test.cc
index 3adbf18..4408f55 100644
--- a/libartbase/base/mem_map_test.cc
+++ b/libartbase/base/mem_map_test.cc
@@ -21,9 +21,9 @@
#include <memory>
#include <random>
-#include "base/memory_tool.h"
-#include "base/unix_file/fd_file.h"
#include "common_runtime_test.h"
+#include "memory_tool.h"
+#include "unix_file/fd_file.h"
namespace art {
diff --git a/libartbase/base/memory_region.h b/libartbase/base/memory_region.h
index 7add466..3d00f5b 100644
--- a/libartbase/base/memory_region.h
+++ b/libartbase/base/memory_region.h
@@ -22,12 +22,12 @@
#include <android-base/logging.h>
-#include "base/bit_utils.h"
-#include "base/casts.h"
-#include "base/enums.h"
-#include "base/macros.h"
-#include "base/value_object.h"
+#include "bit_utils.h"
+#include "casts.h"
+#include "enums.h"
#include "globals.h"
+#include "macros.h"
+#include "value_object.h"
namespace art {
diff --git a/libartbase/base/os_linux.cc b/libartbase/base/os_linux.cc
index cb228bd..f8b31cf 100644
--- a/libartbase/base/os_linux.cc
+++ b/libartbase/base/os_linux.cc
@@ -14,7 +14,7 @@
* limitations under the License.
*/
-#include "base/os.h"
+#include "os.h"
#include <fcntl.h>
#include <sys/stat.h>
@@ -25,7 +25,7 @@
#include <android-base/logging.h>
-#include "base/unix_file/fd_file.h"
+#include "unix_file/fd_file.h"
namespace art {
diff --git a/libartbase/base/safe_copy.cc b/libartbase/base/safe_copy.cc
index 7ba5cbd..b46b921 100644
--- a/libartbase/base/safe_copy.cc
+++ b/libartbase/base/safe_copy.cc
@@ -24,7 +24,7 @@
#include <android-base/macros.h>
-#include "base/bit_utils.h"
+#include "bit_utils.h"
namespace art {
diff --git a/libartbase/base/safe_copy_test.cc b/libartbase/base/safe_copy_test.cc
index f1d7c55..c23651f 100644
--- a/libartbase/base/safe_copy_test.cc
+++ b/libartbase/base/safe_copy_test.cc
@@ -22,7 +22,7 @@
#include <sys/user.h>
#include "android-base/logging.h"
-#include "base/globals.h"
+#include "globals.h"
#include "gtest/gtest.h"
diff --git a/libartbase/base/scoped_arena_allocator.cc b/libartbase/base/scoped_arena_allocator.cc
index 7240842..ab05c60 100644
--- a/libartbase/base/scoped_arena_allocator.cc
+++ b/libartbase/base/scoped_arena_allocator.cc
@@ -17,7 +17,7 @@
#include "scoped_arena_allocator.h"
#include "arena_allocator-inl.h"
-#include "base/memory_tool.h"
+#include "memory_tool.h"
namespace art {
diff --git a/libartbase/base/scoped_arena_allocator.h b/libartbase/base/scoped_arena_allocator.h
index d5f6df8..7eaec5e 100644
--- a/libartbase/base/scoped_arena_allocator.h
+++ b/libartbase/base/scoped_arena_allocator.h
@@ -20,9 +20,9 @@
#include <android-base/logging.h>
#include "arena_allocator.h"
-#include "base/debug_stack.h"
-#include "base/globals.h"
-#include "base/macros.h"
+#include "debug_stack.h"
+#include "globals.h"
+#include "macros.h"
namespace art {
diff --git a/libartbase/base/scoped_arena_containers.h b/libartbase/base/scoped_arena_containers.h
index 4df02b6..4193981 100644
--- a/libartbase/base/scoped_arena_containers.h
+++ b/libartbase/base/scoped_arena_containers.h
@@ -25,8 +25,8 @@
#include <utility>
#include "arena_containers.h" // For ArenaAllocatorAdapterKind.
-#include "base/dchecked_vector.h"
-#include "base/safe_map.h"
+#include "dchecked_vector.h"
+#include "safe_map.h"
#include "scoped_arena_allocator.h"
namespace art {
diff --git a/libartbase/base/scoped_flock.cc b/libartbase/base/scoped_flock.cc
index 514b97b..d679328 100644
--- a/libartbase/base/scoped_flock.cc
+++ b/libartbase/base/scoped_flock.cc
@@ -22,7 +22,7 @@
#include <android-base/logging.h>
#include <android-base/stringprintf.h>
-#include "base/unix_file/fd_file.h"
+#include "unix_file/fd_file.h"
namespace art {
diff --git a/libartbase/base/scoped_flock.h b/libartbase/base/scoped_flock.h
index 476b257..39b36b4 100644
--- a/libartbase/base/scoped_flock.h
+++ b/libartbase/base/scoped_flock.h
@@ -22,9 +22,9 @@
#include <android-base/unique_fd.h>
-#include "base/macros.h"
-#include "base/os.h"
-#include "base/unix_file/fd_file.h"
+#include "macros.h"
+#include "os.h"
+#include "unix_file/fd_file.h"
namespace art {
diff --git a/libartbase/base/time_utils.cc b/libartbase/base/time_utils.cc
index 3c09d5a..89a1109 100644
--- a/libartbase/base/time_utils.cc
+++ b/libartbase/base/time_utils.cc
@@ -22,7 +22,7 @@
#include "android-base/stringprintf.h"
-#include "base/logging.h"
+#include "logging.h"
#if defined(__APPLE__)
#include <sys/time.h>
diff --git a/libartbase/base/time_utils.h b/libartbase/base/time_utils.h
index 811af5d..431d3e1 100644
--- a/libartbase/base/time_utils.h
+++ b/libartbase/base/time_utils.h
@@ -22,7 +22,7 @@
#include <string>
-#include "base/macros.h"
+#include "macros.h"
namespace art {
diff --git a/libartbase/base/tracking_safe_map.h b/libartbase/base/tracking_safe_map.h
index 2750de1..9b015c4 100644
--- a/libartbase/base/tracking_safe_map.h
+++ b/libartbase/base/tracking_safe_map.h
@@ -17,8 +17,8 @@
#ifndef ART_LIBARTBASE_BASE_TRACKING_SAFE_MAP_H_
#define ART_LIBARTBASE_BASE_TRACKING_SAFE_MAP_H_
-#include "base/allocator.h"
-#include "base/safe_map.h"
+#include "allocator.h"
+#include "safe_map.h"
namespace art {
diff --git a/libartbase/base/transform_array_ref.h b/libartbase/base/transform_array_ref.h
index de2739e..ef29573 100644
--- a/libartbase/base/transform_array_ref.h
+++ b/libartbase/base/transform_array_ref.h
@@ -19,8 +19,8 @@
#include <type_traits>
-#include "base/array_ref.h"
-#include "base/transform_iterator.h"
+#include "array_ref.h"
+#include "transform_iterator.h"
namespace art {
diff --git a/libartbase/base/transform_array_ref_test.cc b/libartbase/base/transform_array_ref_test.cc
index da0340d..fc73d56 100644
--- a/libartbase/base/transform_array_ref_test.cc
+++ b/libartbase/base/transform_array_ref_test.cc
@@ -18,8 +18,7 @@
#include <vector>
#include "gtest/gtest.h"
-
-#include "base/transform_array_ref.h"
+#include "transform_array_ref.h"
namespace art {
diff --git a/libartbase/base/transform_iterator.h b/libartbase/base/transform_iterator.h
index 82d9f9e..9265543 100644
--- a/libartbase/base/transform_iterator.h
+++ b/libartbase/base/transform_iterator.h
@@ -20,7 +20,7 @@
#include <iterator>
#include <type_traits>
-#include "base/iteration_range.h"
+#include "iteration_range.h"
namespace art {
diff --git a/libartbase/base/transform_iterator_test.cc b/libartbase/base/transform_iterator_test.cc
index 63b6e4f..5a5c37d 100644
--- a/libartbase/base/transform_iterator_test.cc
+++ b/libartbase/base/transform_iterator_test.cc
@@ -21,8 +21,7 @@
#include <vector>
#include "gtest/gtest.h"
-
-#include "base/transform_iterator.h"
+#include "transform_iterator.h"
namespace art {
diff --git a/libartbase/base/unix_file/fd_file.cc b/libartbase/base/unix_file/fd_file.cc
index b2881b8..c5313e9 100644
--- a/libartbase/base/unix_file/fd_file.cc
+++ b/libartbase/base/unix_file/fd_file.cc
@@ -14,7 +14,7 @@
* limitations under the License.
*/
-#include "base/unix_file/fd_file.h"
+#include "fd_file.h"
#include <errno.h>
#include <sys/stat.h>
@@ -30,8 +30,8 @@
#include <sys/sendfile.h>
#else
#include <algorithm>
-#include "base/stl_util.h"
#include "base/globals.h"
+#include "base/stl_util.h"
#endif
namespace unix_file {
diff --git a/libartbase/base/unix_file/fd_file.h b/libartbase/base/unix_file/fd_file.h
index fe3317f..d61dab6 100644
--- a/libartbase/base/unix_file/fd_file.h
+++ b/libartbase/base/unix_file/fd_file.h
@@ -22,7 +22,7 @@
#include <string>
#include "base/macros.h"
-#include "base/unix_file/random_access_file.h"
+#include "random_access_file.h"
namespace unix_file {
diff --git a/libartbase/base/unix_file/fd_file_test.cc b/libartbase/base/unix_file/fd_file_test.cc
index 042fbc9..7fc057b 100644
--- a/libartbase/base/unix_file/fd_file_test.cc
+++ b/libartbase/base/unix_file/fd_file_test.cc
@@ -14,10 +14,10 @@
* limitations under the License.
*/
-#include "base/unix_file/fd_file.h"
-#include "base/unix_file/random_access_file_test.h"
#include "common_runtime_test.h" // For ScratchFile
#include "gtest/gtest.h"
+#include "fd_file.h"
+#include "random_access_file_test.h"
namespace unix_file {
diff --git a/libartbase/base/unix_file/random_access_file_utils.cc b/libartbase/base/unix_file/random_access_file_utils.cc
index aae65c1..10d8299 100644
--- a/libartbase/base/unix_file/random_access_file_utils.cc
+++ b/libartbase/base/unix_file/random_access_file_utils.cc
@@ -14,11 +14,11 @@
* limitations under the License.
*/
-#include "base/unix_file/random_access_file_utils.h"
+#include "random_access_file_utils.h"
#include <vector>
-#include "base/unix_file/random_access_file.h"
+#include "random_access_file.h"
namespace unix_file {
diff --git a/libartbase/base/utils.cc b/libartbase/base/utils.cc
index 029cffd..b7a542f 100644
--- a/libartbase/base/utils.cc
+++ b/libartbase/base/utils.cc
@@ -30,7 +30,7 @@
#include "android-base/stringprintf.h"
#include "android-base/strings.h"
-#include "base/os.h"
+#include "os.h"
#if defined(__APPLE__)
#include <crt_externs.h>
diff --git a/libartbase/base/utils.h b/libartbase/base/utils.h
index c8c5b72..73c1c22 100644
--- a/libartbase/base/utils.h
+++ b/libartbase/base/utils.h
@@ -25,11 +25,11 @@
#include <android-base/logging.h>
-#include "base/casts.h"
-#include "base/enums.h"
-#include "base/globals.h"
-#include "base/macros.h"
-#include "base/stringpiece.h"
+#include "casts.h"
+#include "enums.h"
+#include "globals.h"
+#include "macros.h"
+#include "stringpiece.h"
namespace art {
diff --git a/libartbase/base/value_object.h b/libartbase/base/value_object.h
index 441bd1a..dab6b76 100644
--- a/libartbase/base/value_object.h
+++ b/libartbase/base/value_object.h
@@ -17,7 +17,7 @@
#ifndef ART_LIBARTBASE_BASE_VALUE_OBJECT_H_
#define ART_LIBARTBASE_BASE_VALUE_OBJECT_H_
-#include "base/macros.h"
+#include "macros.h"
namespace art {
diff --git a/libartbase/base/variant_map.h b/libartbase/base/variant_map.h
index 4e02c54..581bc23 100644
--- a/libartbase/base/variant_map.h
+++ b/libartbase/base/variant_map.h
@@ -23,7 +23,7 @@
#include <utility>
#include "android-base/logging.h"
-#include "base/stl_util_identity.h"
+#include "stl_util_identity.h"
namespace art {
diff --git a/libartbase/base/zip_archive.cc b/libartbase/base/zip_archive.cc
index 4185c22..b5f946e 100644
--- a/libartbase/base/zip_archive.cc
+++ b/libartbase/base/zip_archive.cc
@@ -14,7 +14,7 @@
* limitations under the License.
*/
-#include "base/zip_archive.h"
+#include "zip_archive.h"
#include <fcntl.h>
#include <stdio.h>
@@ -27,8 +27,8 @@
#include "android-base/stringprintf.h"
#include "ziparchive/zip_archive.h"
-#include "base/bit_utils.h"
-#include "base/unix_file/fd_file.h"
+#include "bit_utils.h"
+#include "unix_file/fd_file.h"
namespace art {
diff --git a/libartbase/base/zip_archive.h b/libartbase/base/zip_archive.h
index 39c8168..73495da 100644
--- a/libartbase/base/zip_archive.h
+++ b/libartbase/base/zip_archive.h
@@ -23,11 +23,11 @@
#include <android-base/logging.h>
-#include "base/os.h"
-#include "base/mem_map.h"
-#include "base/safe_map.h"
-#include "base/unix_file/random_access_file.h"
#include "globals.h"
+#include "mem_map.h"
+#include "os.h"
+#include "safe_map.h"
+#include "unix_file/random_access_file.h"
// system/core/zip_archive definitions.
struct ZipEntry;
diff --git a/libartbase/base/zip_archive_test.cc b/libartbase/base/zip_archive_test.cc
index 03f4cd4..63743f7 100644
--- a/libartbase/base/zip_archive_test.cc
+++ b/libartbase/base/zip_archive_test.cc
@@ -14,7 +14,7 @@
* limitations under the License.
*/
-#include "base/zip_archive.h"
+#include "zip_archive.h"
#include <fcntl.h>
#include <sys/stat.h>
@@ -22,9 +22,9 @@
#include <zlib.h>
#include <memory>
-#include "base/os.h"
-#include "base/unix_file/fd_file.h"
#include "common_runtime_test.h"
+#include "os.h"
+#include "unix_file/fd_file.h"
namespace art {