Rename enums.h/.cc to pointer_size.h/.cc.

It was the only enum in the file

Bug: 329378408
Test: art/test/testrunner/testrunner.py --host --64 --optimizing -b
Change-Id: If0e385324afa3685f648135ba9b60e6bc79ba0ed

133 files changed, 135 insertions, 135 deletions

diff --git a/compiler/cfi_test.h b/compiler/cfi_test.h
index 6835e92dfd..5010b5cbf6 100644
--- a/compiler/cfi_test.h
+++ b/compiler/cfi_test.h
@@ -22,8 +22,8 @@
 #include <vector>
 
 #include "arch/instruction_set.h"
-#include "base/enums.h"
 #include "base/macros.h"
+#include "base/pointer_size.h"
 #include "debug/dwarf/dwarf_test.h"
 #include "disassembler.h"
 #include "dwarf/dwarf_constants.h"
diff --git a/compiler/common_compiler_test.cc b/compiler/common_compiler_test.cc
index 8c05888215..d7f6a2274f 100644
--- a/compiler/common_compiler_test.cc
+++ b/compiler/common_compiler_test.cc
@@ -24,8 +24,8 @@
 #include "art_method-inl.h"
 #include "base/callee_save_type.h"
 #include "base/casts.h"
-#include "base/enums.h"
 #include "base/memfd.h"
+#include "base/pointer_size.h"
 #include "base/utils.h"
 #include "class_linker.h"
 #include "dex/descriptors_names.h"
diff --git a/compiler/dex/inline_method_analyser.cc b/compiler/dex/inline_method_analyser.cc
index 91944b01c0..85cf83c099 100644
--- a/compiler/dex/inline_method_analyser.cc
+++ b/compiler/dex/inline_method_analyser.cc
@@ -18,7 +18,7 @@
 
 #include "art_field-inl.h"
 #include "art_method-inl.h"
-#include "base/enums.h"
+#include "base/pointer_size.h"
 #include "class_linker-inl.h"
 #include "dex/code_item_accessors-inl.h"
 #include "dex/dex_file-inl.h"
diff --git a/compiler/exception_test.cc b/compiler/exception_test.cc
index b90b08240f..3c7ff0a984 100644
--- a/compiler/exception_test.cc
+++ b/compiler/exception_test.cc
@@ -22,10 +22,10 @@
 #include "art_method-inl.h"
 #include "base/arena_allocator.h"
 #include "base/callee_save_type.h"
-#include "base/enums.h"
 #include "base/leb128.h"
 #include "base/macros.h"
 #include "base/malloc_arena_pool.h"
+#include "base/pointer_size.h"
 #include "class_linker.h"
 #include "common_runtime_test.h"
 #include "dex/code_item_accessors-inl.h"
diff --git a/compiler/jni/jni_cfi_test.cc b/compiler/jni/jni_cfi_test.cc
index 6c9803f324..580f4b7a8a 100644
--- a/compiler/jni/jni_cfi_test.cc
+++ b/compiler/jni/jni_cfi_test.cc
@@ -19,9 +19,9 @@
 
 #include "arch/instruction_set.h"
 #include "base/arena_allocator.h"
-#include "base/enums.h"
 #include "base/macros.h"
 #include "base/malloc_arena_pool.h"
+#include "base/pointer_size.h"
 #include "cfi_test.h"
 #include "gtest/gtest.h"
 #include "jni/quick/calling_convention.h"
diff --git a/compiler/jni/quick/arm/calling_convention_arm.h b/compiler/jni/quick/arm/calling_convention_arm.h
index f74f02362b..065627de22 100644
--- a/compiler/jni/quick/arm/calling_convention_arm.h
+++ b/compiler/jni/quick/arm/calling_convention_arm.h
@@ -17,8 +17,8 @@
 #ifndef ART_COMPILER_JNI_QUICK_ARM_CALLING_CONVENTION_ARM_H_
 #define ART_COMPILER_JNI_QUICK_ARM_CALLING_CONVENTION_ARM_H_
 
-#include "base/enums.h"
 #include "base/macros.h"
+#include "base/pointer_size.h"
 #include "jni/quick/calling_convention.h"
 
 namespace art HIDDEN {
diff --git a/compiler/jni/quick/arm64/calling_convention_arm64.h b/compiler/jni/quick/arm64/calling_convention_arm64.h
index 4ba1fb75ef..2a1a0b5a67 100644
--- a/compiler/jni/quick/arm64/calling_convention_arm64.h
+++ b/compiler/jni/quick/arm64/calling_convention_arm64.h
@@ -17,8 +17,8 @@
 #ifndef ART_COMPILER_JNI_QUICK_ARM64_CALLING_CONVENTION_ARM64_H_
 #define ART_COMPILER_JNI_QUICK_ARM64_CALLING_CONVENTION_ARM64_H_
 
-#include "base/enums.h"
 #include "base/macros.h"
+#include "base/pointer_size.h"
 #include "jni/quick/calling_convention.h"
 
 namespace art HIDDEN {
diff --git a/compiler/jni/quick/calling_convention.h b/compiler/jni/quick/calling_convention.h
index c0aba57b3a..410ec1be12 100644
--- a/compiler/jni/quick/calling_convention.h
+++ b/compiler/jni/quick/calling_convention.h
@@ -19,8 +19,8 @@
 
 #include "base/arena_object.h"
 #include "base/array_ref.h"
-#include "base/enums.h"
 #include "base/macros.h"
+#include "base/pointer_size.h"
 #include "dex/primitive.h"
 #include "thread.h"
 #include "utils/managed_register.h"
diff --git a/compiler/jni/quick/jni_compiler.cc b/compiler/jni/quick/jni_compiler.cc
index 73e888a79c..2ba2fc695d 100644
--- a/compiler/jni/quick/jni_compiler.cc
+++ b/compiler/jni/quick/jni_compiler.cc
@@ -25,10 +25,10 @@
 #include "art_method.h"
 #include "base/arena_allocator.h"
 #include "base/arena_containers.h"
-#include "base/enums.h"
 #include "base/logging.h"  // For VLOG.
 #include "base/macros.h"
 #include "base/memory_region.h"
+#include "base/pointer_size.h"
 #include "base/utils.h"
 #include "calling_convention.h"
 #include "class_linker.h"
diff --git a/compiler/jni/quick/riscv64/calling_convention_riscv64.h b/compiler/jni/quick/riscv64/calling_convention_riscv64.h
index f6193a005b..399e4b9a47 100644
--- a/compiler/jni/quick/riscv64/calling_convention_riscv64.h
+++ b/compiler/jni/quick/riscv64/calling_convention_riscv64.h
@@ -17,8 +17,8 @@
 #ifndef ART_COMPILER_JNI_QUICK_RISCV64_CALLING_CONVENTION_RISCV64_H_
 #define ART_COMPILER_JNI_QUICK_RISCV64_CALLING_CONVENTION_RISCV64_H_
 
-#include "base/enums.h"
 #include "base/macros.h"
+#include "base/pointer_size.h"
 #include "jni/quick/calling_convention.h"
 
 namespace art HIDDEN {
diff --git a/compiler/jni/quick/x86/calling_convention_x86.h b/compiler/jni/quick/x86/calling_convention_x86.h
index f7a453eeac..3743096c07 100644
--- a/compiler/jni/quick/x86/calling_convention_x86.h
+++ b/compiler/jni/quick/x86/calling_convention_x86.h
@@ -17,8 +17,8 @@
 #ifndef ART_COMPILER_JNI_QUICK_X86_CALLING_CONVENTION_X86_H_
 #define ART_COMPILER_JNI_QUICK_X86_CALLING_CONVENTION_X86_H_
 
-#include "base/enums.h"
 #include "base/macros.h"
+#include "base/pointer_size.h"
 #include "jni/quick/calling_convention.h"
 
 namespace art HIDDEN {
diff --git a/compiler/jni/quick/x86_64/calling_convention_x86_64.h b/compiler/jni/quick/x86_64/calling_convention_x86_64.h
index 9c1f4eda9d..adcf6beb1b 100644
--- a/compiler/jni/quick/x86_64/calling_convention_x86_64.h
+++ b/compiler/jni/quick/x86_64/calling_convention_x86_64.h
@@ -17,8 +17,8 @@
 #ifndef ART_COMPILER_JNI_QUICK_X86_64_CALLING_CONVENTION_X86_64_H_
 #define ART_COMPILER_JNI_QUICK_X86_64_CALLING_CONVENTION_X86_64_H_
 
-#include "base/enums.h"
 #include "base/macros.h"
+#include "base/pointer_size.h"
 #include "jni/quick/calling_convention.h"
 
 namespace art HIDDEN {
diff --git a/compiler/optimizing/code_generator.h b/compiler/optimizing/code_generator.h
index 73059313e2..94831cab9f 100644
--- a/compiler/optimizing/code_generator.h
+++ b/compiler/optimizing/code_generator.h
@@ -24,10 +24,10 @@
 #include "base/array_ref.h"
 #include "base/bit_field.h"
 #include "base/bit_utils.h"
-#include "base/enums.h"
 #include "base/globals.h"
 #include "base/macros.h"
 #include "base/memory_region.h"
+#include "base/pointer_size.h"
 #include "class_root.h"
 #include "dex/string_reference.h"
 #include "dex/type_reference.h"
diff --git a/compiler/optimizing/code_generator_arm_vixl.h b/compiler/optimizing/code_generator_arm_vixl.h
index 35686dfa50..a6cc07d212 100644
--- a/compiler/optimizing/code_generator_arm_vixl.h
+++ b/compiler/optimizing/code_generator_arm_vixl.h
@@ -17,8 +17,8 @@
 #ifndef ART_COMPILER_OPTIMIZING_CODE_GENERATOR_ARM_VIXL_H_
 #define ART_COMPILER_OPTIMIZING_CODE_GENERATOR_ARM_VIXL_H_
 
-#include "base/enums.h"
 #include "base/macros.h"
+#include "base/pointer_size.h"
 #include "class_root.h"
 #include "code_generator.h"
 #include "common_arm.h"
diff --git a/compiler/optimizing/code_generator_x86.h b/compiler/optimizing/code_generator_x86.h
index 007ec81142..ee87947ca0 100644
--- a/compiler/optimizing/code_generator_x86.h
+++ b/compiler/optimizing/code_generator_x86.h
@@ -18,8 +18,8 @@
 #define ART_COMPILER_OPTIMIZING_CODE_GENERATOR_X86_H_
 
 #include "arch/x86/instruction_set_features_x86.h"
-#include "base/enums.h"
 #include "base/macros.h"
+#include "base/pointer_size.h"
 #include "code_generator.h"
 #include "dex/dex_file_types.h"
 #include "driver/compiler_options.h"
diff --git a/compiler/optimizing/inliner.cc b/compiler/optimizing/inliner.cc
index 02cf8a4052..8a25e82816 100644
--- a/compiler/optimizing/inliner.cc
+++ b/compiler/optimizing/inliner.cc
@@ -17,8 +17,8 @@
 #include "inliner.h"
 
 #include "art_method-inl.h"
-#include "base/enums.h"
 #include "base/logging.h"
+#include "base/pointer_size.h"
 #include "builder.h"
 #include "class_linker.h"
 #include "class_root-inl.h"
diff --git a/compiler/optimizing/reference_type_propagation.cc b/compiler/optimizing/reference_type_propagation.cc
index 91a6fd5d3a..14017088c2 100644
--- a/compiler/optimizing/reference_type_propagation.cc
+++ b/compiler/optimizing/reference_type_propagation.cc
@@ -19,7 +19,7 @@
 #include "art_field-inl.h"
 #include "art_method-inl.h"
 #include "base/arena_allocator.h"
-#include "base/enums.h"
+#include "base/pointer_size.h"
 #include "base/scoped_arena_allocator.h"
 #include "base/scoped_arena_containers.h"
 #include "class_linker-inl.h"
diff --git a/compiler/optimizing/register_allocator_linear_scan.cc b/compiler/optimizing/register_allocator_linear_scan.cc
index 2b1864b52b..458d1a740e 100644
--- a/compiler/optimizing/register_allocator_linear_scan.cc
+++ b/compiler/optimizing/register_allocator_linear_scan.cc
@@ -21,7 +21,7 @@
 
 #include "base/bit_utils_iterator.h"
 #include "base/bit_vector-inl.h"
-#include "base/enums.h"
+#include "base/pointer_size.h"
 #include "code_generator.h"
 #include "linear_order.h"
 #include "register_allocation_resolver.h"
diff --git a/compiler/optimizing/sharpening.cc b/compiler/optimizing/sharpening.cc
index 277edff33e..a04a15e60d 100644
--- a/compiler/optimizing/sharpening.cc
+++ b/compiler/optimizing/sharpening.cc
@@ -18,8 +18,8 @@
 
 #include "art_method-inl.h"
 #include "base/casts.h"
-#include "base/enums.h"
 #include "base/logging.h"
+#include "base/pointer_size.h"
 #include "class_linker.h"
 #include "code_generator.h"
 #include "driver/compiler_options.h"
diff --git a/compiler/utils/arm64/jni_macro_assembler_arm64.h b/compiler/utils/arm64/jni_macro_assembler_arm64.h
index 0750c2655f..b861472218 100644
--- a/compiler/utils/arm64/jni_macro_assembler_arm64.h
+++ b/compiler/utils/arm64/jni_macro_assembler_arm64.h
@@ -25,8 +25,8 @@
 
 #include "assembler_arm64.h"
 #include "base/arena_containers.h"
-#include "base/enums.h"
 #include "base/macros.h"
+#include "base/pointer_size.h"
 #include "offsets.h"
 #include "utils/assembler.h"
 #include "utils/jni_macro_assembler.h"
diff --git a/compiler/utils/assembler.h b/compiler/utils/assembler.h
index f3fa711dbb..0548cf8325 100644
--- a/compiler/utils/assembler.h
+++ b/compiler/utils/assembler.h
@@ -27,9 +27,9 @@
 #include "base/arena_allocator.h"
 #include "base/arena_object.h"
 #include "base/array_ref.h"
-#include "base/enums.h"
 #include "base/macros.h"
 #include "base/memory_region.h"
+#include "base/pointer_size.h"
 #include "dwarf/debug_frame_opcode_writer.h"
 #include "label.h"
 #include "managed_register.h"
diff --git a/compiler/utils/jni_macro_assembler.h b/compiler/utils/jni_macro_assembler.h
index 0ffa50a53b..313a5d80fc 100644
--- a/compiler/utils/jni_macro_assembler.h
+++ b/compiler/utils/jni_macro_assembler.h
@@ -25,8 +25,8 @@
 #include "base/arena_allocator.h"
 #include "base/arena_object.h"
 #include "base/array_ref.h"
-#include "base/enums.h"
 #include "base/macros.h"
+#include "base/pointer_size.h"
 #include "managed_register.h"
 #include "offsets.h"
 
diff --git a/compiler/utils/riscv64/assembler_riscv64.h b/compiler/utils/riscv64/assembler_riscv64.h
index d5c40e5dad..fc5d3f0684 100644
--- a/compiler/utils/riscv64/assembler_riscv64.h
+++ b/compiler/utils/riscv64/assembler_riscv64.h
@@ -24,9 +24,9 @@
 
 #include "arch/riscv64/instruction_set_features_riscv64.h"
 #include "base/arena_containers.h"
-#include "base/enums.h"
 #include "base/globals.h"
 #include "base/macros.h"
+#include "base/pointer_size.h"
 #include "managed_register_riscv64.h"
 #include "utils/assembler.h"
 #include "utils/label.h"
diff --git a/compiler/utils/riscv64/jni_macro_assembler_riscv64.h b/compiler/utils/riscv64/jni_macro_assembler_riscv64.h
index 3cb712483d..e6a579ddb0 100644
--- a/compiler/utils/riscv64/jni_macro_assembler_riscv64.h
+++ b/compiler/utils/riscv64/jni_macro_assembler_riscv64.h
@@ -25,8 +25,8 @@
 
 #include "assembler_riscv64.h"
 #include "base/arena_containers.h"
-#include "base/enums.h"
 #include "base/macros.h"
+#include "base/pointer_size.h"
 #include "offsets.h"
 #include "utils/assembler.h"
 #include "utils/jni_macro_assembler.h"
diff --git a/compiler/utils/x86/assembler_x86.h b/compiler/utils/x86/assembler_x86.h
index 737e9853a5..886e1ca314 100644
--- a/compiler/utils/x86/assembler_x86.h
+++ b/compiler/utils/x86/assembler_x86.h
@@ -23,9 +23,9 @@
 #include "base/arena_containers.h"
 #include "base/array_ref.h"
 #include "base/bit_utils.h"
-#include "base/enums.h"
 #include "base/globals.h"
 #include "base/macros.h"
+#include "base/pointer_size.h"
 #include "constants_x86.h"
 #include "heap_poisoning.h"
 #include "managed_register_x86.h"
diff --git a/compiler/utils/x86/jni_macro_assembler_x86.h b/compiler/utils/x86/jni_macro_assembler_x86.h
index 6b177f533b..ce18f9a465 100644
--- a/compiler/utils/x86/jni_macro_assembler_x86.h
+++ b/compiler/utils/x86/jni_macro_assembler_x86.h
@@ -22,8 +22,8 @@
 #include "assembler_x86.h"
 #include "base/arena_containers.h"
 #include "base/array_ref.h"
-#include "base/enums.h"
 #include "base/macros.h"
+#include "base/pointer_size.h"
 #include "offsets.h"
 #include "utils/jni_macro_assembler.h"
 
diff --git a/compiler/utils/x86_64/jni_macro_assembler_x86_64.h b/compiler/utils/x86_64/jni_macro_assembler_x86_64.h
index da0aef9869..26d13c1950 100644
--- a/compiler/utils/x86_64/jni_macro_assembler_x86_64.h
+++ b/compiler/utils/x86_64/jni_macro_assembler_x86_64.h
@@ -22,8 +22,8 @@
 #include "assembler_x86_64.h"
 #include "base/arena_containers.h"
 #include "base/array_ref.h"
-#include "base/enums.h"
 #include "base/macros.h"
+#include "base/pointer_size.h"
 #include "offsets.h"
 #include "utils/assembler.h"
 #include "utils/jni_macro_assembler.h"
diff --git a/dex2oat/driver/compiler_driver-inl.h b/dex2oat/driver/compiler_driver-inl.h
index 7bc2f02bb5..a928b6dd02 100644
--- a/dex2oat/driver/compiler_driver-inl.h
+++ b/dex2oat/driver/compiler_driver-inl.h
@@ -21,7 +21,7 @@
 
 #include "art_field-inl.h"
 #include "art_method-inl.h"
-#include "base/enums.h"
+#include "base/pointer_size.h"
 #include "class_linker-inl.h"
 #include "driver/dex_compilation_unit.h"
 #include "handle_scope-inl.h"
diff --git a/dex2oat/driver/compiler_driver.cc b/dex2oat/driver/compiler_driver.cc
index 02e01ec7de..3415efae3d 100644
--- a/dex2oat/driver/compiler_driver.cc
+++ b/dex2oat/driver/compiler_driver.cc
@@ -33,9 +33,9 @@
 #include "base/arena_allocator.h"
 #include "base/array_ref.h"
 #include "base/bit_vector.h"
-#include "base/enums.h"
 #include "base/hash_set.h"
 #include "base/logging.h"  // For VLOG
+#include "base/pointer_size.h"
 #include "base/stl_util.h"
 #include "base/string_view_cpp20.h"
 #include "base/systrace.h"
diff --git a/dex2oat/linker/image_test.cc b/dex2oat/linker/image_test.cc
index 959264d634..38f33fa923 100644
--- a/dex2oat/linker/image_test.cc
+++ b/dex2oat/linker/image_test.cc
@@ -19,7 +19,7 @@
 
 #include "image_test.h"
 
-#include "base/enums.h"
+#include "base/pointer_size.h"
 #include "oat/image.h"
 #include "scoped_thread_state_change-inl.h"
 #include "thread.h"
diff --git a/dex2oat/linker/image_writer.cc b/dex2oat/linker/image_writer.cc
index 0d4e103d8b..c9be7de2c2 100644
--- a/dex2oat/linker/image_writer.cc
+++ b/dex2oat/linker/image_writer.cc
@@ -30,9 +30,9 @@
 #include "art_field-inl.h"
 #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/pointer_size.h"
 #include "base/stl_util.h"
 #include "base/unix_file/fd_file.h"
 #include "class_linker-inl.h"
diff --git a/dex2oat/linker/image_writer.h b/dex2oat/linker/image_writer.h
index 20509a9ed1..4d45529871 100644
--- a/dex2oat/linker/image_writer.h
+++ b/dex2oat/linker/image_writer.h
@@ -30,7 +30,6 @@
 #include "art_method.h"
 #include "base/bit_utils.h"
 #include "base/dchecked_vector.h"
-#include "base/enums.h"
 #include "base/unix_file/fd_file.h"
 #include "base/hash_map.h"
 #include "base/hash_set.h"
@@ -38,6 +37,7 @@
 #include "base/macros.h"
 #include "base/mem_map.h"
 #include "base/os.h"
+#include "base/pointer_size.h"
 #include "base/utils.h"
 #include "class_table.h"
 #include "gc/accounting/space_bitmap.h"
diff --git a/dex2oat/linker/index_bss_mapping_encoder_test.cc b/dex2oat/linker/index_bss_mapping_encoder_test.cc
index d7ca2a5742..f4d7783a0f 100644
--- a/dex2oat/linker/index_bss_mapping_encoder_test.cc
+++ b/dex2oat/linker/index_bss_mapping_encoder_test.cc
@@ -16,7 +16,7 @@
 
 #include "index_bss_mapping_encoder.h"
 
-#include "base/enums.h"
+#include "base/pointer_size.h"
 #include "gtest/gtest.h"
 
 namespace art {
diff --git a/dex2oat/linker/oat_writer.cc b/dex2oat/linker/oat_writer.cc
index 8a296e83c7..c6e861bf76 100644
--- a/dex2oat/linker/oat_writer.cc
+++ b/dex2oat/linker/oat_writer.cc
@@ -27,12 +27,12 @@
 #include "art_method-inl.h"
 #include "base/allocator.h"
 #include "base/bit_vector-inl.h"
-#include "base/enums.h"
 #include "base/file_magic.h"
 #include "base/file_utils.h"
 #include "base/indenter.h"
 #include "base/logging.h"  // For VLOG
 #include "base/os.h"
+#include "base/pointer_size.h"
 #include "base/safe_map.h"
 #include "base/stl_util.h"
 #include "base/unix_file/fd_file.h"
diff --git a/dex2oat/linker/oat_writer_test.cc b/dex2oat/linker/oat_writer_test.cc
index d3a480fb56..c33528c63d 100644
--- a/dex2oat/linker/oat_writer_test.cc
+++ b/dex2oat/linker/oat_writer_test.cc
@@ -18,8 +18,8 @@
 
 #include "arch/instruction_set_features.h"
 #include "art_method-inl.h"
-#include "base/enums.h"
 #include "base/file_utils.h"
+#include "base/pointer_size.h"
 #include "base/stl_util.h"
 #include "base/unix_file/fd_file.h"
 #include "class_linker.h"
diff --git a/libartbase/Android.bp b/libartbase/Android.bp
index c1bfc560f8..03d336b2ca 100644
--- a/libartbase/Android.bp
+++ b/libartbase/Android.bp
@@ -34,7 +34,6 @@ cc_defaults {
         "base/arena_bit_vector.cc",
         "base/bit_vector.cc",
         "base/compiler_filter.cc",
-        "base/enums.cc",
         "base/file_magic.cc",
         "base/file_utils.cc",
         "base/flags.cc",
@@ -48,6 +47,7 @@ cc_defaults {
         // "base/mem_map_fuchsia.cc", put in target when fuchsia supported by soong
         "base/metrics/metrics_common.cc",
         "base/os_linux.cc",
+        "base/pointer_size.cc",
         "base/runtime_debug.cc",
         "base/scoped_arena_allocator.cc",
         "base/scoped_flock.cc",
diff --git a/libartbase/arch/instruction_set.h b/libartbase/arch/instruction_set.h
index 0e9ebf0535..c0d27c324f 100644
--- a/libartbase/arch/instruction_set.h
+++ b/libartbase/arch/instruction_set.h
@@ -21,8 +21,8 @@
 #include <string>
 #include <vector>
 
-#include "base/enums.h"
 #include "base/macros.h"
+#include "base/pointer_size.h"
 
 namespace art {
 
diff --git a/libartbase/arch/instruction_set_test.cc b/libartbase/arch/instruction_set_test.cc
index 26071f1d06..8e563dd1fc 100644
--- a/libartbase/arch/instruction_set_test.cc
+++ b/libartbase/arch/instruction_set_test.cc
@@ -18,7 +18,7 @@
 
 #include <gtest/gtest.h>
 
-#include "base/enums.h"
+#include "base/pointer_size.h"
 
 namespace art {
 
diff --git a/libartbase/base/memory_region.h b/libartbase/base/memory_region.h
index 8db7018836..6265762ffb 100644
--- a/libartbase/base/memory_region.h
+++ b/libartbase/base/memory_region.h
@@ -24,9 +24,9 @@
 
 #include "bit_utils.h"
 #include "casts.h"
-#include "enums.h"
 #include "globals.h"
 #include "macros.h"
+#include "pointer_size.h"
 #include "value_object.h"
 
 namespace art {
diff --git a/libartbase/base/enums.cc b/libartbase/base/pointer_size.cc
index 3f28232b41..cde78d27f6 100644
--- a/libartbase/base/enums.cc
+++ b/libartbase/base/pointer_size.cc
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-#include "enums.h"
+#include "pointer_size.h"
 
 #include <ostream>
 
diff --git a/libartbase/base/enums.h b/libartbase/base/pointer_size.h
index 6f4405d7b6..7bb6851eaf 100644
--- a/libartbase/base/enums.h
+++ b/libartbase/base/pointer_size.h
@@ -14,8 +14,8 @@
  * limitations under the License.
  */
 
-#ifndef ART_LIBARTBASE_BASE_ENUMS_H_
-#define ART_LIBARTBASE_BASE_ENUMS_H_
+#ifndef ART_LIBARTBASE_BASE_POINTER_SIZE_H_
+#define ART_LIBARTBASE_BASE_POINTER_SIZE_H_
 
 #include <cstddef>
 #include <cstdint>
@@ -36,4 +36,4 @@ static constexpr PointerSize kRuntimePointerSize = sizeof(void*) == 8U
 
 }  // namespace art
 
-#endif  // ART_LIBARTBASE_BASE_ENUMS_H_
+#endif  // ART_LIBARTBASE_BASE_POINTER_SIZE_H_
diff --git a/libartbase/base/utils.h b/libartbase/base/utils.h
index b21401a589..fb91f26279 100644
--- a/libartbase/base/utils.h
+++ b/libartbase/base/utils.h
@@ -27,9 +27,9 @@
 #include <android-base/parseint.h>
 
 #include "casts.h"
-#include "enums.h"
 #include "globals.h"
 #include "macros.h"
+#include "pointer_size.h"
 
 #if defined(__linux__)
 #include <sys/utsname.h>
diff --git a/libdexfile/dex/dex_file.cc b/libdexfile/dex/dex_file.cc
index 464d0507cf..927adddfad 100644
--- a/libdexfile/dex/dex_file.cc
+++ b/libdexfile/dex/dex_file.cc
@@ -29,9 +29,9 @@
 #include <type_traits>
 
 #include "android-base/stringprintf.h"
-#include "base/enums.h"
 #include "base/hiddenapi_domain.h"
 #include "base/leb128.h"
+#include "base/pointer_size.h"
 #include "base/stl_util.h"
 #include "class_accessor-inl.h"
 #include "compact_dex_file.h"
diff --git a/openjdkjvmti/deopt_manager.cc b/openjdkjvmti/deopt_manager.cc
index 6583e82253..e3c92e3f01 100644
--- a/openjdkjvmti/deopt_manager.cc
+++ b/openjdkjvmti/deopt_manager.cc
@@ -37,8 +37,8 @@
 
 #include "art_jvmti.h"
 #include "art_method-inl.h"
-#include "base/enums.h"
 #include "base/mutex-inl.h"
+#include "base/pointer_size.h"
 #include "dex/dex_file_annotations.h"
 #include "dex/modifiers.h"
 #include "events-inl.h"
diff --git a/openjdkjvmti/ti_allocator.cc b/openjdkjvmti/ti_allocator.cc
index 1e6d4627b5..79d2af9d5d 100644
--- a/openjdkjvmti/ti_allocator.cc
+++ b/openjdkjvmti/ti_allocator.cc
@@ -41,7 +41,7 @@
 #include <atomic>
 
 #include "art_jvmti.h"
-#include "base/enums.h"
+#include "base/pointer_size.h"
 
 namespace openjdkjvmti {
 
diff --git a/openjdkjvmti/ti_breakpoint.cc b/openjdkjvmti/ti_breakpoint.cc
index 13d8db7818..fe53501014 100644
--- a/openjdkjvmti/ti_breakpoint.cc
+++ b/openjdkjvmti/ti_breakpoint.cc
@@ -35,8 +35,8 @@
 
 #include "art_jvmti.h"
 #include "art_method-inl.h"
-#include "base/enums.h"
 #include "base/mutex-inl.h"
+#include "base/pointer_size.h"
 #include "deopt_manager.h"
 #include "dex/dex_file_annotations.h"
 #include "dex/modifiers.h"
diff --git a/openjdkjvmti/ti_field.cc b/openjdkjvmti/ti_field.cc
index 4e39e22649..4ae9f47b45 100644
--- a/openjdkjvmti/ti_field.cc
+++ b/openjdkjvmti/ti_field.cc
@@ -36,7 +36,7 @@
 #include "art_field-inl.h"
 #include "art_field.h"
 #include "art_jvmti.h"
-#include "base/enums.h"
+#include "base/pointer_size.h"
 #include "base/locks.h"
 #include "dex/dex_file_annotations.h"
 #include "dex/modifiers.h"
diff --git a/openjdkjvmti/ti_method.cc b/openjdkjvmti/ti_method.cc
index a1f25c466b..0557234a46 100644
--- a/openjdkjvmti/ti_method.cc
+++ b/openjdkjvmti/ti_method.cc
@@ -39,10 +39,10 @@
 #include "arch/context.h"
 #include "art_jvmti.h"
 #include "art_method-inl.h"
-#include "base/enums.h"
 #include "base/globals.h"
 #include "base/macros.h"
 #include "base/mutex-inl.h"
+#include "base/pointer_size.h"
 #include "deopt_manager.h"
 #include "dex/code_item_accessors-inl.h"
 #include "dex/code_item_accessors.h"
diff --git a/openjdkjvmti/ti_redefine.cc b/openjdkjvmti/ti_redefine.cc
index 14a981b2cc..9be55e54e9 100644
--- a/openjdkjvmti/ti_redefine.cc
+++ b/openjdkjvmti/ti_redefine.cc
@@ -52,11 +52,11 @@
 #include "art_method.h"
 #include "base/array_ref.h"
 #include "base/casts.h"
-#include "base/enums.h"
 #include "base/globals.h"
 #include "base/iteration_range.h"
 #include "base/length_prefixed_array.h"
 #include "base/locks.h"
+#include "base/pointer_size.h"
 #include "base/stl_util.h"
 #include "base/utils.h"
 #include "class_linker-inl.h"
diff --git a/openjdkjvmti/ti_search.cc b/openjdkjvmti/ti_search.cc
index 2e98e0db9f..30a889aaa5 100644
--- a/openjdkjvmti/ti_search.cc
+++ b/openjdkjvmti/ti_search.cc
@@ -38,10 +38,10 @@
 
 #include "art_field-inl.h"
 #include "art_jvmti.h"
-#include "base/enums.h"
 #include "base/macros.h"
 #include "base/memfd.h"
 #include "base/os.h"
+#include "base/pointer_size.h"
 #include "base/unix_file/fd_file.h"
 #include "class_linker.h"
 #include "dex/art_dex_file_loader.h"
diff --git a/openjdkjvmti/ti_stack.cc b/openjdkjvmti/ti_stack.cc
index a56081408a..6e899291ff 100644
--- a/openjdkjvmti/ti_stack.cc
+++ b/openjdkjvmti/ti_stack.cc
@@ -45,10 +45,10 @@
 #include "art_method-inl.h"
 #include "barrier.h"
 #include "base/bit_utils.h"
-#include "base/enums.h"
 #include "base/locks.h"
 #include "base/macros.h"
 #include "base/mutex.h"
+#include "base/pointer_size.h"
 #include "deopt_manager.h"
 #include "dex/code_item_accessors-inl.h"
 #include "dex/dex_file.h"
diff --git a/runtime/arch/arm/callee_save_frame_arm.h b/runtime/arch/arm/callee_save_frame_arm.h
index a569942c1a..7e0ff66118 100644
--- a/runtime/arch/arm/callee_save_frame_arm.h
+++ b/runtime/arch/arm/callee_save_frame_arm.h
@@ -20,8 +20,8 @@
 #include "arch/instruction_set.h"
 #include "base/bit_utils.h"
 #include "base/callee_save_type.h"
-#include "base/enums.h"
 #include "base/macros.h"
+#include "base/pointer_size.h"
 #include "quick/quick_method_frame_info.h"
 #include "registers_arm.h"
 #include "runtime_globals.h"
diff --git a/runtime/arch/arm/fault_handler_arm.cc b/runtime/arch/arm/fault_handler_arm.cc
index de5c28b2cd..017ee974a0 100644
--- a/runtime/arch/arm/fault_handler_arm.cc
+++ b/runtime/arch/arm/fault_handler_arm.cc
@@ -20,10 +20,10 @@
 
 #include "arch/instruction_set.h"
 #include "art_method.h"
-#include "base/enums.h"
 #include "base/hex_dump.h"
 #include "base/logging.h"  // For VLOG.
 #include "base/macros.h"
+#include "base/pointer_size.h"
 #include "runtime_globals.h"
 #include "thread-current-inl.h"
 
diff --git a/runtime/arch/arm/thread_arm.cc b/runtime/arch/arm/thread_arm.cc
index 82d287c444..9c46cd0c43 100644
--- a/runtime/arch/arm/thread_arm.cc
+++ b/runtime/arch/arm/thread_arm.cc
@@ -19,7 +19,7 @@
 #include <android-base/logging.h>
 
 #include "asm_support_arm.h"
-#include "base/enums.h"
+#include "base/pointer_size.h"
 
 namespace art HIDDEN {
 
diff --git a/runtime/arch/arm64/callee_save_frame_arm64.h b/runtime/arch/arm64/callee_save_frame_arm64.h
index e01df3bf93..95aaf42b26 100644
--- a/runtime/arch/arm64/callee_save_frame_arm64.h
+++ b/runtime/arch/arm64/callee_save_frame_arm64.h
@@ -20,8 +20,8 @@
 #include "arch/instruction_set.h"
 #include "base/bit_utils.h"
 #include "base/callee_save_type.h"
-#include "base/enums.h"
 #include "base/macros.h"
+#include "base/pointer_size.h"
 #include "quick/quick_method_frame_info.h"
 #include "registers_arm64.h"
 #include "runtime_globals.h"
diff --git a/runtime/arch/arm64/fault_handler_arm64.cc b/runtime/arch/arm64/fault_handler_arm64.cc
index 932d6740e8..a09872a4bb 100644
--- a/runtime/arch/arm64/fault_handler_arm64.cc
+++ b/runtime/arch/arm64/fault_handler_arm64.cc
@@ -20,10 +20,10 @@
 
 #include "arch/instruction_set.h"
 #include "art_method.h"
-#include "base/enums.h"
 #include "base/hex_dump.h"
 #include "base/logging.h"  // For VLOG.
 #include "base/macros.h"
+#include "base/pointer_size.h"
 #include "registers_arm64.h"
 #include "runtime_globals.h"
 #include "thread-current-inl.h"
diff --git a/runtime/arch/arm64/thread_arm64.cc b/runtime/arch/arm64/thread_arm64.cc
index ab9ef16959..cddc96fe60 100644
--- a/runtime/arch/arm64/thread_arm64.cc
+++ b/runtime/arch/arm64/thread_arm64.cc
@@ -19,7 +19,7 @@
 #include <android-base/logging.h>
 
 #include "asm_support_arm64.h"
-#include "base/enums.h"
+#include "base/pointer_size.h"
 
 namespace art HIDDEN {
 
diff --git a/runtime/arch/riscv64/callee_save_frame_riscv64.h b/runtime/arch/riscv64/callee_save_frame_riscv64.h
index 6a2a1678e2..21fc88378f 100644
--- a/runtime/arch/riscv64/callee_save_frame_riscv64.h
+++ b/runtime/arch/riscv64/callee_save_frame_riscv64.h
@@ -20,8 +20,8 @@
 #include "arch/instruction_set.h"
 #include "base/bit_utils.h"
 #include "base/callee_save_type.h"
-#include "base/enums.h"
 #include "base/macros.h"
+#include "base/pointer_size.h"
 #include "quick/quick_method_frame_info.h"
 #include "registers_riscv64.h"
 #include "runtime_globals.h"
diff --git a/runtime/arch/riscv64/thread_riscv64.cc b/runtime/arch/riscv64/thread_riscv64.cc
index 2865aed95d..a93ef8bbdd 100644
--- a/runtime/arch/riscv64/thread_riscv64.cc
+++ b/runtime/arch/riscv64/thread_riscv64.cc
@@ -15,7 +15,7 @@
  */
 
 #include "asm_support_riscv64.h"
-#include "base/enums.h"
+#include "base/pointer_size.h"
 #include "thread.h"
 
 namespace art HIDDEN {
diff --git a/runtime/arch/stub_test.cc b/runtime/arch/stub_test.cc
index d6d1065735..95d21e0eb7 100644
--- a/runtime/arch/stub_test.cc
+++ b/runtime/arch/stub_test.cc
@@ -19,7 +19,7 @@
 #include "art_field-inl.h"
 #include "art_method-inl.h"
 #include "base/callee_save_type.h"
-#include "base/enums.h"
+#include "base/pointer_size.h"
 #include "class_linker-inl.h"
 #include "class_root-inl.h"
 #include "common_runtime_test.h"
diff --git a/runtime/arch/x86/callee_save_frame_x86.h b/runtime/arch/x86/callee_save_frame_x86.h
index 81df066194..2f45153784 100644
--- a/runtime/arch/x86/callee_save_frame_x86.h
+++ b/runtime/arch/x86/callee_save_frame_x86.h
@@ -20,8 +20,8 @@
 #include "arch/instruction_set.h"
 #include "base/bit_utils.h"
 #include "base/callee_save_type.h"
-#include "base/enums.h"
 #include "base/macros.h"
+#include "base/pointer_size.h"
 #include "quick/quick_method_frame_info.h"
 #include "registers_x86.h"
 #include "runtime_globals.h"
diff --git a/runtime/arch/x86/fault_handler_x86.cc b/runtime/arch/x86/fault_handler_x86.cc
index 83214664f3..a392b54839 100644
--- a/runtime/arch/x86/fault_handler_x86.cc
+++ b/runtime/arch/x86/fault_handler_x86.cc
@@ -20,10 +20,10 @@
 
 #include "arch/instruction_set.h"
 #include "art_method.h"
-#include "base/enums.h"
 #include "base/hex_dump.h"
 #include "base/logging.h"  // For VLOG.
 #include "base/macros.h"
+#include "base/pointer_size.h"
 #include "oat/oat_quick_method_header.h"
 #include "runtime_globals.h"
 #include "thread-current-inl.h"
diff --git a/runtime/arch/x86/thread_x86.cc b/runtime/arch/x86/thread_x86.cc
index ab49a32898..f8809f207d 100644
--- a/runtime/arch/x86/thread_x86.cc
+++ b/runtime/arch/x86/thread_x86.cc
@@ -20,8 +20,8 @@
 #include <sys/types.h>
 
 #include "asm_support_x86.h"
-#include "base/enums.h"
 #include "base/macros.h"
+#include "base/pointer_size.h"
 #include "thread-current-inl.h"
 #include "thread_list.h"
 
diff --git a/runtime/arch/x86_64/callee_save_frame_x86_64.h b/runtime/arch/x86_64/callee_save_frame_x86_64.h
index 4865461de9..c8a34793ab 100644
--- a/runtime/arch/x86_64/callee_save_frame_x86_64.h
+++ b/runtime/arch/x86_64/callee_save_frame_x86_64.h
@@ -20,8 +20,8 @@
 #include "arch/instruction_set.h"
 #include "base/bit_utils.h"
 #include "base/callee_save_type.h"
-#include "base/enums.h"
 #include "base/macros.h"
+#include "base/pointer_size.h"
 #include "quick/quick_method_frame_info.h"
 #include "registers_x86_64.h"
 #include "runtime_globals.h"
diff --git a/runtime/art_method.cc b/runtime/art_method.cc
index 8ceda0177f..0d47d0abf1 100644
--- a/runtime/art_method.cc
+++ b/runtime/art_method.cc
@@ -23,7 +23,7 @@
 
 #include "arch/context.h"
 #include "art_method-inl.h"
-#include "base/enums.h"
+#include "base/pointer_size.h"
 #include "base/stl_util.h"
 #include "class_linker-inl.h"
 #include "class_root-inl.h"
diff --git a/runtime/art_method.h b/runtime/art_method.h
index dff49e247b..921b9993ab 100644
--- a/runtime/art_method.h
+++ b/runtime/art_method.h
@@ -26,9 +26,9 @@
 #include "base/array_ref.h"
 #include "base/bit_utils.h"
 #include "base/casts.h"
-#include "base/enums.h"
 #include "base/logging.h"
 #include "base/macros.h"
+#include "base/pointer_size.h"
 #include "base/runtime_debug.h"
 #include "dex/dex_file_structs.h"
 #include "dex/modifiers.h"
diff --git a/runtime/cha.h b/runtime/cha.h
index ffdf00a411..9406f03f01 100644
--- a/runtime/cha.h
+++ b/runtime/cha.h
@@ -20,9 +20,9 @@
 #include <unordered_map>
 #include <unordered_set>
 
-#include "base/enums.h"
 #include "base/locks.h"
 #include "base/macros.h"
+#include "base/pointer_size.h"
 #include "handle.h"
 #include "mirror/class.h"
 #include "oat/oat_quick_method_header.h"
diff --git a/runtime/class_linker.cc b/runtime/class_linker.cc
index 9b79bacbb7..4c1abedc99 100644
--- a/runtime/class_linker.cc
+++ b/runtime/class_linker.cc
@@ -41,7 +41,6 @@
 #include "base/arena_allocator.h"
 #include "base/arena_bit_vector.h"
 #include "base/casts.h"
-#include "base/enums.h"
 #include "base/file_utils.h"
 #include "base/hash_map.h"
 #include "base/hash_set.h"
@@ -52,6 +51,7 @@
 #include "base/metrics/metrics.h"
 #include "base/mutex-inl.h"
 #include "base/os.h"
+#include "base/pointer_size.h"
 #include "base/quasi_atomic.h"
 #include "base/scoped_arena_containers.h"
 #include "base/scoped_flock.h"
diff --git a/runtime/class_linker.h b/runtime/class_linker.h
index 73b3153c45..f964a5573c 100644
--- a/runtime/class_linker.h
+++ b/runtime/class_linker.h
@@ -27,12 +27,12 @@
 #include <vector>
 
 #include "base/array_ref.h"
-#include "base/enums.h"
 #include "base/hash_map.h"
 #include "base/intrusive_forward_list.h"
 #include "base/locks.h"
 #include "base/macros.h"
 #include "base/mutex.h"
+#include "base/pointer_size.h"
 #include "dex/class_accessor.h"
 #include "dex/dex_file_types.h"
 #include "gc_root.h"
diff --git a/runtime/class_linker_test.cc b/runtime/class_linker_test.cc
index 97f79b7af7..df669169e0 100644
--- a/runtime/class_linker_test.cc
+++ b/runtime/class_linker_test.cc
@@ -24,7 +24,7 @@
 
 #include "art_field-inl.h"
 #include "art_method-inl.h"
-#include "base/enums.h"
+#include "base/pointer_size.h"
 #include "class_linker-inl.h"
 #include "class_root-inl.h"
 #include "common_runtime_test.h"
diff --git a/runtime/debugger.cc b/runtime/debugger.cc
index 673379ce66..1f799b4cbb 100644
--- a/runtime/debugger.cc
+++ b/runtime/debugger.cc
@@ -30,9 +30,9 @@
 #include "art_field-inl.h"
 #include "art_method-inl.h"
 #include "base/endian_utils.h"
-#include "base/enums.h"
 #include "base/logging.h"
 #include "base/memory_tool.h"
+#include "base/pointer_size.h"
 #include "base/safe_map.h"
 #include "base/strlcpy.h"
 #include "base/time_utils.h"
diff --git a/runtime/entrypoints/entrypoint_utils-inl.h b/runtime/entrypoints/entrypoint_utils-inl.h
index c87aa763ec..6cda30ee9d 100644
--- a/runtime/entrypoints/entrypoint_utils-inl.h
+++ b/runtime/entrypoints/entrypoint_utils-inl.h
@@ -23,7 +23,7 @@
 
 #include "art_field-inl.h"
 #include "art_method-inl.h"
-#include "base/enums.h"
+#include "base/pointer_size.h"
 #include "base/sdk_version.h"
 #include "class_linker-inl.h"
 #include "common_throws.h"
diff --git a/runtime/entrypoints/entrypoint_utils.cc b/runtime/entrypoints/entrypoint_utils.cc
index fb29a66232..8e20974111 100644
--- a/runtime/entrypoints/entrypoint_utils.cc
+++ b/runtime/entrypoints/entrypoint_utils.cc
@@ -18,8 +18,8 @@
 
 #include "art_field-inl.h"
 #include "art_method-inl.h"
-#include "base/enums.h"
 #include "base/mutex.h"
+#include "base/pointer_size.h"
 #include "base/sdk_version.h"
 #include "class_linker-inl.h"
 #include "class_root-inl.h"
diff --git a/runtime/entrypoints/quick/callee_save_frame.h b/runtime/entrypoints/quick/callee_save_frame.h
index 81219234b8..1049e235ec 100644
--- a/runtime/entrypoints/quick/callee_save_frame.h
+++ b/runtime/entrypoints/quick/callee_save_frame.h
@@ -19,8 +19,8 @@
 
 #include "arch/instruction_set.h"
 #include "base/callee_save_type.h"
-#include "base/enums.h"
 #include "base/locks.h"
+#include "base/pointer_size.h"
 #include "quick/quick_method_frame_info.h"
 #include "thread-inl.h"
 
diff --git a/runtime/entrypoints/quick/quick_alloc_entrypoints.cc b/runtime/entrypoints/quick/quick_alloc_entrypoints.cc
index 82595ed636..5b5527c054 100644
--- a/runtime/entrypoints/quick/quick_alloc_entrypoints.cc
+++ b/runtime/entrypoints/quick/quick_alloc_entrypoints.cc
@@ -17,7 +17,7 @@
 #include "entrypoints/quick/quick_alloc_entrypoints.h"
 
 #include "art_method-inl.h"
-#include "base/enums.h"
+#include "base/pointer_size.h"
 #include "base/quasi_atomic.h"
 #include "callee_save_frame.h"
 #include "dex/dex_file_types.h"
diff --git a/runtime/entrypoints/quick/quick_trampoline_entrypoints.cc b/runtime/entrypoints/quick/quick_trampoline_entrypoints.cc
index cf09256f42..b53339acd9 100644
--- a/runtime/entrypoints/quick/quick_trampoline_entrypoints.cc
+++ b/runtime/entrypoints/quick/quick_trampoline_entrypoints.cc
@@ -16,7 +16,7 @@
 
 #include "art_method-inl.h"
 #include "base/callee_save_type.h"
-#include "base/enums.h"
+#include "base/pointer_size.h"
 #include "callee_save_frame.h"
 #include "common_throws.h"
 #include "class_root-inl.h"
diff --git a/runtime/gc/allocation_record.cc b/runtime/gc/allocation_record.cc
index f98edf4aa8..59ec9f2d1b 100644
--- a/runtime/gc/allocation_record.cc
+++ b/runtime/gc/allocation_record.cc
@@ -17,8 +17,8 @@
 #include "allocation_record.h"
 
 #include "art_method-inl.h"
-#include "base/enums.h"
 #include "base/logging.h"  // For VLOG
+#include "base/pointer_size.h"
 #include "base/stl_util.h"
 #include "obj_ptr-inl.h"
 #include "object_callbacks.h"
diff --git a/runtime/gc/collector/concurrent_copying.cc b/runtime/gc/collector/concurrent_copying.cc
index 32a13f0797..d02701880b 100644
--- a/runtime/gc/collector/concurrent_copying.cc
+++ b/runtime/gc/collector/concurrent_copying.cc
@@ -18,9 +18,9 @@
 
 #include "art_field-inl.h"
 #include "barrier.h"
-#include "base/enums.h"
 #include "base/file_utils.h"
 #include "base/histogram-inl.h"
+#include "base/pointer_size.h"
 #include "base/quasi_atomic.h"
 #include "base/stl_util.h"
 #include "base/systrace.h"
diff --git a/runtime/gc/collector/immune_spaces_test.cc b/runtime/gc/collector/immune_spaces_test.cc
index 5bc3ac83b3..ee0feb8cbc 100644
--- a/runtime/gc/collector/immune_spaces_test.cc
+++ b/runtime/gc/collector/immune_spaces_test.cc
@@ -17,7 +17,7 @@
 #include <sys/mman.h>
 
 #include "base/common_art_test.h"
-#include "base/enums.h"
+#include "base/pointer_size.h"
 #include "base/utils.h"
 #include "gc/collector/immune_spaces.h"
 #include "gc/space/image_space.h"
diff --git a/runtime/gc/collector/mark_sweep.cc b/runtime/gc/collector/mark_sweep.cc
index 7c22247759..515f031964 100644
--- a/runtime/gc/collector/mark_sweep.cc
+++ b/runtime/gc/collector/mark_sweep.cc
@@ -23,11 +23,11 @@
 #include <vector>
 
 #include "base/bounded_fifo.h"
-#include "base/enums.h"
 #include "base/file_utils.h"
 #include "base/logging.h"  // For VLOG.
 #include "base/macros.h"
 #include "base/mutex-inl.h"
+#include "base/pointer_size.h"
 #include "base/systrace.h"
 #include "base/time_utils.h"
 #include "base/timing_logger.h"
diff --git a/runtime/gc/space/image_space.cc b/runtime/gc/space/image_space.cc
index 74e4a5c1ad..7f1bde2426 100644
--- a/runtime/gc/space/image_space.cc
+++ b/runtime/gc/space/image_space.cc
@@ -37,12 +37,12 @@
 #include "base/array_ref.h"
 #include "base/bit_memory_region.h"
 #include "base/callee_save_type.h"
-#include "base/enums.h"
 #include "base/file_utils.h"
 #include "base/globals.h"
 #include "base/macros.h"
 #include "base/memfd.h"
 #include "base/os.h"
+#include "base/pointer_size.h"
 #include "base/scoped_flock.h"
 #include "base/stl_util.h"
 #include "base/string_view_cpp20.h"
diff --git a/runtime/handle_scope.h b/runtime/handle_scope.h
index dbfd7744a5..2221b45ed7 100644
--- a/runtime/handle_scope.h
+++ b/runtime/handle_scope.h
@@ -21,9 +21,9 @@
 
 #include <android-base/logging.h>
 
-#include "base/enums.h"
 #include "base/locks.h"
 #include "base/macros.h"
+#include "base/pointer_size.h"
 #include "stack_reference.h"
 
 namespace art HIDDEN {
diff --git a/runtime/handle_scope_test.cc b/runtime/handle_scope_test.cc
index 3352c097c7..c27a372cca 100644
--- a/runtime/handle_scope_test.cc
+++ b/runtime/handle_scope_test.cc
@@ -16,7 +16,7 @@
 
 #include <type_traits>
 
-#include "base/enums.h"
+#include "base/pointer_size.h"
 #include "class_linker-inl.h"
 #include "common_runtime_test.h"
 #include "gtest/gtest.h"
diff --git a/runtime/imt_conflict_table.h b/runtime/imt_conflict_table.h
index b9a1d81e48..53f283b76e 100644
--- a/runtime/imt_conflict_table.h
+++ b/runtime/imt_conflict_table.h
@@ -20,8 +20,8 @@
 #include <cstddef>
 
 #include "base/casts.h"
-#include "base/enums.h"
 #include "base/macros.h"
+#include "base/pointer_size.h"
 
 namespace art HIDDEN {
 
diff --git a/runtime/imtable.h b/runtime/imtable.h
index 66150421e0..0d604ca244 100644
--- a/runtime/imtable.h
+++ b/runtime/imtable.h
@@ -19,9 +19,9 @@
 
 #include "base/bit_utils.h"
 #include "base/casts.h"
-#include "base/enums.h"
 #include "base/locks.h"
 #include "base/macros.h"
+#include "base/pointer_size.h"
 
 namespace art HIDDEN {
 
diff --git a/runtime/instrumentation.h b/runtime/instrumentation.h
index d578412c7e..35e7f13c08 100644
--- a/runtime/instrumentation.h
+++ b/runtime/instrumentation.h
@@ -27,9 +27,9 @@
 #include <unordered_set>
 
 #include "arch/instruction_set.h"
-#include "base/enums.h"
 #include "base/locks.h"
 #include "base/macros.h"
+#include "base/pointer_size.h"
 #include "base/safe_map.h"
 #include "gc_root.h"
 #include "jvalue.h"
diff --git a/runtime/instrumentation_test.cc b/runtime/instrumentation_test.cc
index ad14eb861c..664d3577be 100644
--- a/runtime/instrumentation_test.cc
+++ b/runtime/instrumentation_test.cc
@@ -18,7 +18,7 @@
 
 #include "android-base/macros.h"
 #include "art_method-inl.h"
-#include "base/enums.h"
+#include "base/pointer_size.h"
 #include "class_linker-inl.h"
 #include "common_runtime_test.h"
 #include "common_throws.h"
diff --git a/runtime/interpreter/interpreter_common.cc b/runtime/interpreter/interpreter_common.cc
index 2f2fdcc9e3..737e80b8ca 100644
--- a/runtime/interpreter/interpreter_common.cc
+++ b/runtime/interpreter/interpreter_common.cc
@@ -19,7 +19,7 @@
 #include <cmath>
 
 #include "base/casts.h"
-#include "base/enums.h"
+#include "base/pointer_size.h"
 #include "class_root-inl.h"
 #include "debugger.h"
 #include "dex/dex_file_types.h"
diff --git a/runtime/interpreter/interpreter_common.h b/runtime/interpreter/interpreter_common.h
index 0745a000e7..e6548ef82b 100644
--- a/runtime/interpreter/interpreter_common.h
+++ b/runtime/interpreter/interpreter_common.h
@@ -33,10 +33,10 @@
 
 #include "art_field-inl.h"
 #include "art_method-inl.h"
-#include "base/enums.h"
 #include "base/locks.h"
 #include "base/logging.h"
 #include "base/macros.h"
+#include "base/pointer_size.h"
 #include "class_linker-inl.h"
 #include "class_root-inl.h"
 #include "common_dex_operations.h"
diff --git a/runtime/interpreter/interpreter_switch_impl-inl.h b/runtime/interpreter/interpreter_switch_impl-inl.h
index db20f3951b..8b23715ba6 100644
--- a/runtime/interpreter/interpreter_switch_impl-inl.h
+++ b/runtime/interpreter/interpreter_switch_impl-inl.h
@@ -19,9 +19,9 @@
 
 #include "interpreter_switch_impl.h"
 
-#include "base/enums.h"
 #include "base/globals.h"
 #include "base/memory_tool.h"
+#include "base/pointer_size.h"
 #include "base/quasi_atomic.h"
 #include "dex/dex_file_types.h"
 #include "dex/dex_instruction_list.h"
diff --git a/runtime/interpreter/unstarted_runtime.cc b/runtime/interpreter/unstarted_runtime.cc
index 3b5bee80d7..7309391b32 100644
--- a/runtime/interpreter/unstarted_runtime.cc
+++ b/runtime/interpreter/unstarted_runtime.cc
@@ -30,10 +30,10 @@
 
 #include "art_method-inl.h"
 #include "base/casts.h"
-#include "base/enums.h"
 #include "base/hash_map.h"
 #include "base/macros.h"
 #include "base/os.h"
+#include "base/pointer_size.h"
 #include "base/quasi_atomic.h"
 #include "base/unix_file/fd_file.h"
 #include "base/zip_archive.h"
diff --git a/runtime/interpreter/unstarted_runtime_test.cc b/runtime/interpreter/unstarted_runtime_test.cc
index d58d42d843..494eb756a4 100644
--- a/runtime/interpreter/unstarted_runtime_test.cc
+++ b/runtime/interpreter/unstarted_runtime_test.cc
@@ -20,8 +20,8 @@
 #include <locale>
 
 #include "base/casts.h"
-#include "base/enums.h"
 #include "base/memory_tool.h"
+#include "base/pointer_size.h"
 #include "class_linker.h"
 #include "class_root-inl.h"
 #include "common_runtime_test.h"
diff --git a/runtime/jit/jit.cc b/runtime/jit/jit.cc
index 1bab55a93f..cb80b4151d 100644
--- a/runtime/jit/jit.cc
+++ b/runtime/jit/jit.cc
@@ -19,11 +19,11 @@
 #include <dlfcn.h>
 
 #include "art_method-inl.h"
-#include "base/enums.h"
 #include "base/file_utils.h"
 #include "base/logging.h"  // For VLOG.
 #include "base/memfd.h"
 #include "base/memory_tool.h"
+#include "base/pointer_size.h"
 #include "base/runtime_debug.h"
 #include "base/scoped_flock.h"
 #include "base/utils.h"
diff --git a/runtime/jit/jit_code_cache.cc b/runtime/jit/jit_code_cache.cc
index 3560ac17ff..6457cedb40 100644
--- a/runtime/jit/jit_code_cache.cc
+++ b/runtime/jit/jit_code_cache.cc
@@ -22,12 +22,12 @@
 
 #include "arch/context.h"
 #include "art_method-inl.h"
-#include "base/enums.h"
 #include "base/histogram-inl.h"
 #include "base/logging.h"  // For VLOG.
 #include "base/membarrier.h"
 #include "base/memfd.h"
 #include "base/mem_map.h"
+#include "base/pointer_size.h"
 #include "base/quasi_atomic.h"
 #include "base/stl_util.h"
 #include "base/systrace.h"
diff --git a/runtime/jit/profile_saver.cc b/runtime/jit/profile_saver.cc
index 759e946dce..bc199d7825 100644
--- a/runtime/jit/profile_saver.cc
+++ b/runtime/jit/profile_saver.cc
@@ -25,8 +25,8 @@
 #include "android-base/strings.h"
 #include "art_method-inl.h"
 #include "base/compiler_filter.h"
-#include "base/enums.h"
 #include "base/logging.h"  // For VLOG.
+#include "base/pointer_size.h"
 #include "base/scoped_arena_containers.h"
 #include "base/stl_util.h"
 #include "base/systrace.h"
diff --git a/runtime/jni/jni_id_manager.cc b/runtime/jni/jni_id_manager.cc
index c7c2733951..f295d29640 100644
--- a/runtime/jni/jni_id_manager.cc
+++ b/runtime/jni/jni_id_manager.cc
@@ -23,10 +23,10 @@
 #include "android-base/macros.h"
 #include "art_field-inl.h"
 #include "art_method-inl.h"
-#include "base/enums.h"
 #include "base/globals.h"
 #include "base/locks.h"
 #include "base/mutex.h"
+#include "base/pointer_size.h"
 #include "class_root-inl.h"
 #include "gc/allocation_listener.h"
 #include "gc/heap.h"
diff --git a/runtime/jni/jni_internal.cc b/runtime/jni/jni_internal.cc
index d6f7522c78..b98178507c 100644
--- a/runtime/jni/jni_internal.cc
+++ b/runtime/jni/jni_internal.cc
@@ -26,10 +26,10 @@
 #include "base/allocator.h"
 #include "base/atomic.h"
 #include "base/casts.h"
-#include "base/enums.h"
 #include "base/file_utils.h"
 #include "base/logging.h"  // For VLOG.
 #include "base/mutex.h"
+#include "base/pointer_size.h"
 #include "base/safe_map.h"
 #include "base/stl_util.h"
 #include "class_linker-inl.h"
diff --git a/runtime/mirror/array.h b/runtime/mirror/array.h
index b8724cca70..565faa90b1 100644
--- a/runtime/mirror/array.h
+++ b/runtime/mirror/array.h
@@ -18,8 +18,8 @@
 #define ART_RUNTIME_MIRROR_ARRAY_H_
 
 #include "base/bit_utils.h"
-#include "base/enums.h"
 #include "base/macros.h"
+#include "base/pointer_size.h"
 #include "obj_ptr.h"
 #include "object.h"
 
diff --git a/runtime/mirror/class.cc b/runtime/mirror/class.cc
index 3feb9d8c9b..7811302a13 100644
--- a/runtime/mirror/class.cc
+++ b/runtime/mirror/class.cc
@@ -25,8 +25,8 @@
 #include "array-inl.h"
 #include "art_field-inl.h"
 #include "art_method-inl.h"
-#include "base/enums.h"
 #include "base/logging.h"  // For VLOG.
+#include "base/pointer_size.h"
 #include "base/sdk_version.h"
 #include "base/utils.h"
 #include "class-inl.h"
diff --git a/runtime/mirror/class_ext-inl.h b/runtime/mirror/class_ext-inl.h
index 1fba26cd65..362d9abb5f 100644
--- a/runtime/mirror/class_ext-inl.h
+++ b/runtime/mirror/class_ext-inl.h
@@ -21,7 +21,7 @@
 
 #include "array-inl.h"
 #include "art_method-inl.h"
-#include "base/enums.h"
+#include "base/pointer_size.h"
 #include "base/globals.h"
 #include "class_linker.h"
 #include "handle_scope.h"
diff --git a/runtime/mirror/class_ext.cc b/runtime/mirror/class_ext.cc
index 4d915f71bb..d8cabd37b0 100644
--- a/runtime/mirror/class_ext.cc
+++ b/runtime/mirror/class_ext.cc
@@ -18,7 +18,7 @@
 
 #include "art_method-inl.h"
 #include "base/casts.h"
-#include "base/enums.h"
+#include "base/pointer_size.h"
 #include "base/utils.h"
 #include "class-alloc-inl.h"
 #include "class-inl.h"
diff --git a/runtime/mirror/dex_cache-inl.h b/runtime/mirror/dex_cache-inl.h
index 48a41e6b6a..d423a8edfb 100644
--- a/runtime/mirror/dex_cache-inl.h
+++ b/runtime/mirror/dex_cache-inl.h
@@ -25,7 +25,7 @@
 #include "art_method.h"
 #include "base/atomic_pair.h"
 #include "base/casts.h"
-#include "base/enums.h"
+#include "base/pointer_size.h"
 #include "class_linker.h"
 #include "dex/dex_file.h"
 #include "gc_root-inl.h"
diff --git a/runtime/mirror/field.h b/runtime/mirror/field.h
index dc5e911a9d..db7ec82861 100644
--- a/runtime/mirror/field.h
+++ b/runtime/mirror/field.h
@@ -18,8 +18,8 @@
 #define ART_RUNTIME_MIRROR_FIELD_H_
 
 #include "accessible_object.h"
-#include "base/enums.h"
 #include "base/macros.h"
+#include "base/pointer_size.h"
 #include "dex/modifiers.h"
 #include "dex/primitive.h"
 #include "obj_ptr.h"
diff --git a/runtime/mirror/object.h b/runtime/mirror/object.h
index f0b6a03eac..debac07aba 100644
--- a/runtime/mirror/object.h
+++ b/runtime/mirror/object.h
@@ -19,8 +19,8 @@
 
 #include "base/atomic.h"
 #include "base/casts.h"
-#include "base/enums.h"
 #include "base/macros.h"
+#include "base/pointer_size.h"
 #include "dex/primitive.h"
 #include "obj_ptr.h"
 #include "object_reference.h"
diff --git a/runtime/mirror/object_test.cc b/runtime/mirror/object_test.cc
index 88b99241ad..f879b805a9 100644
--- a/runtime/mirror/object_test.cc
+++ b/runtime/mirror/object_test.cc
@@ -25,7 +25,7 @@
 #include "art_field-inl.h"
 #include "art_method-inl.h"
 #include "asm_support.h"
-#include "base/enums.h"
+#include "base/pointer_size.h"
 #include "class-alloc-inl.h"
 #include "class-inl.h"
 #include "class_linker-inl.h"
diff --git a/runtime/mirror/reference.h b/runtime/mirror/reference.h
index 9df0fb36d6..3cba906a2a 100644
--- a/runtime/mirror/reference.h
+++ b/runtime/mirror/reference.h
@@ -17,9 +17,9 @@
 #ifndef ART_RUNTIME_MIRROR_REFERENCE_H_
 #define ART_RUNTIME_MIRROR_REFERENCE_H_
 
-#include "base/enums.h"
 #include "base/locks.h"
 #include "base/macros.h"
+#include "base/pointer_size.h"
 #include "obj_ptr.h"
 #include "object.h"
 #include "read_barrier_option.h"
diff --git a/runtime/mirror/throwable.cc b/runtime/mirror/throwable.cc
index 94567ef489..510aeed29a 100644
--- a/runtime/mirror/throwable.cc
+++ b/runtime/mirror/throwable.cc
@@ -19,7 +19,7 @@
 #include "android-base/stringprintf.h"
 
 #include "art_method-inl.h"
-#include "base/enums.h"
+#include "base/pointer_size.h"
 #include "base/utils.h"
 #include "class-inl.h"
 #include "class_root-inl.h"
diff --git a/runtime/native/dalvik_system_VMRuntime.cc b/runtime/native/dalvik_system_VMRuntime.cc
index 593b98dc80..1b7ed5cc08 100644
--- a/runtime/native/dalvik_system_VMRuntime.cc
+++ b/runtime/native/dalvik_system_VMRuntime.cc
@@ -32,7 +32,7 @@ extern "C" void android_set_application_target_sdk_version(uint32_t version);
 #include "android-base/properties.h"
 #include "arch/instruction_set.h"
 #include "art_method-inl.h"
-#include "base/enums.h"
+#include "base/pointer_size.h"
 #include "base/sdk_version.h"
 #include "class_linker-inl.h"
 #include "class_loader_context.h"
diff --git a/runtime/native/java_lang_Class.cc b/runtime/native/java_lang_Class.cc
index 1dc74e0db2..79c8176027 100644
--- a/runtime/native/java_lang_Class.cc
+++ b/runtime/native/java_lang_Class.cc
@@ -20,7 +20,7 @@
 
 #include "art_field-inl.h"
 #include "art_method-alloc-inl.h"
-#include "base/enums.h"
+#include "base/pointer_size.h"
 #include "class_linker-inl.h"
 #include "class_root-inl.h"
 #include "common_throws.h"
diff --git a/runtime/native/java_lang_reflect_Constructor.cc b/runtime/native/java_lang_reflect_Constructor.cc
index f9278ab0d6..bff5126b82 100644
--- a/runtime/native/java_lang_reflect_Constructor.cc
+++ b/runtime/native/java_lang_reflect_Constructor.cc
@@ -19,7 +19,7 @@
 #include "nativehelper/jni_macros.h"
 
 #include "art_method-inl.h"
-#include "base/enums.h"
+#include "base/pointer_size.h"
 #include "class_linker.h"
 #include "class_root-inl.h"
 #include "dex/dex_file_annotations.h"
diff --git a/runtime/native/java_lang_reflect_Method.cc b/runtime/native/java_lang_reflect_Method.cc
index 8cbc070eee..64b4b17d4c 100644
--- a/runtime/native/java_lang_reflect_Method.cc
+++ b/runtime/native/java_lang_reflect_Method.cc
@@ -19,7 +19,7 @@
 #include "nativehelper/jni_macros.h"
 
 #include "art_method-inl.h"
-#include "base/enums.h"
+#include "base/pointer_size.h"
 #include "class_linker-inl.h"
 #include "class_linker.h"
 #include "class_root-inl.h"
diff --git a/runtime/native_bridge_art_interface.cc b/runtime/native_bridge_art_interface.cc
index a081a2d7db..404d1f1ad6 100644
--- a/runtime/native_bridge_art_interface.cc
+++ b/runtime/native_bridge_art_interface.cc
@@ -21,9 +21,9 @@
 #include "nativebridge/native_bridge.h"
 
 #include "art_method-inl.h"
-#include "base/enums.h"
 #include "base/logging.h"  // For VLOG.
 #include "base/macros.h"
+#include "base/pointer_size.h"
 #include "dex/dex_file-inl.h"
 #include "jni/jni_internal.h"
 #include "mirror/class-inl.h"
diff --git a/runtime/oat/image.h b/runtime/oat/image.h
index a532ebe50c..c21961d127 100644
--- a/runtime/oat/image.h
+++ b/runtime/oat/image.h
@@ -19,10 +19,10 @@
 
 #include <string.h>
 
-#include "base/enums.h"
 #include "base/iteration_range.h"
 #include "base/macros.h"
 #include "base/os.h"
+#include "base/pointer_size.h"
 #include "base/unix_file/fd_file.h"
 #include "mirror/object.h"
 #include "runtime_globals.h"
diff --git a/runtime/oat/oat_file.cc b/runtime/oat/oat_file.cc
index 4e1c887faa..b024523828 100644
--- a/runtime/oat/oat_file.cc
+++ b/runtime/oat/oat_file.cc
@@ -41,11 +41,11 @@
 #include "arch/instruction_set_features.h"
 #include "art_method.h"
 #include "base/bit_vector.h"
-#include "base/enums.h"
 #include "base/file_utils.h"
 #include "base/logging.h"  // For VLOG_IS_ON.
 #include "base/mem_map.h"
 #include "base/os.h"
+#include "base/pointer_size.h"
 #include "base/stl_util.h"
 #include "base/string_view_cpp20.h"
 #include "base/systrace.h"
diff --git a/runtime/offsets.h b/runtime/offsets.h
index 17480519b4..afa4d35417 100644
--- a/runtime/offsets.h
+++ b/runtime/offsets.h
@@ -19,8 +19,8 @@
 
 #include <iosfwd>
 
-#include "base/enums.h"
 #include "base/macros.h"
+#include "base/pointer_size.h"
 #include "runtime_globals.h"
 
 namespace art HIDDEN {
diff --git a/runtime/proxy_test.cc b/runtime/proxy_test.cc
index c57b3d4470..d950675b14 100644
--- a/runtime/proxy_test.cc
+++ b/runtime/proxy_test.cc
@@ -18,7 +18,7 @@
 #include <vector>
 
 #include "art_field-inl.h"
-#include "base/enums.h"
+#include "base/pointer_size.h"
 #include "common_runtime_test.h"
 #include "mirror/field.h"
 #include "proxy_test.h"
diff --git a/runtime/quick_exception_handler.cc b/runtime/quick_exception_handler.cc
index cc276ca435..2ebcbb0fd0 100644
--- a/runtime/quick_exception_handler.cc
+++ b/runtime/quick_exception_handler.cc
@@ -23,9 +23,9 @@
 #include "arch/context.h"
 #include "art_method-inl.h"
 #include "base/array_ref.h"
-#include "base/enums.h"
 #include "base/globals.h"
 #include "base/logging.h"  // For VLOG_IS_ON.
+#include "base/pointer_size.h"
 #include "base/systrace.h"
 #include "dex/dex_file_types.h"
 #include "dex/dex_instruction.h"
diff --git a/runtime/reflection.cc b/runtime/reflection.cc
index c292f2a7f8..31dd8a4e0e 100644
--- a/runtime/reflection.cc
+++ b/runtime/reflection.cc
@@ -18,7 +18,7 @@
 
 #include "art_field-inl.h"
 #include "art_method-alloc-inl.h"
-#include "base/enums.h"
+#include "base/pointer_size.h"
 #include "class_linker.h"
 #include "common_throws.h"
 #include "dex/dex_file-inl.h"
diff --git a/runtime/reflection.h b/runtime/reflection.h
index 552762bfb0..7e95d5be83 100644
--- a/runtime/reflection.h
+++ b/runtime/reflection.h
@@ -17,9 +17,9 @@
 #ifndef ART_RUNTIME_REFLECTION_H_
 #define ART_RUNTIME_REFLECTION_H_
 
-#include "base/enums.h"
 #include "base/locks.h"
 #include "base/macros.h"
+#include "base/pointer_size.h"
 #include "dex/primitive.h"
 #include "jni.h"
 #include "obj_ptr.h"
diff --git a/runtime/reflection_test.cc b/runtime/reflection_test.cc
index d6b58c0954..d307ba0cca 100644
--- a/runtime/reflection_test.cc
+++ b/runtime/reflection_test.cc
@@ -20,7 +20,7 @@
 #include <limits.h>
 
 #include "art_method-inl.h"
-#include "base/enums.h"
+#include "base/pointer_size.h"
 #include "common_runtime_test.h"
 #include "dex/descriptors_names.h"
 #include "jni/java_vm_ext.h"
diff --git a/runtime/reflective_handle_scope.h b/runtime/reflective_handle_scope.h
index 1f10521144..d4570c30a0 100644
--- a/runtime/reflective_handle_scope.h
+++ b/runtime/reflective_handle_scope.h
@@ -25,10 +25,10 @@
 #include <stack>
 
 #include "android-base/macros.h"
-#include "base/enums.h"
 #include "base/globals.h"
 #include "base/locks.h"
 #include "base/macros.h"
+#include "base/pointer_size.h"
 #include "base/value_object.h"
 #include "reflective_handle.h"
 #include "reflective_reference.h"
diff --git a/runtime/reflective_value_visitor.h b/runtime/reflective_value_visitor.h
index db8fba6791..03d344340c 100644
--- a/runtime/reflective_value_visitor.h
+++ b/runtime/reflective_value_visitor.h
@@ -25,10 +25,10 @@
 #include <stack>
 
 #include "android-base/macros.h"
-#include "base/enums.h"
 #include "base/globals.h"
 #include "base/locks.h"
 #include "base/macros.h"
+#include "base/pointer_size.h"
 #include "base/value_object.h"
 #include "dex/dex_file.h"
 #include "jni.h"
diff --git a/runtime/runtime.cc b/runtime/runtime.cc
index 3601cb7268..6416199192 100644
--- a/runtime/runtime.cc
+++ b/runtime/runtime.cc
@@ -55,7 +55,6 @@
 #include "base/arena_allocator.h"
 #include "base/atomic.h"
 #include "base/dumpable.h"
-#include "base/enums.h"
 #include "base/file_utils.h"
 #include "base/flags.h"
 #include "base/malloc_arena_pool.h"
@@ -63,6 +62,7 @@
 #include "base/memory_tool.h"
 #include "base/mutex.h"
 #include "base/os.h"
+#include "base/pointer_size.h"
 #include "base/quasi_atomic.h"
 #include "base/sdk_version.h"
 #include "base/stl_util.h"
diff --git a/runtime/stack.cc b/runtime/stack.cc
index daf80d702e..bcc1da7d60 100644
--- a/runtime/stack.cc
+++ b/runtime/stack.cc
@@ -22,8 +22,8 @@
 #include "arch/context.h"
 #include "art_method-inl.h"
 #include "base/callee_save_type.h"
-#include "base/enums.h"
 #include "base/hex_dump.h"
+#include "base/pointer_size.h"
 #include "base/utils.h"
 #include "dex/dex_file_types.h"
 #include "entrypoints/entrypoint_utils-inl.h"
diff --git a/runtime/thread.h b/runtime/thread.h
index a823b93c66..943a7edff3 100644
--- a/runtime/thread.h
+++ b/runtime/thread.h
@@ -28,9 +28,9 @@
 #include "base/atomic.h"
 #include "base/bit_field.h"
 #include "base/bit_utils.h"
-#include "base/enums.h"
 #include "base/locks.h"
 #include "base/macros.h"
+#include "base/pointer_size.h"
 #include "base/safe_map.h"
 #include "base/value_object.h"
 #include "entrypoints/jni/jni_entrypoints.h"
diff --git a/runtime/trace.cc b/runtime/trace.cc
index 9c53ee97c0..bb65dda867 100644
--- a/runtime/trace.cc
+++ b/runtime/trace.cc
@@ -23,9 +23,9 @@
 #include "android-base/stringprintf.h"
 #include "art_method-inl.h"
 #include "base/casts.h"
-#include "base/enums.h"
 #include "base/leb128.h"
 #include "base/os.h"
+#include "base/pointer_size.h"
 #include "base/stl_util.h"
 #include "base/systrace.h"
 #include "base/time_utils.h"
diff --git a/runtime/verifier/class_verifier.cc b/runtime/verifier/class_verifier.cc
index d1b882f9f4..eea737608b 100644
--- a/runtime/verifier/class_verifier.cc
+++ b/runtime/verifier/class_verifier.cc
@@ -20,9 +20,9 @@
 #include <android-base/stringprintf.h>
 
 #include "art_method-inl.h"
-#include "base/enums.h"
 #include "base/locks.h"
 #include "base/logging.h"
+#include "base/pointer_size.h"
 #include "base/systrace.h"
 #include "base/utils.h"
 #include "class_linker.h"
diff --git a/runtime/verifier/method_verifier.cc b/runtime/verifier/method_verifier.cc
index fc5a57ed26..8de83f4dd6 100644
--- a/runtime/verifier/method_verifier.cc
+++ b/runtime/verifier/method_verifier.cc
@@ -23,11 +23,11 @@
 #include "art_field-inl.h"
 #include "art_method-inl.h"
 #include "base/aborting.h"
-#include "base/enums.h"
 #include "base/leb128.h"
 #include "base/indenter.h"
 #include "base/logging.h"  // For VLOG.
 #include "base/mutex-inl.h"
+#include "base/pointer_size.h"
 #include "base/sdk_version.h"
 #include "base/stl_util.h"
 #include "base/systrace.h"
diff --git a/runtime/well_known_classes.cc b/runtime/well_known_classes.cc
index 21aaf72d2e..cd2d8a4ea3 100644
--- a/runtime/well_known_classes.cc
+++ b/runtime/well_known_classes.cc
@@ -25,7 +25,7 @@
 
 #include "art_method-inl.h"
 #include "base/casts.h"
-#include "base/enums.h"
+#include "base/pointer_size.h"
 #include "class_linker.h"
 #include "class_root-inl.h"
 #include "entrypoints/quick/quick_entrypoints_enum.h"
diff --git a/test/497-inlining-and-class-loader/clear_dex_cache.cc b/test/497-inlining-and-class-loader/clear_dex_cache.cc
index ddbcef59c8..5cc4cfdd56 100644
--- a/test/497-inlining-and-class-loader/clear_dex_cache.cc
+++ b/test/497-inlining-and-class-loader/clear_dex_cache.cc
@@ -15,7 +15,7 @@
  */
 
 #include "art_method.h"
-#include "base/enums.h"
+#include "base/pointer_size.h"
 #include "jni.h"
 #include "mirror/array-inl.h"
 #include "mirror/class-inl.h"
diff --git a/test/566-polymorphic-inlining/polymorphic_inline.cc b/test/566-polymorphic-inlining/polymorphic_inline.cc
index d98ee5d746..6fd05ed40e 100644
--- a/test/566-polymorphic-inlining/polymorphic_inline.cc
+++ b/test/566-polymorphic-inlining/polymorphic_inline.cc
@@ -15,7 +15,7 @@
  */
 
 #include "art_method.h"
-#include "base/enums.h"
+#include "base/pointer_size.h"
 #include "jit/jit.h"
 #include "jit/jit_code_cache.h"
 #include "jit/profiling_info.h"
diff --git a/test/common/runtime_state.cc b/test/common/runtime_state.cc
index ed0cc3e1c4..d4bbba2a4f 100644
--- a/test/common/runtime_state.cc
+++ b/test/common/runtime_state.cc
@@ -20,7 +20,7 @@
 
 #include "art_field.h"
 #include "art_method-inl.h"
-#include "base/enums.h"
+#include "base/pointer_size.h"
 #include "common_throws.h"
 #include "dex/dex_file-inl.h"
 #include "dex/dex_file_types.h"
diff --git a/tools/cpp-define-generator/globals.def b/tools/cpp-define-generator/globals.def
index 459e5a8164..39c5d19f5a 100644
--- a/tools/cpp-define-generator/globals.def
+++ b/tools/cpp-define-generator/globals.def
@@ -17,7 +17,7 @@
 #if ASM_DEFINE_INCLUDE_DEPENDENCIES
 #include "base/bit_utils.h"
 #include "base/callee_save_type.h"
-#include "base/enums.h"
+#include "base/pointer_size.h"
 #include "base/globals.h"
 #include "dex/modifiers.h"
 #include "gc/accounting/card_table.h"