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

141 files changed, 202 insertions, 227 deletions

diff --git a/compiler/driver/compiler_options.h b/compiler/driver/compiler_options.h
index 05d8805e81..cdd9d4de00 100644
--- a/compiler/driver/compiler_options.h
+++ b/compiler/driver/compiler_options.h
@@ -21,10 +21,10 @@
 #include <string>
 #include <vector>
 
+#include "base/globals.h"
 #include "base/macros.h"
 #include "base/utils.h"
 #include "compiler_filter.h"
-#include "globals.h"
 #include "optimizing/register_allocator.h"
 
 namespace art {
diff --git a/compiler/linker/buffered_output_stream.h b/compiler/linker/buffered_output_stream.h
index 66994e82a1..512409cb2f 100644
--- a/compiler/linker/buffered_output_stream.h
+++ b/compiler/linker/buffered_output_stream.h
@@ -21,7 +21,7 @@
 
 #include "output_stream.h"
 
-#include "globals.h"
+#include "base/globals.h"
 
 namespace art {
 namespace linker {
diff --git a/compiler/optimizing/code_generator.h b/compiler/optimizing/code_generator.h
index 62cacebaa1..f0c4ee01cc 100644
--- a/compiler/optimizing/code_generator.h
+++ b/compiler/optimizing/code_generator.h
@@ -25,10 +25,10 @@
 #include "base/bit_field.h"
 #include "base/bit_utils.h"
 #include "base/enums.h"
+#include "base/globals.h"
 #include "base/memory_region.h"
 #include "dex/string_reference.h"
 #include "dex/type_reference.h"
-#include "globals.h"
 #include "graph_visualizer.h"
 #include "locations.h"
 #include "nodes.h"
diff --git a/compiler/optimizing/optimizing_compiler.h b/compiler/optimizing/optimizing_compiler.h
index d8cea30a6b..6ee9c70fdb 100644
--- a/compiler/optimizing/optimizing_compiler.h
+++ b/compiler/optimizing/optimizing_compiler.h
@@ -17,8 +17,8 @@
 #ifndef ART_COMPILER_OPTIMIZING_OPTIMIZING_COMPILER_H_
 #define ART_COMPILER_OPTIMIZING_OPTIMIZING_COMPILER_H_
 
+#include "base/globals.h"
 #include "base/mutex.h"
-#include "globals.h"
 
 namespace art {
 
diff --git a/compiler/utils/arm/constants_arm.h b/compiler/utils/arm/constants_arm.h
index 66252bed86..3e316c8e84 100644
--- a/compiler/utils/arm/constants_arm.h
+++ b/compiler/utils/arm/constants_arm.h
@@ -25,7 +25,7 @@
 
 #include "arch/arm/registers_arm.h"
 #include "base/casts.h"
-#include "globals.h"
+#include "base/globals.h"
 
 namespace art {
 namespace arm {
diff --git a/compiler/utils/arm/managed_register_arm.cc b/compiler/utils/arm/managed_register_arm.cc
index 1fdc110dcf..deff658b4f 100644
--- a/compiler/utils/arm/managed_register_arm.cc
+++ b/compiler/utils/arm/managed_register_arm.cc
@@ -16,7 +16,7 @@
 
 #include "managed_register_arm.h"
 
-#include "globals.h"
+#include "base/globals.h"
 
 namespace art {
 namespace arm {
diff --git a/compiler/utils/arm/managed_register_arm_test.cc b/compiler/utils/arm/managed_register_arm_test.cc
index 43b0b516dc..6f440a7c81 100644
--- a/compiler/utils/arm/managed_register_arm_test.cc
+++ b/compiler/utils/arm/managed_register_arm_test.cc
@@ -15,7 +15,7 @@
  */
 
 #include "managed_register_arm.h"
-#include "globals.h"
+#include "base/globals.h"
 #include "gtest/gtest.h"
 
 namespace art {
diff --git a/compiler/utils/arm64/managed_register_arm64.cc b/compiler/utils/arm64/managed_register_arm64.cc
index 47924bf99f..5632265646 100644
--- a/compiler/utils/arm64/managed_register_arm64.cc
+++ b/compiler/utils/arm64/managed_register_arm64.cc
@@ -15,7 +15,7 @@
  */
 
 #include "managed_register_arm64.h"
-#include "globals.h"
+#include "base/globals.h"
 
 namespace art {
 namespace arm64 {
diff --git a/compiler/utils/arm64/managed_register_arm64_test.cc b/compiler/utils/arm64/managed_register_arm64_test.cc
index 2a79313be5..d151ac99e7 100644
--- a/compiler/utils/arm64/managed_register_arm64_test.cc
+++ b/compiler/utils/arm64/managed_register_arm64_test.cc
@@ -17,7 +17,7 @@
 #include "managed_register_arm64.h"
 
 #include "assembler_arm64.h"
-#include "globals.h"
+#include "base/globals.h"
 #include "gtest/gtest.h"
 
 namespace art {
diff --git a/compiler/utils/assembler.cc b/compiler/utils/assembler.cc
index 421c1b6089..d1d2a3d556 100644
--- a/compiler/utils/assembler.cc
+++ b/compiler/utils/assembler.cc
@@ -20,8 +20,8 @@
 #include <vector>
 
 #include "base/casts.h"
+#include "base/globals.h"
 #include "base/memory_region.h"
-#include "globals.h"
 
 namespace art {
 
diff --git a/compiler/utils/jni_macro_assembler.cc b/compiler/utils/jni_macro_assembler.cc
index 0c34aa4f1d..5f405f348c 100644
--- a/compiler/utils/jni_macro_assembler.cc
+++ b/compiler/utils/jni_macro_assembler.cc
@@ -38,8 +38,8 @@
 #include "x86_64/jni_macro_assembler_x86_64.h"
 #endif
 #include "base/casts.h"
+#include "base/globals.h"
 #include "base/memory_region.h"
-#include "globals.h"
 
 namespace art {
 
diff --git a/compiler/utils/mips/assembler_mips.h b/compiler/utils/mips/assembler_mips.h
index c6ce62b4f4..af3d7a06ba 100644
--- a/compiler/utils/mips/assembler_mips.h
+++ b/compiler/utils/mips/assembler_mips.h
@@ -24,10 +24,10 @@
 #include "arch/mips/instruction_set_features_mips.h"
 #include "base/arena_containers.h"
 #include "base/enums.h"
+#include "base/globals.h"
 #include "base/macros.h"
 #include "base/stl_util_identity.h"
 #include "constants_mips.h"
-#include "globals.h"
 #include "heap_poisoning.h"
 #include "managed_register_mips.h"
 #include "offsets.h"
diff --git a/compiler/utils/mips/constants_mips.h b/compiler/utils/mips/constants_mips.h
index 016c0dbb2e..07d8b7de0e 100644
--- a/compiler/utils/mips/constants_mips.h
+++ b/compiler/utils/mips/constants_mips.h
@@ -22,8 +22,8 @@
 #include <android-base/logging.h>
 
 #include "arch/mips/registers_mips.h"
+#include "base/globals.h"
 #include "base/macros.h"
-#include "globals.h"
 
 namespace art {
 namespace mips {
diff --git a/compiler/utils/mips/managed_register_mips.cc b/compiler/utils/mips/managed_register_mips.cc
index 5a8c0481a5..9b3ed79d2f 100644
--- a/compiler/utils/mips/managed_register_mips.cc
+++ b/compiler/utils/mips/managed_register_mips.cc
@@ -16,7 +16,7 @@
 
 #include "managed_register_mips.h"
 
-#include "globals.h"
+#include "base/globals.h"
 
 namespace art {
 namespace mips {
diff --git a/compiler/utils/mips64/assembler_mips64.h b/compiler/utils/mips64/assembler_mips64.h
index 542dbafc87..19f23b7e95 100644
--- a/compiler/utils/mips64/assembler_mips64.h
+++ b/compiler/utils/mips64/assembler_mips64.h
@@ -24,10 +24,10 @@
 #include "arch/mips64/instruction_set_features_mips64.h"
 #include "base/arena_containers.h"
 #include "base/enums.h"
+#include "base/globals.h"
 #include "base/macros.h"
 #include "base/stl_util_identity.h"
 #include "constants_mips64.h"
-#include "globals.h"
 #include "heap_poisoning.h"
 #include "managed_register_mips64.h"
 #include "offsets.h"
diff --git a/compiler/utils/mips64/constants_mips64.h b/compiler/utils/mips64/constants_mips64.h
index 310f23c287..41eb77c9ae 100644
--- a/compiler/utils/mips64/constants_mips64.h
+++ b/compiler/utils/mips64/constants_mips64.h
@@ -22,8 +22,8 @@
 #include <android-base/logging.h>
 
 #include "arch/mips64/registers_mips64.h"
+#include "base/globals.h"
 #include "base/macros.h"
-#include "globals.h"
 
 namespace art {
 namespace mips64 {
diff --git a/compiler/utils/mips64/managed_register_mips64.cc b/compiler/utils/mips64/managed_register_mips64.cc
index 42d061ec15..01cb6ddfe2 100644
--- a/compiler/utils/mips64/managed_register_mips64.cc
+++ b/compiler/utils/mips64/managed_register_mips64.cc
@@ -16,7 +16,7 @@
 
 #include "managed_register_mips64.h"
 
-#include "globals.h"
+#include "base/globals.h"
 
 namespace art {
 namespace mips64 {
diff --git a/compiler/utils/mips64/managed_register_mips64_test.cc b/compiler/utils/mips64/managed_register_mips64_test.cc
index 8b72d7e61d..bbfeeee20f 100644
--- a/compiler/utils/mips64/managed_register_mips64_test.cc
+++ b/compiler/utils/mips64/managed_register_mips64_test.cc
@@ -15,7 +15,8 @@
  */
 
 #include "managed_register_mips64.h"
-#include "globals.h"
+
+#include "base/globals.h"
 #include "gtest/gtest.h"
 
 namespace art {
diff --git a/compiler/utils/x86/assembler_x86.h b/compiler/utils/x86/assembler_x86.h
index 22eaedce61..e42c4c986a 100644
--- a/compiler/utils/x86/assembler_x86.h
+++ b/compiler/utils/x86/assembler_x86.h
@@ -23,9 +23,9 @@
 #include "base/array_ref.h"
 #include "base/bit_utils.h"
 #include "base/enums.h"
+#include "base/globals.h"
 #include "base/macros.h"
 #include "constants_x86.h"
-#include "globals.h"
 #include "heap_poisoning.h"
 #include "managed_register_x86.h"
 #include "offsets.h"
diff --git a/compiler/utils/x86/constants_x86.h b/compiler/utils/x86/constants_x86.h
index 2e03b9fc3c..73ef028075 100644
--- a/compiler/utils/x86/constants_x86.h
+++ b/compiler/utils/x86/constants_x86.h
@@ -22,8 +22,8 @@
 #include <android-base/logging.h>
 
 #include "arch/x86/registers_x86.h"
+#include "base/globals.h"
 #include "base/macros.h"
-#include "globals.h"
 
 namespace art {
 namespace x86 {
diff --git a/compiler/utils/x86/managed_register_x86.cc b/compiler/utils/x86/managed_register_x86.cc
index 69e6fce5c4..cc7cedf93e 100644
--- a/compiler/utils/x86/managed_register_x86.cc
+++ b/compiler/utils/x86/managed_register_x86.cc
@@ -16,7 +16,7 @@
 
 #include "managed_register_x86.h"
 
-#include "globals.h"
+#include "base/globals.h"
 
 namespace art {
 namespace x86 {
diff --git a/compiler/utils/x86/managed_register_x86_test.cc b/compiler/utils/x86/managed_register_x86_test.cc
index 0ed5c36fe4..28af5313c7 100644
--- a/compiler/utils/x86/managed_register_x86_test.cc
+++ b/compiler/utils/x86/managed_register_x86_test.cc
@@ -16,7 +16,7 @@
 
 #include "managed_register_x86.h"
 
-#include "globals.h"
+#include "base/globals.h"
 #include "gtest/gtest.h"
 
 namespace art {
diff --git a/compiler/utils/x86_64/assembler_x86_64.h b/compiler/utils/x86_64/assembler_x86_64.h
index ab761fb1fc..e4d72a7ba2 100644
--- a/compiler/utils/x86_64/assembler_x86_64.h
+++ b/compiler/utils/x86_64/assembler_x86_64.h
@@ -22,9 +22,9 @@
 #include "base/arena_containers.h"
 #include "base/array_ref.h"
 #include "base/bit_utils.h"
+#include "base/globals.h"
 #include "base/macros.h"
 #include "constants_x86_64.h"
-#include "globals.h"
 #include "heap_poisoning.h"
 #include "managed_register_x86_64.h"
 #include "offsets.h"
diff --git a/compiler/utils/x86_64/constants_x86_64.h b/compiler/utils/x86_64/constants_x86_64.h
index 2af3e7be16..b02e246842 100644
--- a/compiler/utils/x86_64/constants_x86_64.h
+++ b/compiler/utils/x86_64/constants_x86_64.h
@@ -22,8 +22,8 @@
 #include <android-base/logging.h>
 
 #include "arch/x86_64/registers_x86_64.h"
+#include "base/globals.h"
 #include "base/macros.h"
-#include "globals.h"
 
 namespace art {
 namespace x86_64 {
diff --git a/compiler/utils/x86_64/managed_register_x86_64.cc b/compiler/utils/x86_64/managed_register_x86_64.cc
index b8c2db2d2e..c0eec9d86c 100644
--- a/compiler/utils/x86_64/managed_register_x86_64.cc
+++ b/compiler/utils/x86_64/managed_register_x86_64.cc
@@ -16,7 +16,7 @@
 
 #include "managed_register_x86_64.h"
 
-#include "globals.h"
+#include "base/globals.h"
 
 namespace art {
 namespace x86_64 {
diff --git a/compiler/utils/x86_64/managed_register_x86_64_test.cc b/compiler/utils/x86_64/managed_register_x86_64_test.cc
index e43d717385..46a405ffaf 100644
--- a/compiler/utils/x86_64/managed_register_x86_64_test.cc
+++ b/compiler/utils/x86_64/managed_register_x86_64_test.cc
@@ -15,7 +15,7 @@
  */
 
 #include "managed_register_x86_64.h"
-#include "globals.h"
+#include "base/globals.h"
 #include "gtest/gtest.h"
 
 namespace art {
diff --git a/dex2oat/linker/elf_writer_quick.cc b/dex2oat/linker/elf_writer_quick.cc
index 4ab2012376..58bd1b0f1f 100644
--- a/dex2oat/linker/elf_writer_quick.cc
+++ b/dex2oat/linker/elf_writer_quick.cc
@@ -23,6 +23,7 @@
 #include <android-base/logging.h>
 
 #include "base/casts.h"
+#include "base/globals.h"
 #include "base/leb128.h"
 #include "base/utils.h"
 #include "compiled_method.h"
@@ -31,7 +32,6 @@
 #include "driver/compiler_options.h"
 #include "elf.h"
 #include "elf_utils.h"
-#include "globals.h"
 #include "linker/buffered_output_stream.h"
 #include "linker/elf_builder.h"
 #include "linker/file_output_stream.h"
diff --git a/dex2oat/linker/image_writer.cc b/dex2oat/linker/image_writer.cc
index c7a30a06ed..bd1e6df93d 100644
--- a/dex2oat/linker/image_writer.cc
+++ b/dex2oat/linker/image_writer.cc
@@ -29,6 +29,7 @@
 #include "art_method-inl.h"
 #include "base/callee_save_type.h"
 #include "base/enums.h"
+#include "base/globals.h"
 #include "base/logging.h"  // For VLOG.
 #include "base/unix_file/fd_file.h"
 #include "class_linker-inl.h"
@@ -47,7 +48,6 @@
 #include "gc/space/large_object_space.h"
 #include "gc/space/space-inl.h"
 #include "gc/verification.h"
-#include "globals.h"
 #include "handle_scope-inl.h"
 #include "image.h"
 #include "imt_conflict_table.h"
diff --git a/dex2oat/linker/multi_oat_relative_patcher.cc b/dex2oat/linker/multi_oat_relative_patcher.cc
index 1449d478f9..a6797ffb8a 100644
--- a/dex2oat/linker/multi_oat_relative_patcher.cc
+++ b/dex2oat/linker/multi_oat_relative_patcher.cc
@@ -19,7 +19,7 @@
 #include <android-base/logging.h>
 
 #include "base/bit_utils.h"
-#include "globals.h"
+#include "base/globals.h"
 #include "driver/compiled_method_storage.h"
 
 namespace art {
diff --git a/dex2oat/linker/relative_patcher_test.h b/dex2oat/linker/relative_patcher_test.h
index 9cd51e9b46..b4123eea3e 100644
--- a/dex2oat/linker/relative_patcher_test.h
+++ b/dex2oat/linker/relative_patcher_test.h
@@ -20,6 +20,7 @@
 #include "arch/instruction_set.h"
 #include "arch/instruction_set_features.h"
 #include "base/array_ref.h"
+#include "base/globals.h"
 #include "base/macros.h"
 #include "compiled_method-inl.h"
 #include "dex/verification_results.h"
@@ -27,7 +28,6 @@
 #include "dex/string_reference.h"
 #include "driver/compiler_driver.h"
 #include "driver/compiler_options.h"
-#include "globals.h"
 #include "gtest/gtest.h"
 #include "linker/relative_patcher.h"
 #include "linker/vector_output_stream.h"
diff --git a/libartbase/base/allocator.cc b/libartbase/base/allocator.cc
index c7be4e0161..c4ac180a15 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 662f78e448..5eb6ea6b4c 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 4d535df1d4..211ff4f6ad 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 68e99f4be0..e358710ca6 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 1542e9d5f7..01f9013737 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 2b2322e74f..0fb6bbf775 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 40cf23c9fb..bd57fb1cfc 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 de7cb64a75..ed0922546d 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 1ef2fbad8b..fb3da6b476 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 f736667ca8..b68f867bfa 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 0e051f358b..d995f8dbb1 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 23274e3f2f..89a71a1894 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 386b896073..9814fd4f3a 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 facfa61efb..68c2e4461f 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 ff6c160680..04f0e8518c 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 3fab15a3db..4975ebfb44 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 7a9f4650da..2bdc14ebe9 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 2ffa2aa9c9..a930f4e556 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 444f31a55b..43d14f4cef 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 66213972f7..0c00505461 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 2b9bed0397..d8d843beeb 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 53f551cb3a..0d0322c470 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 55f4d53c2e..d13595dc02 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 26d01b2883..9832f03d90 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 850b7c4f73..06e7340d36 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 ab19daa108..d5847fd6c6 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 747fc19f5d..58b0d07786 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 7c09bddd55..9238e81566 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 fd2cc20af2..a66a7e3635 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 986704ec98..d2c0a02399 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 1456eb30fa..46ba41bb1f 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 7df4aef25b..144b06ceb9 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 8720189343..c48be59eb5 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 21634f86b6..9a1392ceee 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 b7beb08dbc..3a324b2dc5 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 3adbf18a7a..4408f5502a 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 7add466cc7..3d00f5b939 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 cb228bd853..f8b31cf0d8 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 7ba5cbd3e6..b46b921307 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 f1d7c55e77..c23651f7a7 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 7240842d55..ab05c6041a 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 d5f6df82cc..7eaec5e3c3 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 4df02b6205..41939816f5 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 514b97bfb1..d679328cef 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 476b25748b..39b36b4fdd 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 3c09d5a36f..89a1109a7e 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 811af5d682..431d3e19ac 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 2750de1b94..9b015c4ea5 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 de2739e2fc..ef2957332b 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 da0340d36b..fc73d56779 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 82d9f9e325..92655438f4 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 63b6e4f531..5a5c37d11d 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 b2881b8ed0..c5313e969d 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 fe3317f64e..d61dab6ce3 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 042fbc9284..7fc057b9e8 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 aae65c1cde..10d829964c 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 029cffd3ab..b7a542fbbe 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 c8c5b72bf7..73c1c226f9 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 441bd1a384..dab6b76b26 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 4e02c54499..581bc234cc 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 4185c227c8..b5f946e5a2 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 39c8168519..73495da96a 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 03f4cd4d54..63743f754c 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 {
 
diff --git a/openjdkjvmti/jvmti_weak_table.h b/openjdkjvmti/jvmti_weak_table.h
index 5a821c964b..cba8ef06a7 100644
--- a/openjdkjvmti/jvmti_weak_table.h
+++ b/openjdkjvmti/jvmti_weak_table.h
@@ -34,11 +34,11 @@
 
 #include <unordered_map>
 
+#include "base/globals.h"
 #include "base/macros.h"
 #include "base/mutex.h"
 #include "gc/system_weak.h"
 #include "gc_root-inl.h"
-#include "globals.h"
 #include "jvmti.h"
 #include "jvmti_allocator.h"
 #include "mirror/object.h"
diff --git a/openjdkjvmti/object_tagging.h b/openjdkjvmti/object_tagging.h
index b474845566..1b8366a501 100644
--- a/openjdkjvmti/object_tagging.h
+++ b/openjdkjvmti/object_tagging.h
@@ -34,8 +34,8 @@
 
 #include <unordered_map>
 
+#include "base/globals.h"
 #include "base/mutex.h"
-#include "globals.h"
 #include "jvmti.h"
 #include "jvmti_weak_table.h"
 #include "mirror/object.h"
diff --git a/openjdkjvmti/ti_class_loader.h b/openjdkjvmti/ti_class_loader.h
index dbe30da462..142e2e1588 100644
--- a/openjdkjvmti/ti_class_loader.h
+++ b/openjdkjvmti/ti_class_loader.h
@@ -39,12 +39,12 @@
 #include "art_jvmti.h"
 #include "art_method.h"
 #include "base/array_slice.h"
+#include "base/globals.h"
 #include "base/mem_map.h"
 #include "class_linker.h"
 #include "dex/dex_file.h"
 #include "dex/utf.h"
 #include "gc_root-inl.h"
-#include "globals.h"
 #include "jni_env_ext-inl.h"
 #include "jvmti.h"
 #include "linear_alloc.h"
diff --git a/openjdkjvmti/ti_redefine.h b/openjdkjvmti/ti_redefine.h
index 03238565cc..e14b7ae1c8 100644
--- a/openjdkjvmti/ti_redefine.h
+++ b/openjdkjvmti/ti_redefine.h
@@ -39,12 +39,12 @@
 #include "art_jvmti.h"
 #include "art_method.h"
 #include "base/array_ref.h"
+#include "base/globals.h"
 #include "base/mem_map.h"
 #include "class_linker.h"
 #include "dex/dex_file.h"
 #include "dex/utf.h"
 #include "gc_root-inl.h"
-#include "globals.h"
 #include "jni_env_ext-inl.h"
 #include "jvmti.h"
 #include "linear_alloc.h"
diff --git a/openjdkjvmti/transform.cc b/openjdkjvmti/transform.cc
index f31486ba58..29a9b10ca2 100644
--- a/openjdkjvmti/transform.cc
+++ b/openjdkjvmti/transform.cc
@@ -39,6 +39,7 @@
 
 #include "art_method.h"
 #include "base/array_ref.h"
+#include "base/globals.h"
 #include "base/mem_map.h"
 #include "class_linker.h"
 #include "dex/dex_file.h"
@@ -47,7 +48,6 @@
 #include "events-inl.h"
 #include "fault_handler.h"
 #include "gc_root-inl.h"
-#include "globals.h"
 #include "jni_env_ext-inl.h"
 #include "jvalue.h"
 #include "jvmti.h"
diff --git a/runtime/arch/arm/fault_handler_arm.cc b/runtime/arch/arm/fault_handler_arm.cc
index 315bf957cc..bb33a273b8 100644
--- a/runtime/arch/arm/fault_handler_arm.cc
+++ b/runtime/arch/arm/fault_handler_arm.cc
@@ -20,10 +20,10 @@
 
 #include "art_method.h"
 #include "base/enums.h"
+#include "base/globals.h"
 #include "base/hex_dump.h"
 #include "base/logging.h"  // For VLOG.
 #include "base/macros.h"
-#include "globals.h"
 #include "thread-current-inl.h"
 
 //
diff --git a/runtime/arch/arm64/fault_handler_arm64.cc b/runtime/arch/arm64/fault_handler_arm64.cc
index d282c8cfc0..e8b4627f86 100644
--- a/runtime/arch/arm64/fault_handler_arm64.cc
+++ b/runtime/arch/arm64/fault_handler_arm64.cc
@@ -20,10 +20,10 @@
 
 #include "art_method.h"
 #include "base/enums.h"
+#include "base/globals.h"
 #include "base/hex_dump.h"
 #include "base/logging.h"  // For VLOG.
 #include "base/macros.h"
-#include "globals.h"
 #include "registers_arm64.h"
 #include "thread-current-inl.h"
 
diff --git a/runtime/arch/arm64/quick_method_frame_info_arm64.h b/runtime/arch/arm64/quick_method_frame_info_arm64.h
index 3e6f6c6e3b..2d2b500ae9 100644
--- a/runtime/arch/arm64/quick_method_frame_info_arm64.h
+++ b/runtime/arch/arm64/quick_method_frame_info_arm64.h
@@ -21,7 +21,7 @@
 #include "base/bit_utils.h"
 #include "base/callee_save_type.h"
 #include "base/enums.h"
-#include "globals.h"
+#include "base/globals.h"
 #include "quick/quick_method_frame_info.h"
 #include "registers_arm64.h"
 
diff --git a/runtime/arch/instruction_set.cc b/runtime/arch/instruction_set.cc
index ecccdcf7eb..b848eb27fc 100644
--- a/runtime/arch/instruction_set.cc
+++ b/runtime/arch/instruction_set.cc
@@ -20,7 +20,7 @@
 #include "../elf.h"
 #include "android-base/logging.h"
 #include "base/bit_utils.h"
-#include "globals.h"
+#include "base/globals.h"
 
 namespace art {
 
diff --git a/runtime/arch/mips/fault_handler_mips.cc b/runtime/arch/mips/fault_handler_mips.cc
index f82dc08cb2..d5a9b1589e 100644
--- a/runtime/arch/mips/fault_handler_mips.cc
+++ b/runtime/arch/mips/fault_handler_mips.cc
@@ -19,10 +19,10 @@
 
 #include "art_method.h"
 #include "base/callee_save_type.h"
+#include "base/globals.h"
 #include "base/hex_dump.h"
 #include "base/logging.h"  // For VLOG.
 #include "base/macros.h"
-#include "globals.h"
 #include "quick_method_frame_info_mips.h"
 #include "registers_mips.h"
 #include "thread-current-inl.h"
diff --git a/runtime/arch/mips/registers_mips.h b/runtime/arch/mips/registers_mips.h
index c7f9a3e74e..34f2f9684d 100644
--- a/runtime/arch/mips/registers_mips.h
+++ b/runtime/arch/mips/registers_mips.h
@@ -21,8 +21,8 @@
 
 #include <android-base/logging.h>
 
+#include "base/globals.h"
 #include "base/macros.h"
-#include "globals.h"
 
 namespace art {
 namespace mips {
diff --git a/runtime/arch/mips64/fault_handler_mips64.cc b/runtime/arch/mips64/fault_handler_mips64.cc
index ba6fff05ad..695da4794b 100644
--- a/runtime/arch/mips64/fault_handler_mips64.cc
+++ b/runtime/arch/mips64/fault_handler_mips64.cc
@@ -20,10 +20,10 @@
 
 #include "art_method.h"
 #include "base/callee_save_type.h"
+#include "base/globals.h"
 #include "base/hex_dump.h"
 #include "base/logging.h"  // For VLOG.
 #include "base/macros.h"
-#include "globals.h"
 #include "quick_method_frame_info_mips64.h"
 #include "registers_mips64.h"
 #include "thread-current-inl.h"
diff --git a/runtime/arch/mips64/registers_mips64.h b/runtime/arch/mips64/registers_mips64.h
index d3a24b6202..a3fa2ac426 100644
--- a/runtime/arch/mips64/registers_mips64.h
+++ b/runtime/arch/mips64/registers_mips64.h
@@ -21,8 +21,8 @@
 
 #include <android-base/logging.h>
 
+#include "base/globals.h"
 #include "base/macros.h"
-#include "globals.h"
 
 namespace art {
 namespace mips64 {
diff --git a/runtime/arch/x86/fault_handler_x86.cc b/runtime/arch/x86/fault_handler_x86.cc
index e6a91247cb..8b243342f9 100644
--- a/runtime/arch/x86/fault_handler_x86.cc
+++ b/runtime/arch/x86/fault_handler_x86.cc
@@ -20,11 +20,11 @@
 
 #include "art_method.h"
 #include "base/enums.h"
+#include "base/globals.h"
 #include "base/hex_dump.h"
 #include "base/logging.h"  // For VLOG.
 #include "base/macros.h"
 #include "base/safe_copy.h"
-#include "globals.h"
 #include "thread-current-inl.h"
 
 #if defined(__APPLE__)
diff --git a/runtime/arch/x86/registers_x86.h b/runtime/arch/x86/registers_x86.h
index ded3520c76..5a5d226319 100644
--- a/runtime/arch/x86/registers_x86.h
+++ b/runtime/arch/x86/registers_x86.h
@@ -21,8 +21,8 @@
 
 #include <android-base/logging.h>
 
+#include "base/globals.h"
 #include "base/macros.h"
-#include "globals.h"
 
 namespace art {
 namespace x86 {
diff --git a/runtime/arch/x86_64/registers_x86_64.h b/runtime/arch/x86_64/registers_x86_64.h
index 4f2243170e..66aea705d2 100644
--- a/runtime/arch/x86_64/registers_x86_64.h
+++ b/runtime/arch/x86_64/registers_x86_64.h
@@ -21,8 +21,8 @@
 
 #include <android-base/logging.h>
 
+#include "base/globals.h"
 #include "base/macros.h"
-#include "globals.h"
 
 namespace art {
 namespace x86_64 {
diff --git a/runtime/base/file_utils.cc b/runtime/base/file_utils.cc
index 7b0796cf37..7921985b15 100644
--- a/runtime/base/file_utils.cc
+++ b/runtime/base/file_utils.cc
@@ -43,11 +43,11 @@
 #include "android-base/strings.h"
 
 #include "base/bit_utils.h"
-#include "base/stl_util.h"
+#include "base/globals.h"
 #include "base/os.h"
+#include "base/stl_util.h"
 #include "base/unix_file/fd_file.h"
 #include "dex/dex_file_loader.h"
-#include "globals.h"
 
 #if defined(__APPLE__)
 #include <crt_externs.h>
diff --git a/runtime/common_runtime_test.h b/runtime/common_runtime_test.h
index 83a1f9a58a..186b1cd509 100644
--- a/runtime/common_runtime_test.h
+++ b/runtime/common_runtime_test.h
@@ -25,12 +25,12 @@
 #include <android-base/logging.h>
 
 #include "arch/instruction_set.h"
+#include "base/globals.h"
 #include "base/mutex.h"
 #include "base/os.h"
 #include "base/unix_file/fd_file.h"
 #include "dex/art_dex_file_loader.h"
 #include "dex/compact_dex_level.h"
-#include "globals.h"
 // TODO: Add inl file and avoid including inl.
 #include "obj_ptr-inl.h"
 #include "scoped_thread_state_change-inl.h"
diff --git a/runtime/gc/accounting/bitmap.h b/runtime/gc/accounting/bitmap.h
index d039d88770..2d83a8ad2e 100644
--- a/runtime/gc/accounting/bitmap.h
+++ b/runtime/gc/accounting/bitmap.h
@@ -23,8 +23,8 @@
 #include <set>
 #include <vector>
 
+#include "base/globals.h"
 #include "base/mutex.h"
-#include "globals.h"
 
 namespace art {
 
diff --git a/runtime/gc/accounting/card_table.h b/runtime/gc/accounting/card_table.h
index 766c976c98..f3548f7ce5 100644
--- a/runtime/gc/accounting/card_table.h
+++ b/runtime/gc/accounting/card_table.h
@@ -19,8 +19,8 @@
 
 #include <memory>
 
+#include "base/globals.h"
 #include "base/mutex.h"
-#include "globals.h"
 
 namespace art {
 
diff --git a/runtime/gc/accounting/mod_union_table.h b/runtime/gc/accounting/mod_union_table.h
index 766e0f5d33..7a3c06a281 100644
--- a/runtime/gc/accounting/mod_union_table.h
+++ b/runtime/gc/accounting/mod_union_table.h
@@ -18,11 +18,11 @@
 #define ART_RUNTIME_GC_ACCOUNTING_MOD_UNION_TABLE_H_
 
 #include "base/allocator.h"
+#include "base/globals.h"
 #include "base/safe_map.h"
 #include "base/tracking_safe_map.h"
 #include "bitmap.h"
 #include "card_table.h"
-#include "globals.h"
 #include "mirror/object_reference.h"
 
 #include <set>
diff --git a/runtime/gc/accounting/read_barrier_table.h b/runtime/gc/accounting/read_barrier_table.h
index 57e4db9b2b..4b5a8c61c1 100644
--- a/runtime/gc/accounting/read_barrier_table.h
+++ b/runtime/gc/accounting/read_barrier_table.h
@@ -20,10 +20,10 @@
 #include <sys/mman.h>  // For the PROT_* and MAP_* constants.
 
 #include "base/bit_utils.h"
+#include "base/globals.h"
 #include "base/mem_map.h"
 #include "base/mutex.h"
 #include "gc/space/space.h"
-#include "globals.h"
 
 namespace art {
 namespace gc {
diff --git a/runtime/gc/accounting/space_bitmap.h b/runtime/gc/accounting/space_bitmap.h
index 437aecc2b1..1237f6e8b5 100644
--- a/runtime/gc/accounting/space_bitmap.h
+++ b/runtime/gc/accounting/space_bitmap.h
@@ -23,8 +23,8 @@
 #include <set>
 #include <vector>
 
+#include "base/globals.h"
 #include "base/mutex.h"
-#include "globals.h"
 
 namespace art {
 
diff --git a/runtime/gc/accounting/space_bitmap_test.cc b/runtime/gc/accounting/space_bitmap_test.cc
index 1ca3fd6d12..22529b83c2 100644
--- a/runtime/gc/accounting/space_bitmap_test.cc
+++ b/runtime/gc/accounting/space_bitmap_test.cc
@@ -19,9 +19,9 @@
 #include <stdint.h>
 #include <memory>
 
+#include "base/globals.h"
 #include "base/mutex.h"
 #include "common_runtime_test.h"
-#include "globals.h"
 #include "space_bitmap-inl.h"
 
 namespace art {
diff --git a/runtime/gc/allocator/rosalloc.h b/runtime/gc/allocator/rosalloc.h
index 6e5cf0ede8..150fe956ae 100644
--- a/runtime/gc/allocator/rosalloc.h
+++ b/runtime/gc/allocator/rosalloc.h
@@ -30,8 +30,8 @@
 
 #include "base/allocator.h"
 #include "base/bit_utils.h"
+#include "base/globals.h"
 #include "base/mutex.h"
-#include "globals.h"
 #include "thread.h"
 
 namespace art {
diff --git a/runtime/gc/gc_cause.cc b/runtime/gc/gc_cause.cc
index 508d76535e..ee7ac7dae0 100644
--- a/runtime/gc/gc_cause.cc
+++ b/runtime/gc/gc_cause.cc
@@ -18,8 +18,8 @@
 
 #include <android-base/logging.h>
 
+#include "base/globals.h"
 #include "base/macros.h"
-#include "globals.h"
 
 #include <ostream>
 
diff --git a/runtime/gc/heap.h b/runtime/gc/heap.h
index 99ebab9357..609d2ab30e 100644
--- a/runtime/gc/heap.h
+++ b/runtime/gc/heap.h
@@ -27,6 +27,7 @@
 #include "allocator_type.h"
 #include "arch/instruction_set.h"
 #include "base/atomic.h"
+#include "base/globals.h"
 #include "base/macros.h"
 #include "base/mutex.h"
 #include "base/runtime_debug.h"
@@ -37,7 +38,6 @@
 #include "gc/collector_type.h"
 #include "gc/gc_cause.h"
 #include "gc/space/large_object_space.h"
-#include "globals.h"
 #include "handle.h"
 #include "obj_ptr.h"
 #include "offsets.h"
diff --git a/runtime/gc/reference_processor.h b/runtime/gc/reference_processor.h
index 1d984eb768..c6c78367b0 100644
--- a/runtime/gc/reference_processor.h
+++ b/runtime/gc/reference_processor.h
@@ -17,8 +17,8 @@
 #ifndef ART_RUNTIME_GC_REFERENCE_PROCESSOR_H_
 #define ART_RUNTIME_GC_REFERENCE_PROCESSOR_H_
 
+#include "base/globals.h"
 #include "base/mutex.h"
-#include "globals.h"
 #include "jni.h"
 #include "reference_queue.h"
 
diff --git a/runtime/gc/reference_queue.h b/runtime/gc/reference_queue.h
index af7788130b..09ab51a045 100644
--- a/runtime/gc/reference_queue.h
+++ b/runtime/gc/reference_queue.h
@@ -22,9 +22,9 @@
 #include <vector>
 
 #include "base/atomic.h"
+#include "base/globals.h"
 #include "base/mutex.h"
 #include "base/timing_logger.h"
-#include "globals.h"
 #include "jni.h"
 #include "obj_ptr.h"
 #include "offsets.h"
diff --git a/runtime/gc/space/space.h b/runtime/gc/space/space.h
index d888935ff2..4f43d9f5c5 100644
--- a/runtime/gc/space/space.h
+++ b/runtime/gc/space/space.h
@@ -21,12 +21,12 @@
 #include <string>
 
 #include "base/atomic.h"
+#include "base/globals.h"
 #include "base/macros.h"
 #include "base/mem_map.h"
 #include "base/mutex.h"
 #include "gc/accounting/space_bitmap.h"
 #include "gc/collector/object_byte_pair.h"
-#include "globals.h"
 
 namespace art {
 namespace mirror {
diff --git a/runtime/gc/space/space_test.h b/runtime/gc/space/space_test.h
index 1fe3fb2e86..d5861ed5d8 100644
--- a/runtime/gc/space/space_test.h
+++ b/runtime/gc/space/space_test.h
@@ -20,8 +20,8 @@
 #include <stdint.h>
 #include <memory>
 
+#include "base/globals.h"
 #include "common_runtime_test.h"
-#include "globals.h"
 #include "mirror/array-inl.h"
 #include "mirror/class-inl.h"
 #include "mirror/class_loader.h"
diff --git a/runtime/gc/task_processor.h b/runtime/gc/task_processor.h
index f6b5607037..6db3c37689 100644
--- a/runtime/gc/task_processor.h
+++ b/runtime/gc/task_processor.h
@@ -20,8 +20,8 @@
 #include <memory>
 #include <set>
 
+#include "base/globals.h"
 #include "base/mutex.h"
-#include "globals.h"
 #include "thread_pool.h"
 
 namespace art {
diff --git a/runtime/globals.h b/runtime/globals.h
deleted file mode 100644
index bdc2177c7c..0000000000
--- a/runtime/globals.h
+++ /dev/null
@@ -1,23 +0,0 @@
-/*
- * Copyright (C) 2011 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-#ifndef ART_RUNTIME_GLOBALS_H_
-#define ART_RUNTIME_GLOBALS_H_
-
-// TODO: remove this file in favor of libartbase/base/globals.h
-#include "base/globals.h"
-
-#endif  // ART_RUNTIME_GLOBALS_H_
diff --git a/runtime/hprof/hprof.cc b/runtime/hprof/hprof.cc
index aa716f12ac..3b6487449b 100644
--- a/runtime/hprof/hprof.cc
+++ b/runtime/hprof/hprof.cc
@@ -42,6 +42,7 @@
 #include "art_field-inl.h"
 #include "art_method-inl.h"
 #include "base/array_ref.h"
+#include "base/globals.h"
 #include "base/macros.h"
 #include "base/mutex.h"
 #include "base/os.h"
@@ -59,7 +60,6 @@
 #include "gc/scoped_gc_critical_section.h"
 #include "gc/space/space.h"
 #include "gc_root.h"
-#include "globals.h"
 #include "jdwp/jdwp.h"
 #include "jdwp/jdwp_priv.h"
 #include "mirror/class-inl.h"
diff --git a/runtime/image.h b/runtime/image.h
index fe544cc44b..8acd5bc4c4 100644
--- a/runtime/image.h
+++ b/runtime/image.h
@@ -20,7 +20,7 @@
 #include <string.h>
 
 #include "base/enums.h"
-#include "globals.h"
+#include "base/globals.h"
 #include "mirror/object.h"
 
 namespace art {
diff --git a/runtime/mirror/dex_cache.cc b/runtime/mirror/dex_cache.cc
index eb4db00ccd..661f954ef5 100644
--- a/runtime/mirror/dex_cache.cc
+++ b/runtime/mirror/dex_cache.cc
@@ -17,10 +17,10 @@
 #include "dex_cache-inl.h"
 
 #include "art_method-inl.h"
+#include "base/globals.h"
 #include "class_linker.h"
 #include "gc/accounting/card_table-inl.h"
 #include "gc/heap.h"
-#include "globals.h"
 #include "linear_alloc.h"
 #include "oat_file.h"
 #include "object-inl.h"
diff --git a/runtime/mirror/object.h b/runtime/mirror/object.h
index d00c90bcc0..82045c7b66 100644
--- a/runtime/mirror/object.h
+++ b/runtime/mirror/object.h
@@ -20,7 +20,7 @@
 #include "base/atomic.h"
 #include "base/casts.h"
 #include "base/enums.h"
-#include "globals.h"
+#include "base/globals.h"
 #include "obj_ptr.h"
 #include "object_reference.h"
 #include "offsets.h"
diff --git a/runtime/mirror/object_reference.h b/runtime/mirror/object_reference.h
index 356fef0d26..77154e2cda 100644
--- a/runtime/mirror/object_reference.h
+++ b/runtime/mirror/object_reference.h
@@ -18,8 +18,8 @@
 #define ART_RUNTIME_MIRROR_OBJECT_REFERENCE_H_
 
 #include "base/atomic.h"
+#include "base/globals.h"
 #include "base/mutex.h"  // For Locks::mutator_lock_.
-#include "globals.h"
 #include "heap_poisoning.h"
 #include "obj_ptr.h"
 
diff --git a/runtime/obj_ptr.h b/runtime/obj_ptr.h
index 14fdba31d9..e421d878ff 100644
--- a/runtime/obj_ptr.h
+++ b/runtime/obj_ptr.h
@@ -20,9 +20,9 @@
 #include <ostream>
 #include <type_traits>
 
+#include "base/globals.h"
 #include "base/macros.h"
 #include "base/mutex.h"  // For Locks::mutator_lock_.
-#include "globals.h"
 
 namespace art {
 
diff --git a/runtime/offsets.h b/runtime/offsets.h
index aaf5c0c120..4df9b27f61 100644
--- a/runtime/offsets.h
+++ b/runtime/offsets.h
@@ -20,7 +20,7 @@
 #include <ostream>
 
 #include "base/enums.h"
-#include "globals.h"
+#include "base/globals.h"
 
 namespace art {
 
diff --git a/runtime/parsed_options.h b/runtime/parsed_options.h
index 0f8555a829..8c77d39f7b 100644
--- a/runtime/parsed_options.h
+++ b/runtime/parsed_options.h
@@ -23,9 +23,9 @@
 #include <jni.h>
 
 #include "arch/instruction_set.h"
+#include "base/globals.h"
 #include "gc/collector_type.h"
 #include "gc/space/large_object_space.h"
-#include "globals.h"
 // #include "jit/profile_saver_options.h"
 #include "runtime_options.h"
 
diff --git a/runtime/thread.h b/runtime/thread.h
index 22b77eea64..3ec050a5eb 100644
--- a/runtime/thread.h
+++ b/runtime/thread.h
@@ -30,11 +30,11 @@
 #include "arch/instruction_set.h"
 #include "base/atomic.h"
 #include "base/enums.h"
+#include "base/globals.h"
 #include "base/macros.h"
 #include "base/mutex.h"
 #include "entrypoints/jni/jni_entrypoints.h"
 #include "entrypoints/quick/quick_entrypoints.h"
-#include "globals.h"
 #include "handle_scope.h"
 #include "instrumentation.h"
 #include "jvalue.h"
diff --git a/runtime/trace.h b/runtime/trace.h
index b242d1596c..1fae250d77 100644
--- a/runtime/trace.h
+++ b/runtime/trace.h
@@ -27,10 +27,10 @@
 #include <vector>
 
 #include "base/atomic.h"
+#include "base/globals.h"
 #include "base/macros.h"
 #include "base/os.h"
 #include "base/safe_map.h"
-#include "globals.h"
 #include "instrumentation.h"
 
 namespace unix_file {
diff --git a/runtime/utils/dex_cache_arrays_layout-inl.h b/runtime/utils/dex_cache_arrays_layout-inl.h
index 68a5760f7e..c0ea6be5a3 100644
--- a/runtime/utils/dex_cache_arrays_layout-inl.h
+++ b/runtime/utils/dex_cache_arrays_layout-inl.h
@@ -22,9 +22,9 @@
 #include <android-base/logging.h>
 
 #include "base/bit_utils.h"
+#include "base/globals.h"
 #include "dex/primitive.h"
 #include "gc_root.h"
-#include "globals.h"
 #include "mirror/dex_cache.h"
 
 namespace art {
diff --git a/runtime/verify_object.cc b/runtime/verify_object.cc
index a031a07a94..70ca13f913 100644
--- a/runtime/verify_object.cc
+++ b/runtime/verify_object.cc
@@ -17,8 +17,8 @@
 #include "verify_object-inl.h"
 
 #include "base/bit_utils.h"
+#include "base/globals.h"
 #include "gc/heap.h"
-#include "globals.h"
 #include "mirror/object-inl.h"
 #include "obj_ptr-inl.h"
 #include "runtime.h"
diff --git a/simulator/code_simulator_container.cc b/simulator/code_simulator_container.cc
index 9f52b320f2..3206bc7844 100644
--- a/simulator/code_simulator_container.cc
+++ b/simulator/code_simulator_container.cc
@@ -18,9 +18,9 @@
 
 #include "code_simulator_container.h"
 
+#include "base/globals.h"
 #include "base/logging.h"  // For VLOG.
 #include "code_simulator.h"
-#include "globals.h"
 
 namespace art {
 
diff --git a/test/305-other-fault-handler/fault_handler.cc b/test/305-other-fault-handler/fault_handler.cc
index a0831ca8c2..211d142a2b 100644
--- a/test/305-other-fault-handler/fault_handler.cc
+++ b/test/305-other-fault-handler/fault_handler.cc
@@ -23,9 +23,9 @@
 #include <stdint.h>
 #include <sys/mman.h>
 
+#include "base/globals.h"
 #include "base/mem_map.h"
 #include "fault_handler.h"
-#include "globals.h"
 
 namespace art {
 
diff --git a/tools/cpp-define-generator/constant_globals.def b/tools/cpp-define-generator/constant_globals.def
index 539633e0b3..d0d6350f80 100644
--- a/tools/cpp-define-generator/constant_globals.def
+++ b/tools/cpp-define-generator/constant_globals.def
@@ -18,8 +18,8 @@
 
 #if defined(DEFINE_INCLUDE_DEPENDENCIES)
 #include <atomic>            // std::memory_order_relaxed
+#include "base/globals.h"    // art::kObjectAlignment
 #include "dex/modifiers.h"
-#include "globals.h"         // art::kObjectAlignment
 #endif
 
 DEFINE_EXPR(STD_MEMORY_ORDER_RELAXED, int32_t, std::memory_order_relaxed)