diff --git a/cmdline/cmdline_types.h b/cmdline/cmdline_types.h
index 48da755..1725154 100644
--- a/cmdline/cmdline_types.h
+++ b/cmdline/cmdline_types.h
@@ -24,11 +24,11 @@
 #include "detail/cmdline_debug_detail.h"
 #include "memory_representation.h"
 
+#include "android-base/logging.h"
 #include "android-base/strings.h"
 
 // Includes for the types that are being specialized
 #include <string>
-#include "base/logging.h"
 #include "base/time_utils.h"
 #include "experimental_flags.h"
 #include "gc/collector_type.h"
diff --git a/compiler/optimizing/inliner.cc b/compiler/optimizing/inliner.cc
index 45d9167..ec93222 100644
--- a/compiler/optimizing/inliner.cc
+++ b/compiler/optimizing/inliner.cc
@@ -18,6 +18,7 @@
 
 #include "art_method-inl.h"
 #include "base/enums.h"
+#include "base/logging.h"
 #include "builder.h"
 #include "class_linker.h"
 #include "class_root.h"
diff --git a/compiler/optimizing/instruction_builder.cc b/compiler/optimizing/instruction_builder.cc
index e9b5b5a..448fed9 100644
--- a/compiler/optimizing/instruction_builder.cc
+++ b/compiler/optimizing/instruction_builder.cc
@@ -19,6 +19,7 @@
 #include "art_method-inl.h"
 #include "base/arena_bit_vector.h"
 #include "base/bit_vector-inl.h"
+#include "base/logging.h"
 #include "block_builder.h"
 #include "class_linker-inl.h"
 #include "code_generator.h"
diff --git a/compiler/optimizing/nodes.cc b/compiler/optimizing/nodes.cc
index aad06b9..3f225f3 100644
--- a/compiler/optimizing/nodes.cc
+++ b/compiler/optimizing/nodes.cc
@@ -20,6 +20,7 @@
 #include "art_method-inl.h"
 #include "base/bit_utils.h"
 #include "base/bit_vector-inl.h"
+#include "base/logging.h"
 #include "base/stl_util.h"
 #include "class_linker-inl.h"
 #include "class_root.h"
diff --git a/compiler/optimizing/optimizing_compiler.cc b/compiler/optimizing/optimizing_compiler.cc
index 1db20fc..1d3fcf3 100644
--- a/compiler/optimizing/optimizing_compiler.cc
+++ b/compiler/optimizing/optimizing_compiler.cc
@@ -26,6 +26,7 @@
 #include "base/arena_allocator.h"
 #include "base/arena_containers.h"
 #include "base/dumpable.h"
+#include "base/logging.h"
 #include "base/macros.h"
 #include "base/mutex.h"
 #include "base/scoped_arena_allocator.h"
diff --git a/compiler/optimizing/optimizing_compiler_stats.h b/compiler/optimizing/optimizing_compiler_stats.h
index 1f4f6d5..ddd57f5 100644
--- a/compiler/optimizing/optimizing_compiler_stats.h
+++ b/compiler/optimizing/optimizing_compiler_stats.h
@@ -22,9 +22,10 @@
 #include <string>
 #include <type_traits>
 
+#include <android-base/logging.h>
+
 #include "base/atomic.h"
 #include "base/globals.h"
-#include "base/logging.h"  // For VLOG_IS_ON.
 
 namespace art {
 
diff --git a/compiler/optimizing/ssa_builder.cc b/compiler/optimizing/ssa_builder.cc
index 16c23c8..cef234a 100644
--- a/compiler/optimizing/ssa_builder.cc
+++ b/compiler/optimizing/ssa_builder.cc
@@ -18,6 +18,7 @@
 
 #include "base/arena_bit_vector.h"
 #include "base/bit_vector-inl.h"
+#include "base/logging.h"
 #include "data_type-inl.h"
 #include "dex/bytecode_utils.h"
 #include "mirror/class-inl.h"
diff --git a/libdexfile/dex/class_iterator.h b/libdexfile/dex/class_iterator.h
index 477c93b..8ed585b 100644
--- a/libdexfile/dex/class_iterator.h
+++ b/libdexfile/dex/class_iterator.h
@@ -17,7 +17,7 @@
 #ifndef ART_LIBDEXFILE_DEX_CLASS_ITERATOR_H_
 #define ART_LIBDEXFILE_DEX_CLASS_ITERATOR_H_
 
-#include "base/logging.h"
+#include <android-base/logging.h>
 
 namespace art {
 
diff --git a/libdexfile/dex/type_lookup_table.h b/libdexfile/dex/type_lookup_table.h
index 7005d34..5f002d1 100644
--- a/libdexfile/dex/type_lookup_table.h
+++ b/libdexfile/dex/type_lookup_table.h
@@ -17,7 +17,8 @@
 #ifndef ART_LIBDEXFILE_DEX_TYPE_LOOKUP_TABLE_H_
 #define ART_LIBDEXFILE_DEX_TYPE_LOOKUP_TABLE_H_
 
-#include "base/logging.h"
+#include <android-base/logging.h>
+
 #include "dex/dex_file_types.h"
 
 namespace art {
diff --git a/openjdkjvmti/ti_class_definition.cc b/openjdkjvmti/ti_class_definition.cc
index 2a56512..795a68a 100644
--- a/openjdkjvmti/ti_class_definition.cc
+++ b/openjdkjvmti/ti_class_definition.cc
@@ -32,6 +32,7 @@
 #include "ti_class_definition.h"
 
 #include "base/array_slice.h"
+#include "base/logging.h"
 #include "class_linker-inl.h"
 #include "class_root.h"
 #include "dex/dex_file.h"
diff --git a/openjdkjvmti/ti_logging.h b/openjdkjvmti/ti_logging.h
index 31b51bb..a1be090 100644
--- a/openjdkjvmti/ti_logging.h
+++ b/openjdkjvmti/ti_logging.h
@@ -37,8 +37,9 @@
 #include <ostream>
 #include <sstream>
 
-#include "base/logging.h"
-#include "base/macros.h"
+#include <android-base/logging.h>
+#include <android-base/macros.h>
+
 #include "base/mutex.h"
 #include "thread-current-inl.h"
 
diff --git a/openjdkjvmti/transform.cc b/openjdkjvmti/transform.cc
index 8bd10da..27f04b7 100644
--- a/openjdkjvmti/transform.cc
+++ b/openjdkjvmti/transform.cc
@@ -40,6 +40,7 @@
 #include "art_method.h"
 #include "base/array_ref.h"
 #include "base/globals.h"
+#include "base/logging.h"
 #include "base/mem_map.h"
 #include "class_linker.h"
 #include "dex/dex_file.h"
diff --git a/runtime/gc/space/region_space.cc b/runtime/gc/space/region_space.cc
index 2774e26..21cae93 100644
--- a/runtime/gc/space/region_space.cc
+++ b/runtime/gc/space/region_space.cc
@@ -17,6 +17,7 @@
 #include "bump_pointer_space-inl.h"
 #include "bump_pointer_space.h"
 #include "base/dumpable.h"
+#include "base/logging.h"
 #include "gc/accounting/read_barrier_table.h"
 #include "mirror/class-inl.h"
 #include "mirror/object-inl.h"
diff --git a/runtime/gc/verification.cc b/runtime/gc/verification.cc
index 47c54bd..8670a22 100644
--- a/runtime/gc/verification.cc
+++ b/runtime/gc/verification.cc
@@ -21,6 +21,7 @@
 
 #include "art_field-inl.h"
 #include "base/file_utils.h"
+#include "base/logging.h"
 #include "mirror/class-inl.h"
 #include "mirror/object-refvisitor-inl.h"
 
diff --git a/runtime/jdwp_provider.h b/runtime/jdwp_provider.h
index c4f1989..9579513 100644
--- a/runtime/jdwp_provider.h
+++ b/runtime/jdwp_provider.h
@@ -20,8 +20,6 @@
 #include <ios>
 
 #include "base/globals.h"
-#include "base/macros.h"
-#include "base/logging.h"
 
 namespace art {
 
diff --git a/runtime/runtime_options.h b/runtime/runtime_options.h
index 3f5e776..39b44e7 100644
--- a/runtime/runtime_options.h
+++ b/runtime/runtime_options.h
@@ -23,7 +23,6 @@
 #include <vector>
 
 #include "arch/instruction_set.h"
-#include "base/logging.h"
 #include "base/variant_map.h"
 #include "cmdline_types.h"  // TODO: don't need to include this file here
 #include "gc/collector_type.h"
diff --git a/runtime/ti/agent.cc b/runtime/ti/agent.cc
index 97c39bb..033c8ac 100644
--- a/runtime/ti/agent.cc
+++ b/runtime/ti/agent.cc
@@ -20,6 +20,7 @@
 #include "nativehelper/scoped_local_ref.h"
 #include "nativeloader/native_loader.h"
 
+#include "base/logging.h"
 #include "base/strlcpy.h"
 #include "jni/java_vm_ext.h"
 #include "runtime.h"
diff --git a/runtime/ti/agent.h b/runtime/ti/agent.h
index faf76a1..598c8ff 100644
--- a/runtime/ti/agent.h
+++ b/runtime/ti/agent.h
@@ -22,7 +22,8 @@
 
 #include <memory>
 
-#include "base/logging.h"
+#include <android-base/logging.h>
+#include <android-base/macros.h>
 
 namespace art {
 namespace ti {
diff --git a/test/137-cfi/cfi.cc b/test/137-cfi/cfi.cc
index 985d273..0cb220e 100644
--- a/test/137-cfi/cfi.cc
+++ b/test/137-cfi/cfi.cc
@@ -30,6 +30,7 @@
 #include <backtrace/Backtrace.h>
 
 #include "base/file_utils.h"
+#include "base/logging.h"
 #include "base/macros.h"
 #include "base/utils.h"
 #include "gc/heap.h"