diff --git a/benchmark/micro-native/micro_native.cc b/benchmark/micro-native/micro_native.cc
index d366d9d..dffbf3b 100644
--- a/benchmark/micro-native/micro_native.cc
+++ b/benchmark/micro-native/micro_native.cc
@@ -14,8 +14,8 @@
  * limitations under the License.
  */
 
-#include <stdio.h>
 #include <jni.h>
+#include <stdio.h>
 
 #ifndef NATIVE_METHOD
 #define NATIVE_METHOD(className, functionName, signature) \
diff --git a/cmdline/cmdline_parser.h b/cmdline/cmdline_parser.h
index 32480dd..804727b 100644
--- a/cmdline/cmdline_parser.h
+++ b/cmdline/cmdline_parser.h
@@ -19,20 +19,20 @@
 
 #define CMDLINE_NDEBUG 1  // Do not output any debugging information for parsing.
 
-#include "cmdline/detail/cmdline_parser_detail.h"
-#include "cmdline/detail/cmdline_parse_argument_detail.h"
 #include "cmdline/detail/cmdline_debug_detail.h"
+#include "cmdline/detail/cmdline_parse_argument_detail.h"
+#include "cmdline/detail/cmdline_parser_detail.h"
 
-#include "cmdline_type_parser.h"
-#include "token_range.h"
-#include "cmdline_types.h"
-#include "cmdline_result.h"
 #include "cmdline_parse_result.h"
+#include "cmdline_result.h"
+#include "cmdline_type_parser.h"
+#include "cmdline_types.h"
+#include "token_range.h"
 
 #include "runtime/base/variant_map.h"
 
-#include <vector>
 #include <memory>
+#include <vector>
 
 namespace art {
 // Build a parser for command line arguments with a small domain specific language.
diff --git a/cmdline/cmdline_parser_test.cc b/cmdline/cmdline_parser_test.cc
index d957869..3c4f376 100644
--- a/cmdline/cmdline_parser_test.cc
+++ b/cmdline/cmdline_parser_test.cc
@@ -15,14 +15,16 @@
  */
 
 #include "cmdline_parser.h"
-#include "runtime/runtime_options.h"
-#include "runtime/parsed_options.h"
 
-#include "utils.h"
 #include <numeric>
+
 #include "gtest/gtest.h"
+
 #include "runtime/experimental_flags.h"
+#include "runtime/parsed_options.h"
 #include "runtime/runtime.h"
+#include "runtime/runtime_options.h"
+#include "utils.h"
 
 #define EXPECT_NULL(expected) EXPECT_EQ(reinterpret_cast<const void*>(expected), \
                                         reinterpret_cast<void*>(nullptr));
diff --git a/cmdline/cmdline_types.h b/cmdline/cmdline_types.h
index 4de8a48..20c4a7e 100644
--- a/cmdline/cmdline_types.h
+++ b/cmdline/cmdline_types.h
@@ -20,9 +20,9 @@
 
 #include <list>
 
-#include "memory_representation.h"
-#include "detail/cmdline_debug_detail.h"
 #include "cmdline_type_parser.h"
+#include "detail/cmdline_debug_detail.h"
+#include "memory_representation.h"
 
 #include "android-base/strings.h"
 
diff --git a/cmdline/detail/cmdline_parse_argument_detail.h b/cmdline/detail/cmdline_parse_argument_detail.h
index da03c21..ceb6fa7 100644
--- a/cmdline/detail/cmdline_parse_argument_detail.h
+++ b/cmdline/detail/cmdline_parse_argument_detail.h
@@ -17,13 +17,13 @@
 #ifndef ART_CMDLINE_DETAIL_CMDLINE_PARSE_ARGUMENT_DETAIL_H_
 #define ART_CMDLINE_DETAIL_CMDLINE_PARSE_ARGUMENT_DETAIL_H_
 
-#include <type_traits>
 #include <assert.h>
-#include <functional>
-#include <vector>
 #include <algorithm>
-#include <numeric>
+#include <functional>
 #include <memory>
+#include <numeric>
+#include <type_traits>
+#include <vector>
 
 #include "android-base/strings.h"
 
diff --git a/cmdline/detail/cmdline_parser_detail.h b/cmdline/detail/cmdline_parser_detail.h
index 24dbca2..118628f 100644
--- a/cmdline/detail/cmdline_parser_detail.h
+++ b/cmdline/detail/cmdline_parser_detail.h
@@ -17,8 +17,8 @@
 #ifndef ART_CMDLINE_DETAIL_CMDLINE_PARSER_DETAIL_H_
 #define ART_CMDLINE_DETAIL_CMDLINE_PARSER_DETAIL_H_
 
-#include <string>
 #include <sstream>
+#include <string>
 #include <vector>
 
 namespace art {
diff --git a/cmdline/memory_representation.h b/cmdline/memory_representation.h
index 2619c31..8db68bc 100644
--- a/cmdline/memory_representation.h
+++ b/cmdline/memory_representation.h
@@ -17,9 +17,9 @@
 #ifndef ART_CMDLINE_MEMORY_REPRESENTATION_H_
 #define ART_CMDLINE_MEMORY_REPRESENTATION_H_
 
-#include <string>
 #include <assert.h>
 #include <ostream>
+#include <string>
 
 #include "base/bit_utils.h"
 
diff --git a/cmdline/token_range.h b/cmdline/token_range.h
index c22d6c8..642bb1d 100644
--- a/cmdline/token_range.h
+++ b/cmdline/token_range.h
@@ -18,10 +18,10 @@
 #define ART_CMDLINE_TOKEN_RANGE_H_
 
 #include <assert.h>
-#include <vector>
-#include <string>
 #include <algorithm>
 #include <memory>
+#include <string>
+#include <vector>
 
 #include "android-base/strings.h"
 
diff --git a/compiler/cfi_test.h b/compiler/cfi_test.h
index c754e55..5347e7f 100644
--- a/compiler/cfi_test.h
+++ b/compiler/cfi_test.h
@@ -17,9 +17,9 @@
 #ifndef ART_COMPILER_CFI_TEST_H_
 #define ART_COMPILER_CFI_TEST_H_
 
-#include <vector>
 #include <memory>
 #include <sstream>
+#include <vector>
 
 #include "arch/instruction_set.h"
 #include "base/enums.h"
diff --git a/compiler/common_compiler_test.cc b/compiler/common_compiler_test.cc
index 07bfe31..a9a718f 100644
--- a/compiler/common_compiler_test.cc
+++ b/compiler/common_compiler_test.cc
@@ -28,8 +28,8 @@
 #include "driver/compiler_driver.h"
 #include "driver/compiler_options.h"
 #include "interpreter/interpreter.h"
-#include "mirror/class_loader.h"
 #include "mirror/class-inl.h"
+#include "mirror/class_loader.h"
 #include "mirror/dex_cache.h"
 #include "mirror/object-inl.h"
 #include "oat_quick_method_header.h"
diff --git a/compiler/compiled_method.h b/compiler/compiled_method.h
index 761e9e1..97127f5 100644
--- a/compiler/compiled_method.h
+++ b/compiler/compiled_method.h
@@ -17,8 +17,8 @@
 #ifndef ART_COMPILER_COMPILED_METHOD_H_
 #define ART_COMPILER_COMPILED_METHOD_H_
 
-#include <memory>
 #include <iosfwd>
+#include <memory>
 #include <string>
 #include <vector>
 
diff --git a/compiler/compiler.h b/compiler/compiler.h
index ba89cb1..6c542c8 100644
--- a/compiler/compiler.h
+++ b/compiler/compiler.h
@@ -17,8 +17,8 @@
 #ifndef ART_COMPILER_COMPILER_H_
 #define ART_COMPILER_COMPILER_H_
 
-#include "dex_file.h"
 #include "base/mutex.h"
+#include "dex_file.h"
 #include "os.h"
 
 namespace art {
diff --git a/compiler/debug/dwarf/dwarf_test.h b/compiler/debug/dwarf/dwarf_test.h
index e2f0a65..e1f538d 100644
--- a/compiler/debug/dwarf/dwarf_test.h
+++ b/compiler/debug/dwarf/dwarf_test.h
@@ -17,13 +17,14 @@
 #ifndef ART_COMPILER_DEBUG_DWARF_DWARF_TEST_H_
 #define ART_COMPILER_DEBUG_DWARF_DWARF_TEST_H_
 
-#include <cstring>
 #include <dirent.h>
+#include <stdio.h>
+#include <sys/types.h>
+
+#include <cstring>
 #include <memory>
 #include <set>
-#include <stdio.h>
 #include <string>
-#include <sys/types.h>
 
 #include "base/unix_file/fd_file.h"
 #include "common_runtime_test.h"
diff --git a/compiler/dex/dex_to_dex_decompiler_test.cc b/compiler/dex/dex_to_dex_decompiler_test.cc
index 88426a3..7b56f3e 100644
--- a/compiler/dex/dex_to_dex_decompiler_test.cc
+++ b/compiler/dex/dex_to_dex_decompiler_test.cc
@@ -19,16 +19,16 @@
 #include "class_linker.h"
 #include "compiler/common_compiler_test.h"
 #include "compiler/compiled_method.h"
-#include "compiler/driver/compiler_options.h"
 #include "compiler/driver/compiler_driver.h"
+#include "compiler/driver/compiler_options.h"
 #include "compiler_callbacks.h"
 #include "dex_file.h"
 #include "handle_scope-inl.h"
-#include "verifier/method_verifier-inl.h"
 #include "mirror/class_loader.h"
 #include "runtime.h"
-#include "thread.h"
 #include "scoped_thread_state_change-inl.h"
+#include "thread.h"
+#include "verifier/method_verifier-inl.h"
 
 namespace art {
 
diff --git a/compiler/dex/inline_method_analyser.cc b/compiler/dex/inline_method_analyser.cc
index e5ff7fc..54ddc21 100644
--- a/compiler/dex/inline_method_analyser.cc
+++ b/compiler/dex/inline_method_analyser.cc
@@ -21,8 +21,8 @@
 #include "base/enums.h"
 #include "class_linker-inl.h"
 #include "dex_file-inl.h"
-#include "dex_instruction.h"
 #include "dex_instruction-inl.h"
+#include "dex_instruction.h"
 #include "dex_instruction_utils.h"
 #include "mirror/class-inl.h"
 #include "mirror/dex_cache-inl.h"
diff --git a/compiler/dex/quick_compiler_callbacks.cc b/compiler/dex/quick_compiler_callbacks.cc
index b1006b2..872f7ea 100644
--- a/compiler/dex/quick_compiler_callbacks.cc
+++ b/compiler/dex/quick_compiler_callbacks.cc
@@ -16,8 +16,8 @@
 
 #include "quick_compiler_callbacks.h"
 
-#include "verifier/method_verifier-inl.h"
 #include "verification_results.h"
+#include "verifier/method_verifier-inl.h"
 
 namespace art {
 
diff --git a/compiler/dex/verification_results.cc b/compiler/dex/verification_results.cc
index beb3439..e657e3b 100644
--- a/compiler/dex/verification_results.cc
+++ b/compiler/dex/verification_results.cc
@@ -22,8 +22,8 @@
 #include "driver/compiler_driver.h"
 #include "driver/compiler_options.h"
 #include "runtime.h"
-#include "thread.h"
 #include "thread-current-inl.h"
+#include "thread.h"
 #include "utils/atomic_dex_ref_map-inl.h"
 #include "verified_method.h"
 #include "verifier/method_verifier-inl.h"
diff --git a/compiler/driver/compiled_method_storage_test.cc b/compiler/driver/compiled_method_storage_test.cc
index bbd28b2..2ec2af5 100644
--- a/compiler/driver/compiled_method_storage_test.cc
+++ b/compiler/driver/compiled_method_storage_test.cc
@@ -14,9 +14,10 @@
  * limitations under the License.
  */
 
+#include "compiled_method_storage.h"
+
 #include <gtest/gtest.h>
 
-#include "compiled_method_storage.h"
 #include "compiled_method.h"
 #include "compiler_driver.h"
 #include "compiler_options.h"
diff --git a/compiler/driver/compiler_driver.cc b/compiler/driver/compiler_driver.cc
index dd58bc7..da375b6 100644
--- a/compiler/driver/compiler_driver.cc
+++ b/compiler/driver/compiler_driver.cc
@@ -16,9 +16,9 @@
 
 #include "compiler_driver.h"
 
+#include <unistd.h>
 #include <unordered_set>
 #include <vector>
-#include <unistd.h>
 
 #ifndef __APPLE__
 #include <malloc.h>  // For mallinfo
@@ -409,7 +409,7 @@
                          ClassName, MethodName, Signature) \
   SetupIntrinsic(soa.Self(), Intrinsics::k##Name, InvokeType, ClassName, MethodName, Signature);
 #include "intrinsics_list.h"
-INTRINSICS_LIST(SETUP_INTRINSICS)
+    INTRINSICS_LIST(SETUP_INTRINSICS)
 #undef INTRINSICS_LIST
 #undef SETUP_INTRINSICS
   }
diff --git a/compiler/driver/compiler_driver.h b/compiler/driver/compiler_driver.h
index 93234cb..ecaed83 100644
--- a/compiler/driver/compiler_driver.h
+++ b/compiler/driver/compiler_driver.h
@@ -32,8 +32,8 @@
 #include "dex_file.h"
 #include "dex_file_types.h"
 #include "driver/compiled_method_storage.h"
-#include "jit/profile_compilation_info.h"
 #include "invoke_type.h"
+#include "jit/profile_compilation_info.h"
 #include "method_reference.h"
 #include "mirror/class.h"  // For mirror::Class::Status.
 #include "os.h"
diff --git a/compiler/driver/compiler_driver_test.cc b/compiler/driver/compiler_driver_test.cc
index 5d1d972..10bfd97 100644
--- a/compiler/driver/compiler_driver_test.cc
+++ b/compiler/driver/compiler_driver_test.cc
@@ -26,13 +26,13 @@
 #include "dex_file.h"
 #include "dex_file_types.h"
 #include "gc/heap.h"
+#include "handle_scope-inl.h"
+#include "jit/profile_compilation_info.h"
 #include "mirror/class-inl.h"
 #include "mirror/class_loader.h"
 #include "mirror/dex_cache-inl.h"
-#include "mirror/object_array-inl.h"
 #include "mirror/object-inl.h"
-#include "handle_scope-inl.h"
-#include "jit/profile_compilation_info.h"
+#include "mirror/object_array-inl.h"
 #include "scoped_thread_state_change-inl.h"
 
 namespace art {
diff --git a/compiler/elf_writer_test.cc b/compiler/elf_writer_test.cc
index fa2d78d..984e9ee 100644
--- a/compiler/elf_writer_test.cc
+++ b/compiler/elf_writer_test.cc
@@ -18,9 +18,9 @@
 
 #include "base/unix_file/fd_file.h"
 #include "common_compiler_test.h"
+#include "elf_builder.h"
 #include "elf_file.h"
 #include "elf_file_impl.h"
-#include "elf_builder.h"
 #include "elf_writer_quick.h"
 #include "oat.h"
 #include "utils.h"
diff --git a/compiler/exception_test.cc b/compiler/exception_test.cc
index 0b3ca69..f759aa5 100644
--- a/compiler/exception_test.cc
+++ b/compiler/exception_test.cc
@@ -21,19 +21,19 @@
 #include "base/enums.h"
 #include "class_linker.h"
 #include "common_runtime_test.h"
-#include "dex_file.h"
 #include "dex_file-inl.h"
+#include "dex_file.h"
 #include "gtest/gtest.h"
+#include "handle_scope-inl.h"
 #include "leb128.h"
 #include "mirror/class-inl.h"
-#include "mirror/object_array-inl.h"
 #include "mirror/object-inl.h"
+#include "mirror/object_array-inl.h"
 #include "mirror/stack_trace_element.h"
 #include "oat_quick_method_header.h"
 #include "optimizing/stack_map_stream.h"
 #include "runtime-inl.h"
 #include "scoped_thread_state_change-inl.h"
-#include "handle_scope-inl.h"
 #include "thread.h"
 
 namespace art {
diff --git a/compiler/image_test.h b/compiler/image_test.h
index 6c3a89b..57d0987 100644
--- a/compiler/image_test.h
+++ b/compiler/image_test.h
@@ -28,8 +28,8 @@
 #include "art_method-inl.h"
 #include "base/unix_file/fd_file.h"
 #include "class_linker-inl.h"
-#include "compiler_callbacks.h"
 #include "common_compiler_test.h"
+#include "compiler_callbacks.h"
 #include "debug/method_debug_info.h"
 #include "dex/quick_compiler_callbacks.h"
 #include "driver/compiler_options.h"
diff --git a/compiler/image_writer.cc b/compiler/image_writer.cc
index 51730cf..318009c 100644
--- a/compiler/image_writer.cc
+++ b/compiler/image_writer.cc
@@ -16,9 +16,9 @@
 
 #include "image_writer.h"
 
-#include <sys/stat.h>
 #include <lz4.h>
 #include <lz4hc.h>
+#include <sys/stat.h>
 
 #include <memory>
 #include <numeric>
@@ -43,8 +43,8 @@
 #include "gc/accounting/heap_bitmap.h"
 #include "gc/accounting/space_bitmap-inl.h"
 #include "gc/collector/concurrent_copying.h"
-#include "gc/heap.h"
 #include "gc/heap-visit-objects-inl.h"
+#include "gc/heap.h"
 #include "gc/space/large_object_space.h"
 #include "gc/space/space-inl.h"
 #include "gc/verification.h"
@@ -59,8 +59,8 @@
 #include "mirror/class-inl.h"
 #include "mirror/class_ext.h"
 #include "mirror/class_loader.h"
-#include "mirror/dex_cache.h"
 #include "mirror/dex_cache-inl.h"
+#include "mirror/dex_cache.h"
 #include "mirror/executable.h"
 #include "mirror/method.h"
 #include "mirror/object-inl.h"
diff --git a/compiler/image_writer.h b/compiler/image_writer.h
index ee6fc1d..34bbbad 100644
--- a/compiler/image_writer.h
+++ b/compiler/image_writer.h
@@ -22,10 +22,10 @@
 
 #include <cstddef>
 #include <memory>
+#include <ostream>
 #include <set>
 #include <stack>
 #include <string>
-#include <ostream>
 
 #include "art_method.h"
 #include "base/bit_utils.h"
@@ -40,8 +40,8 @@
 #include "lock_word.h"
 #include "mem_map.h"
 #include "mirror/dex_cache.h"
-#include "obj_ptr.h"
 #include "oat_file.h"
+#include "obj_ptr.h"
 #include "os.h"
 #include "safe_map.h"
 #include "utils.h"
diff --git a/compiler/jit/jit_compiler.h b/compiler/jit/jit_compiler.h
index f0f24d3..1e1838e 100644
--- a/compiler/jit/jit_compiler.h
+++ b/compiler/jit/jit_compiler.h
@@ -19,9 +19,9 @@
 
 #include "base/mutex.h"
 #include "compiled_method.h"
-#include "jit_logger.h"
 #include "driver/compiler_driver.h"
 #include "driver/compiler_options.h"
+#include "jit_logger.h"
 
 namespace art {
 
diff --git a/compiler/jni/quick/arm/calling_convention_arm.cc b/compiler/jni/quick/arm/calling_convention_arm.cc
index 3f29ae5..7e1ad9f 100644
--- a/compiler/jni/quick/arm/calling_convention_arm.cc
+++ b/compiler/jni/quick/arm/calling_convention_arm.cc
@@ -14,8 +14,9 @@
  * limitations under the License.
  */
 
-#include "base/logging.h"
 #include "calling_convention_arm.h"
+
+#include "base/logging.h"
 #include "handle_scope-inl.h"
 #include "utils/arm/managed_register_arm.h"
 
diff --git a/compiler/jni/quick/arm64/calling_convention_arm64.cc b/compiler/jni/quick/arm64/calling_convention_arm64.cc
index e086455..292ce10 100644
--- a/compiler/jni/quick/arm64/calling_convention_arm64.cc
+++ b/compiler/jni/quick/arm64/calling_convention_arm64.cc
@@ -14,8 +14,9 @@
  * limitations under the License.
  */
 
-#include "base/logging.h"
 #include "calling_convention_arm64.h"
+
+#include "base/logging.h"
 #include "handle_scope-inl.h"
 #include "utils/arm64/managed_register_arm64.h"
 
diff --git a/compiler/jni/quick/jni_compiler.cc b/compiler/jni/quick/jni_compiler.cc
index 68ec7bd..b65b93f 100644
--- a/compiler/jni/quick/jni_compiler.cc
+++ b/compiler/jni/quick/jni_compiler.cc
@@ -17,36 +17,36 @@
 #include "jni_compiler.h"
 
 #include <algorithm>
+#include <fstream>
 #include <ios>
 #include <memory>
 #include <vector>
-#include <fstream>
 
 #include "art_method.h"
 #include "base/arena_allocator.h"
 #include "base/enums.h"
 #include "base/logging.h"
 #include "base/macros.h"
-#include "memory_region.h"
 #include "calling_convention.h"
 #include "class_linker.h"
 #include "compiled_method.h"
+#include "debug/dwarf/debug_frame_opcode_writer.h"
 #include "dex_file-inl.h"
 #include "driver/compiler_driver.h"
 #include "driver/compiler_options.h"
 #include "entrypoints/quick/quick_entrypoints.h"
 #include "jni_env_ext.h"
-#include "debug/dwarf/debug_frame_opcode_writer.h"
+#include "memory_region.h"
+#include "thread.h"
+#include "utils.h"
+#include "utils/arm/managed_register_arm.h"
+#include "utils/arm64/managed_register_arm64.h"
 #include "utils/assembler.h"
 #include "utils/jni_macro_assembler.h"
 #include "utils/managed_register.h"
-#include "utils/arm/managed_register_arm.h"
-#include "utils/arm64/managed_register_arm64.h"
 #include "utils/mips/managed_register_mips.h"
 #include "utils/mips64/managed_register_mips64.h"
 #include "utils/x86/managed_register_x86.h"
-#include "utils.h"
-#include "thread.h"
 
 #define __ jni_asm->
 
diff --git a/compiler/linker/arm/relative_patcher_thumb2.cc b/compiler/linker/arm/relative_patcher_thumb2.cc
index 18d6b9a..2ac2a1d 100644
--- a/compiler/linker/arm/relative_patcher_thumb2.cc
+++ b/compiler/linker/arm/relative_patcher_thumb2.cc
@@ -22,8 +22,8 @@
 #include "compiled_method.h"
 #include "entrypoints/quick/quick_entrypoints_enum.h"
 #include "lock_word.h"
-#include "mirror/object.h"
 #include "mirror/array-inl.h"
+#include "mirror/object.h"
 #include "read_barrier.h"
 #include "utils/arm/assembler_arm_vixl.h"
 
diff --git a/compiler/linker/arm/relative_patcher_thumb2_test.cc b/compiler/linker/arm/relative_patcher_thumb2_test.cc
index 52e27af..fe76dfe 100644
--- a/compiler/linker/arm/relative_patcher_thumb2_test.cc
+++ b/compiler/linker/arm/relative_patcher_thumb2_test.cc
@@ -14,9 +14,10 @@
  * limitations under the License.
  */
 
+#include "linker/arm/relative_patcher_thumb2.h"
+
 #include "base/casts.h"
 #include "linker/relative_patcher_test.h"
-#include "linker/arm/relative_patcher_thumb2.h"
 #include "lock_word.h"
 #include "mirror/array-inl.h"
 #include "mirror/object.h"
diff --git a/compiler/linker/arm64/relative_patcher_arm64.cc b/compiler/linker/arm64/relative_patcher_arm64.cc
index 38c732b..db829f3 100644
--- a/compiler/linker/arm64/relative_patcher_arm64.cc
+++ b/compiler/linker/arm64/relative_patcher_arm64.cc
@@ -25,8 +25,8 @@
 #include "entrypoints/quick/quick_entrypoints_enum.h"
 #include "linker/output_stream.h"
 #include "lock_word.h"
-#include "mirror/object.h"
 #include "mirror/array-inl.h"
+#include "mirror/object.h"
 #include "oat.h"
 #include "oat_quick_method_header.h"
 #include "read_barrier.h"
diff --git a/compiler/linker/arm64/relative_patcher_arm64_test.cc b/compiler/linker/arm64/relative_patcher_arm64_test.cc
index 5d02d44..d6919e9 100644
--- a/compiler/linker/arm64/relative_patcher_arm64_test.cc
+++ b/compiler/linker/arm64/relative_patcher_arm64_test.cc
@@ -14,9 +14,10 @@
  * limitations under the License.
  */
 
+#include "linker/arm64/relative_patcher_arm64.h"
+
 #include "base/casts.h"
 #include "linker/relative_patcher_test.h"
-#include "linker/arm64/relative_patcher_arm64.h"
 #include "lock_word.h"
 #include "mirror/array-inl.h"
 #include "mirror/object.h"
diff --git a/compiler/linker/mips/relative_patcher_mips.h b/compiler/linker/mips/relative_patcher_mips.h
index 0b74bd3..d6eda34 100644
--- a/compiler/linker/mips/relative_patcher_mips.h
+++ b/compiler/linker/mips/relative_patcher_mips.h
@@ -17,8 +17,8 @@
 #ifndef ART_COMPILER_LINKER_MIPS_RELATIVE_PATCHER_MIPS_H_
 #define ART_COMPILER_LINKER_MIPS_RELATIVE_PATCHER_MIPS_H_
 
-#include "linker/relative_patcher.h"
 #include "arch/mips/instruction_set_features_mips.h"
+#include "linker/relative_patcher.h"
 
 namespace art {
 namespace linker {
diff --git a/compiler/linker/mips/relative_patcher_mips32r6_test.cc b/compiler/linker/mips/relative_patcher_mips32r6_test.cc
index d1a75e2..586e2aa 100644
--- a/compiler/linker/mips/relative_patcher_mips32r6_test.cc
+++ b/compiler/linker/mips/relative_patcher_mips32r6_test.cc
@@ -14,8 +14,8 @@
  * limitations under the License.
  */
 
-#include "linker/relative_patcher_test.h"
 #include "linker/mips/relative_patcher_mips.h"
+#include "linker/relative_patcher_test.h"
 
 namespace art {
 namespace linker {
diff --git a/compiler/linker/mips/relative_patcher_mips_test.cc b/compiler/linker/mips/relative_patcher_mips_test.cc
index 2f7a075..ebe5406 100644
--- a/compiler/linker/mips/relative_patcher_mips_test.cc
+++ b/compiler/linker/mips/relative_patcher_mips_test.cc
@@ -14,9 +14,10 @@
  * limitations under the License.
  */
 
-#include "linker/relative_patcher_test.h"
 #include "linker/mips/relative_patcher_mips.h"
 
+#include "linker/relative_patcher_test.h"
+
 namespace art {
 namespace linker {
 
diff --git a/compiler/linker/mips64/relative_patcher_mips64_test.cc b/compiler/linker/mips64/relative_patcher_mips64_test.cc
index a5f494d..4edcae7 100644
--- a/compiler/linker/mips64/relative_patcher_mips64_test.cc
+++ b/compiler/linker/mips64/relative_patcher_mips64_test.cc
@@ -14,9 +14,10 @@
  * limitations under the License.
  */
 
-#include "linker/relative_patcher_test.h"
 #include "linker/mips64/relative_patcher_mips64.h"
 
+#include "linker/relative_patcher_test.h"
+
 namespace art {
 namespace linker {
 
diff --git a/compiler/linker/multi_oat_relative_patcher.cc b/compiler/linker/multi_oat_relative_patcher.cc
index e9e242b..4ae75d6 100644
--- a/compiler/linker/multi_oat_relative_patcher.cc
+++ b/compiler/linker/multi_oat_relative_patcher.cc
@@ -16,9 +16,9 @@
 
 #include "multi_oat_relative_patcher.h"
 
-#include "globals.h"
 #include "base/bit_utils.h"
 #include "base/logging.h"
+#include "globals.h"
 
 namespace art {
 namespace linker {
diff --git a/compiler/linker/multi_oat_relative_patcher_test.cc b/compiler/linker/multi_oat_relative_patcher_test.cc
index 615b2b9..e967901 100644
--- a/compiler/linker/multi_oat_relative_patcher_test.cc
+++ b/compiler/linker/multi_oat_relative_patcher_test.cc
@@ -14,9 +14,10 @@
  * limitations under the License.
  */
 
+#include "multi_oat_relative_patcher.h"
+
 #include "compiled_method.h"
 #include "gtest/gtest.h"
-#include "multi_oat_relative_patcher.h"
 #include "vector_output_stream.h"
 
 namespace art {
diff --git a/compiler/linker/output_stream_test.cc b/compiler/linker/output_stream_test.cc
index 09fef29..87cb100 100644
--- a/compiler/linker/output_stream_test.cc
+++ b/compiler/linker/output_stream_test.cc
@@ -17,8 +17,8 @@
 #include "file_output_stream.h"
 #include "vector_output_stream.h"
 
-#include "base/unix_file/fd_file.h"
 #include "base/logging.h"
+#include "base/unix_file/fd_file.h"
 #include "buffered_output_stream.h"
 #include "common_runtime_test.h"
 
diff --git a/compiler/linker/vector_output_stream.h b/compiler/linker/vector_output_stream.h
index 3210143..a9b93e7 100644
--- a/compiler/linker/vector_output_stream.h
+++ b/compiler/linker/vector_output_stream.h
@@ -19,8 +19,8 @@
 
 #include "output_stream.h"
 
-#include <string>
 #include <string.h>
+#include <string>
 #include <vector>
 
 namespace art {
diff --git a/compiler/linker/x86/relative_patcher_x86_test.cc b/compiler/linker/x86/relative_patcher_x86_test.cc
index 0bd9de8..4f74cee 100644
--- a/compiler/linker/x86/relative_patcher_x86_test.cc
+++ b/compiler/linker/x86/relative_patcher_x86_test.cc
@@ -14,9 +14,10 @@
  * limitations under the License.
  */
 
-#include "linker/relative_patcher_test.h"
 #include "linker/x86/relative_patcher_x86.h"
 
+#include "linker/relative_patcher_test.h"
+
 namespace art {
 namespace linker {
 
diff --git a/compiler/linker/x86_64/relative_patcher_x86_64_test.cc b/compiler/linker/x86_64/relative_patcher_x86_64_test.cc
index 6d6bb40..ae17aa7 100644
--- a/compiler/linker/x86_64/relative_patcher_x86_64_test.cc
+++ b/compiler/linker/x86_64/relative_patcher_x86_64_test.cc
@@ -14,9 +14,10 @@
  * limitations under the License.
  */
 
-#include "linker/relative_patcher_test.h"
 #include "linker/x86_64/relative_patcher_x86_64.h"
 
+#include "linker/relative_patcher_test.h"
+
 namespace art {
 namespace linker {
 
diff --git a/compiler/optimizing/bounds_check_elimination.cc b/compiler/optimizing/bounds_check_elimination.cc
index f3ecdf0..c166deb 100644
--- a/compiler/optimizing/bounds_check_elimination.cc
+++ b/compiler/optimizing/bounds_check_elimination.cc
@@ -20,8 +20,8 @@
 
 #include "base/arena_containers.h"
 #include "induction_var_range.h"
-#include "side_effects_analysis.h"
 #include "nodes.h"
+#include "side_effects_analysis.h"
 
 namespace art {
 
diff --git a/compiler/optimizing/bounds_check_elimination_test.cc b/compiler/optimizing/bounds_check_elimination_test.cc
index a949c33..575e2fc 100644
--- a/compiler/optimizing/bounds_check_elimination_test.cc
+++ b/compiler/optimizing/bounds_check_elimination_test.cc
@@ -14,8 +14,9 @@
  * limitations under the License.
  */
 
-#include "base/arena_allocator.h"
 #include "bounds_check_elimination.h"
+
+#include "base/arena_allocator.h"
 #include "builder.h"
 #include "gvn.h"
 #include "induction_var_analysis.h"
diff --git a/compiler/optimizing/builder.h b/compiler/optimizing/builder.h
index 3a4c9db..43429cf 100644
--- a/compiler/optimizing/builder.h
+++ b/compiler/optimizing/builder.h
@@ -20,14 +20,14 @@
 #include "base/arena_containers.h"
 #include "base/arena_object.h"
 #include "block_builder.h"
-#include "dex_file.h"
 #include "dex_file-inl.h"
+#include "dex_file.h"
 #include "driver/compiler_driver.h"
 #include "driver/dex_compilation_unit.h"
 #include "instruction_builder.h"
+#include "nodes.h"
 #include "optimizing_compiler_stats.h"
 #include "primitive.h"
-#include "nodes.h"
 #include "ssa_builder.h"
 
 namespace art {
diff --git a/compiler/optimizing/code_generator.cc b/compiler/optimizing/code_generator.cc
index 2872cf7..d7d0fff 100644
--- a/compiler/optimizing/code_generator.cc
+++ b/compiler/optimizing/code_generator.cc
@@ -57,8 +57,8 @@
 #include "mirror/reference.h"
 #include "mirror/string.h"
 #include "parallel_move_resolver.h"
-#include "ssa_liveness_analysis.h"
 #include "scoped_thread_state_change-inl.h"
+#include "ssa_liveness_analysis.h"
 #include "thread-current-inl.h"
 #include "utils/assembler.h"
 
diff --git a/compiler/optimizing/code_generator_arm64.cc b/compiler/optimizing/code_generator_arm64.cc
index 7e5b1a0..4999950 100644
--- a/compiler/optimizing/code_generator_arm64.cc
+++ b/compiler/optimizing/code_generator_arm64.cc
@@ -29,9 +29,9 @@
 #include "intrinsics.h"
 #include "intrinsics_arm64.h"
 #include "linker/arm64/relative_patcher_arm64.h"
+#include "lock_word.h"
 #include "mirror/array-inl.h"
 #include "mirror/class-inl.h"
-#include "lock_word.h"
 #include "offsets.h"
 #include "thread.h"
 #include "utils/arm64/assembler_arm64.h"
diff --git a/compiler/optimizing/code_generator_arm_vixl.h b/compiler/optimizing/code_generator_arm_vixl.h
index 01cf287..7ab2993 100644
--- a/compiler/optimizing/code_generator_arm_vixl.h
+++ b/compiler/optimizing/code_generator_arm_vixl.h
@@ -22,8 +22,8 @@
 #include "common_arm.h"
 #include "driver/compiler_options.h"
 #include "nodes.h"
-#include "string_reference.h"
 #include "parallel_move_resolver.h"
+#include "string_reference.h"
 #include "type_reference.h"
 #include "utils/arm/assembler_arm_vixl.h"
 
diff --git a/compiler/optimizing/code_generator_x86.cc b/compiler/optimizing/code_generator_x86.cc
index af0e646..142cc7f 100644
--- a/compiler/optimizing/code_generator_x86.cc
+++ b/compiler/optimizing/code_generator_x86.cc
@@ -24,9 +24,9 @@
 #include "gc/accounting/card_table.h"
 #include "intrinsics.h"
 #include "intrinsics_x86.h"
+#include "lock_word.h"
 #include "mirror/array-inl.h"
 #include "mirror/class-inl.h"
-#include "lock_word.h"
 #include "thread.h"
 #include "utils/assembler.h"
 #include "utils/stack_checks.h"
diff --git a/compiler/optimizing/common_arm.h b/compiler/optimizing/common_arm.h
index 8fcceed..e354654 100644
--- a/compiler/optimizing/common_arm.h
+++ b/compiler/optimizing/common_arm.h
@@ -17,8 +17,8 @@
 #ifndef ART_COMPILER_OPTIMIZING_COMMON_ARM_H_
 #define ART_COMPILER_OPTIMIZING_COMMON_ARM_H_
 
-#include "instruction_simplifier_shared.h"
 #include "debug/dwarf/register.h"
+#include "instruction_simplifier_shared.h"
 #include "locations.h"
 #include "nodes.h"
 #include "utils/arm/constants_arm.h"
diff --git a/compiler/optimizing/dead_code_elimination_test.cc b/compiler/optimizing/dead_code_elimination_test.cc
index fdd77e7..96fa540 100644
--- a/compiler/optimizing/dead_code_elimination_test.cc
+++ b/compiler/optimizing/dead_code_elimination_test.cc
@@ -14,9 +14,10 @@
  * limitations under the License.
  */
 
+#include "dead_code_elimination.h"
+
 #include "arch/x86/instruction_set_features_x86.h"
 #include "code_generator_x86.h"
-#include "dead_code_elimination.h"
 #include "driver/compiler_options.h"
 #include "graph_checker.h"
 #include "optimizing_unit_test.h"
diff --git a/compiler/optimizing/find_loops_test.cc b/compiler/optimizing/find_loops_test.cc
index 04789d9..bbd28f5 100644
--- a/compiler/optimizing/find_loops_test.cc
+++ b/compiler/optimizing/find_loops_test.cc
@@ -20,8 +20,8 @@
 #include "dex_instruction.h"
 #include "nodes.h"
 #include "optimizing_unit_test.h"
-#include "ssa_liveness_analysis.h"
 #include "pretty_printer.h"
+#include "ssa_liveness_analysis.h"
 
 #include "gtest/gtest.h"
 
diff --git a/compiler/optimizing/graph_checker.cc b/compiler/optimizing/graph_checker.cc
index aea901d..327e11f 100644
--- a/compiler/optimizing/graph_checker.cc
+++ b/compiler/optimizing/graph_checker.cc
@@ -17,8 +17,8 @@
 #include "graph_checker.h"
 
 #include <algorithm>
-#include <string>
 #include <sstream>
+#include <string>
 
 #include "android-base/stringprintf.h"
 
diff --git a/compiler/optimizing/gvn_test.cc b/compiler/optimizing/gvn_test.cc
index f8d37bd..e1ed7f6 100644
--- a/compiler/optimizing/gvn_test.cc
+++ b/compiler/optimizing/gvn_test.cc
@@ -14,9 +14,10 @@
  * limitations under the License.
  */
 
+#include "gvn.h"
+
 #include "base/arena_allocator.h"
 #include "builder.h"
-#include "gvn.h"
 #include "nodes.h"
 #include "optimizing_unit_test.h"
 #include "side_effects_analysis.h"
diff --git a/compiler/optimizing/induction_var_range_test.cc b/compiler/optimizing/induction_var_range_test.cc
index 67d2093..2b82b33 100644
--- a/compiler/optimizing/induction_var_range_test.cc
+++ b/compiler/optimizing/induction_var_range_test.cc
@@ -14,10 +14,11 @@
  * limitations under the License.
  */
 
+#include "induction_var_range.h"
+
 #include "base/arena_allocator.h"
 #include "builder.h"
 #include "induction_var_analysis.h"
-#include "induction_var_range.h"
 #include "nodes.h"
 #include "optimizing_unit_test.h"
 
diff --git a/compiler/optimizing/inliner.cc b/compiler/optimizing/inliner.cc
index 18390cc..38a1a8c 100644
--- a/compiler/optimizing/inliner.cc
+++ b/compiler/optimizing/inliner.cc
@@ -23,8 +23,8 @@
 #include "constant_folding.h"
 #include "dead_code_elimination.h"
 #include "dex/inline_method_analyser.h"
-#include "dex/verified_method.h"
 #include "dex/verification_results.h"
+#include "dex/verified_method.h"
 #include "driver/compiler_driver-inl.h"
 #include "driver/compiler_options.h"
 #include "driver/dex_compilation_unit.h"
@@ -38,10 +38,10 @@
 #include "optimizing_compiler.h"
 #include "reference_type_propagation.h"
 #include "register_allocator_linear_scan.h"
+#include "scoped_thread_state_change-inl.h"
 #include "sharpening.h"
 #include "ssa_builder.h"
 #include "ssa_phi_elimination.h"
-#include "scoped_thread_state_change-inl.h"
 #include "thread.h"
 
 namespace art {
diff --git a/compiler/optimizing/inliner.h b/compiler/optimizing/inliner.h
index 67476b6..62c6713 100644
--- a/compiler/optimizing/inliner.h
+++ b/compiler/optimizing/inliner.h
@@ -19,8 +19,8 @@
 
 #include "dex_file_types.h"
 #include "invoke_type.h"
-#include "optimization.h"
 #include "jit/profile_compilation_info.h"
+#include "optimization.h"
 
 namespace art {
 
diff --git a/compiler/optimizing/instruction_builder.cc b/compiler/optimizing/instruction_builder.cc
index 8054140..143c77f 100644
--- a/compiler/optimizing/instruction_builder.cc
+++ b/compiler/optimizing/instruction_builder.cc
@@ -23,8 +23,8 @@
 #include "driver/compiler_options.h"
 #include "imtable-inl.h"
 #include "quicken_info.h"
-#include "sharpening.h"
 #include "scoped_thread_state_change-inl.h"
+#include "sharpening.h"
 
 namespace art {
 
diff --git a/compiler/optimizing/instruction_builder.h b/compiler/optimizing/instruction_builder.h
index 5a83df3..2a9b9f5 100644
--- a/compiler/optimizing/instruction_builder.h
+++ b/compiler/optimizing/instruction_builder.h
@@ -21,8 +21,8 @@
 #include "base/arena_object.h"
 #include "block_builder.h"
 #include "dex_file_types.h"
-#include "driver/compiler_driver.h"
 #include "driver/compiler_driver-inl.h"
+#include "driver/compiler_driver.h"
 #include "driver/dex_compilation_unit.h"
 #include "mirror/dex_cache.h"
 #include "nodes.h"
diff --git a/compiler/optimizing/instruction_simplifier.cc b/compiler/optimizing/instruction_simplifier.cc
index f2a8cc0..02cfbbc 100644
--- a/compiler/optimizing/instruction_simplifier.cc
+++ b/compiler/optimizing/instruction_simplifier.cc
@@ -21,8 +21,8 @@
 #include "escape.h"
 #include "intrinsics.h"
 #include "mirror/class-inl.h"
-#include "sharpening.h"
 #include "scoped_thread_state_change-inl.h"
+#include "sharpening.h"
 
 namespace art {
 
diff --git a/compiler/optimizing/instruction_simplifier_arm.cc b/compiler/optimizing/instruction_simplifier_arm.cc
index a025fb1..a32d0ce 100644
--- a/compiler/optimizing/instruction_simplifier_arm.cc
+++ b/compiler/optimizing/instruction_simplifier_arm.cc
@@ -14,9 +14,10 @@
  * limitations under the License.
  */
 
+#include "instruction_simplifier_arm.h"
+
 #include "code_generator.h"
 #include "common_arm.h"
-#include "instruction_simplifier_arm.h"
 #include "instruction_simplifier_shared.h"
 #include "mirror/array-inl.h"
 #include "mirror/string.h"
diff --git a/compiler/optimizing/intrinsics.cc b/compiler/optimizing/intrinsics.cc
index b664d41..7bdeef5 100644
--- a/compiler/optimizing/intrinsics.cc
+++ b/compiler/optimizing/intrinsics.cc
@@ -39,7 +39,7 @@
     case Intrinsics::k ## Name: \
       return IsStatic;
 #include "intrinsics_list.h"
-INTRINSICS_LIST(OPTIMIZING_INTRINSICS)
+      INTRINSICS_LIST(OPTIMIZING_INTRINSICS)
 #undef INTRINSICS_LIST
 #undef OPTIMIZING_INTRINSICS
   }
@@ -55,7 +55,7 @@
     case Intrinsics::k ## Name: \
       return NeedsEnvironmentOrCache;
 #include "intrinsics_list.h"
-INTRINSICS_LIST(OPTIMIZING_INTRINSICS)
+      INTRINSICS_LIST(OPTIMIZING_INTRINSICS)
 #undef INTRINSICS_LIST
 #undef OPTIMIZING_INTRINSICS
   }
@@ -71,7 +71,7 @@
     case Intrinsics::k ## Name: \
       return SideEffects;
 #include "intrinsics_list.h"
-INTRINSICS_LIST(OPTIMIZING_INTRINSICS)
+      INTRINSICS_LIST(OPTIMIZING_INTRINSICS)
 #undef INTRINSICS_LIST
 #undef OPTIMIZING_INTRINSICS
   }
@@ -87,7 +87,7 @@
     case Intrinsics::k ## Name: \
       return Exceptions;
 #include "intrinsics_list.h"
-INTRINSICS_LIST(OPTIMIZING_INTRINSICS)
+      INTRINSICS_LIST(OPTIMIZING_INTRINSICS)
 #undef INTRINSICS_LIST
 #undef OPTIMIZING_INTRINSICS
   }
@@ -172,7 +172,7 @@
       os << # Name; \
       break;
 #include "intrinsics_list.h"
-INTRINSICS_LIST(OPTIMIZING_INTRINSICS)
+      INTRINSICS_LIST(OPTIMIZING_INTRINSICS)
 #undef STATIC_INTRINSICS_LIST
 #undef VIRTUAL_INTRINSICS_LIST
 #undef OPTIMIZING_INTRINSICS
diff --git a/compiler/optimizing/intrinsics.h b/compiler/optimizing/intrinsics.h
index 9da5a7f..6411e82 100644
--- a/compiler/optimizing/intrinsics.h
+++ b/compiler/optimizing/intrinsics.h
@@ -63,7 +63,7 @@
         Visit ## Name(invoke);    \
         return;
 #include "intrinsics_list.h"
-INTRINSICS_LIST(OPTIMIZING_INTRINSICS)
+        INTRINSICS_LIST(OPTIMIZING_INTRINSICS)
 #undef INTRINSICS_LIST
 #undef OPTIMIZING_INTRINSICS
 
@@ -77,7 +77,7 @@
   virtual void Visit ## Name(HInvoke* invoke ATTRIBUTE_UNUSED) { \
   }
 #include "intrinsics_list.h"
-INTRINSICS_LIST(OPTIMIZING_INTRINSICS)
+  INTRINSICS_LIST(OPTIMIZING_INTRINSICS)
 #undef INTRINSICS_LIST
 #undef OPTIMIZING_INTRINSICS
 
diff --git a/compiler/optimizing/intrinsics_arm64.h b/compiler/optimizing/intrinsics_arm64.h
index ff59ce9..5a6d180 100644
--- a/compiler/optimizing/intrinsics_arm64.h
+++ b/compiler/optimizing/intrinsics_arm64.h
@@ -47,7 +47,7 @@
 #define OPTIMIZING_INTRINSICS(Name, IsStatic, NeedsEnvironmentOrCache, SideEffects, Exceptions, ...) \
   void Visit ## Name(HInvoke* invoke) OVERRIDE;
 #include "intrinsics_list.h"
-INTRINSICS_LIST(OPTIMIZING_INTRINSICS)
+  INTRINSICS_LIST(OPTIMIZING_INTRINSICS)
 #undef INTRINSICS_LIST
 #undef OPTIMIZING_INTRINSICS
 
@@ -72,7 +72,7 @@
 #define OPTIMIZING_INTRINSICS(Name, IsStatic, NeedsEnvironmentOrCache, SideEffects, Exceptions, ...) \
   void Visit ## Name(HInvoke* invoke) OVERRIDE;
 #include "intrinsics_list.h"
-INTRINSICS_LIST(OPTIMIZING_INTRINSICS)
+  INTRINSICS_LIST(OPTIMIZING_INTRINSICS)
 #undef INTRINSICS_LIST
 #undef OPTIMIZING_INTRINSICS
 
diff --git a/compiler/optimizing/intrinsics_arm_vixl.h b/compiler/optimizing/intrinsics_arm_vixl.h
index 023cba1..a4a2830 100644
--- a/compiler/optimizing/intrinsics_arm_vixl.h
+++ b/compiler/optimizing/intrinsics_arm_vixl.h
@@ -36,7 +36,7 @@
 #define OPTIMIZING_INTRINSICS(Name, IsStatic, NeedsEnvironmentOrCache, SideEffects, Exceptions, ...) \
   void Visit ## Name(HInvoke* invoke) OVERRIDE;
 #include "intrinsics_list.h"
-INTRINSICS_LIST(OPTIMIZING_INTRINSICS)
+  INTRINSICS_LIST(OPTIMIZING_INTRINSICS)
 #undef INTRINSICS_LIST
 #undef OPTIMIZING_INTRINSICS
 
@@ -63,7 +63,7 @@
 #define OPTIMIZING_INTRINSICS(Name, IsStatic, NeedsEnvironmentOrCache, SideEffects, Exceptions, ...) \
   void Visit ## Name(HInvoke* invoke) OVERRIDE;
 #include "intrinsics_list.h"
-INTRINSICS_LIST(OPTIMIZING_INTRINSICS)
+  INTRINSICS_LIST(OPTIMIZING_INTRINSICS)
 #undef INTRINSICS_LIST
 #undef OPTIMIZING_INTRINSICS
 
diff --git a/compiler/optimizing/intrinsics_mips.h b/compiler/optimizing/intrinsics_mips.h
index eaadad2..05d1aa2 100644
--- a/compiler/optimizing/intrinsics_mips.h
+++ b/compiler/optimizing/intrinsics_mips.h
@@ -39,7 +39,7 @@
 #define OPTIMIZING_INTRINSICS(Name, IsStatic, NeedsEnvironmentOrCache, SideEffects, Exceptions, ...) \
   void Visit ## Name(HInvoke* invoke) OVERRIDE;
 #include "intrinsics_list.h"
-INTRINSICS_LIST(OPTIMIZING_INTRINSICS)
+  INTRINSICS_LIST(OPTIMIZING_INTRINSICS)
 #undef INTRINSICS_LIST
 #undef OPTIMIZING_INTRINSICS
 
@@ -64,7 +64,7 @@
 #define OPTIMIZING_INTRINSICS(Name, IsStatic, NeedsEnvironmentOrCache, SideEffects, Exceptions, ...) \
   void Visit ## Name(HInvoke* invoke) OVERRIDE;
 #include "intrinsics_list.h"
-INTRINSICS_LIST(OPTIMIZING_INTRINSICS)
+  INTRINSICS_LIST(OPTIMIZING_INTRINSICS)
 #undef INTRINSICS_LIST
 #undef OPTIMIZING_INTRINSICS
 
diff --git a/compiler/optimizing/intrinsics_mips64.h b/compiler/optimizing/intrinsics_mips64.h
index 179627a..6880a25 100644
--- a/compiler/optimizing/intrinsics_mips64.h
+++ b/compiler/optimizing/intrinsics_mips64.h
@@ -39,7 +39,7 @@
 #define OPTIMIZING_INTRINSICS(Name, IsStatic, NeedsEnvironmentOrCache, SideEffects, Exceptions, ...) \
   void Visit ## Name(HInvoke* invoke) OVERRIDE;
 #include "intrinsics_list.h"
-INTRINSICS_LIST(OPTIMIZING_INTRINSICS)
+  INTRINSICS_LIST(OPTIMIZING_INTRINSICS)
 #undef INTRINSICS_LIST
 #undef OPTIMIZING_INTRINSICS
 
@@ -64,7 +64,7 @@
 #define OPTIMIZING_INTRINSICS(Name, IsStatic, NeedsEnvironmentOrCache, SideEffects, Exceptions, ...) \
   void Visit ## Name(HInvoke* invoke) OVERRIDE;
 #include "intrinsics_list.h"
-INTRINSICS_LIST(OPTIMIZING_INTRINSICS)
+  INTRINSICS_LIST(OPTIMIZING_INTRINSICS)
 #undef INTRINSICS_LIST
 #undef OPTIMIZING_INTRINSICS
 
diff --git a/compiler/optimizing/intrinsics_x86.h b/compiler/optimizing/intrinsics_x86.h
index 3743cb1..22f11b1 100644
--- a/compiler/optimizing/intrinsics_x86.h
+++ b/compiler/optimizing/intrinsics_x86.h
@@ -39,7 +39,7 @@
 #define OPTIMIZING_INTRINSICS(Name, IsStatic, NeedsEnvironmentOrCache, SideEffects, Exceptions, ...) \
   void Visit ## Name(HInvoke* invoke) OVERRIDE;
 #include "intrinsics_list.h"
-INTRINSICS_LIST(OPTIMIZING_INTRINSICS)
+  INTRINSICS_LIST(OPTIMIZING_INTRINSICS)
 #undef INTRINSICS_LIST
 #undef OPTIMIZING_INTRINSICS
 
@@ -64,7 +64,7 @@
 #define OPTIMIZING_INTRINSICS(Name, IsStatic, NeedsEnvironmentOrCache, SideEffects, Exceptions, ...) \
   void Visit ## Name(HInvoke* invoke) OVERRIDE;
 #include "intrinsics_list.h"
-INTRINSICS_LIST(OPTIMIZING_INTRINSICS)
+  INTRINSICS_LIST(OPTIMIZING_INTRINSICS)
 #undef INTRINSICS_LIST
 #undef OPTIMIZING_INTRINSICS
 
diff --git a/compiler/optimizing/intrinsics_x86_64.h b/compiler/optimizing/intrinsics_x86_64.h
index 97404aa..4b28788 100644
--- a/compiler/optimizing/intrinsics_x86_64.h
+++ b/compiler/optimizing/intrinsics_x86_64.h
@@ -39,7 +39,7 @@
 #define OPTIMIZING_INTRINSICS(Name, IsStatic, NeedsEnvironmentOrCache, SideEffects, Exceptions, ...) \
   void Visit ## Name(HInvoke* invoke) OVERRIDE;
 #include "intrinsics_list.h"
-INTRINSICS_LIST(OPTIMIZING_INTRINSICS)
+  INTRINSICS_LIST(OPTIMIZING_INTRINSICS)
 #undef INTRINSICS_LIST
 #undef OPTIMIZING_INTRINSICS
 
@@ -64,7 +64,7 @@
 #define OPTIMIZING_INTRINSICS(Name, IsStatic, NeedsEnvironmentOrCache, SideEffects, Exceptions, ...) \
   void Visit ## Name(HInvoke* invoke) OVERRIDE;
 #include "intrinsics_list.h"
-INTRINSICS_LIST(OPTIMIZING_INTRINSICS)
+  INTRINSICS_LIST(OPTIMIZING_INTRINSICS)
 #undef INTRINSICS_LIST
 #undef OPTIMIZING_INTRINSICS
 
diff --git a/compiler/optimizing/licm_test.cc b/compiler/optimizing/licm_test.cc
index 8d15f78..8967d7c 100644
--- a/compiler/optimizing/licm_test.cc
+++ b/compiler/optimizing/licm_test.cc
@@ -14,9 +14,10 @@
  * limitations under the License.
  */
 
+#include "licm.h"
+
 #include "base/arena_allocator.h"
 #include "builder.h"
-#include "licm.h"
 #include "nodes.h"
 #include "optimizing_unit_test.h"
 #include "side_effects_analysis.h"
diff --git a/compiler/optimizing/load_store_elimination.cc b/compiler/optimizing/load_store_elimination.cc
index 211528b..fddda3d 100644
--- a/compiler/optimizing/load_store_elimination.cc
+++ b/compiler/optimizing/load_store_elimination.cc
@@ -14,10 +14,10 @@
  * limitations under the License.
  */
 
-#include "load_store_analysis.h"
 #include "load_store_elimination.h"
 
 #include "escape.h"
+#include "load_store_analysis.h"
 #include "side_effects_analysis.h"
 
 #include <iostream>
diff --git a/compiler/optimizing/locations.cc b/compiler/optimizing/locations.cc
index a9fe209..40fe35b 100644
--- a/compiler/optimizing/locations.cc
+++ b/compiler/optimizing/locations.cc
@@ -18,8 +18,8 @@
 
 #include <type_traits>
 
-#include "nodes.h"
 #include "code_generator.h"
+#include "nodes.h"
 
 namespace art {
 
diff --git a/compiler/optimizing/loop_optimization.cc b/compiler/optimizing/loop_optimization.cc
index 422e58d..274f065 100644
--- a/compiler/optimizing/loop_optimization.cc
+++ b/compiler/optimizing/loop_optimization.cc
@@ -16,9 +16,9 @@
 
 #include "loop_optimization.h"
 
-#include "arch/instruction_set.h"
 #include "arch/arm/instruction_set_features_arm.h"
 #include "arch/arm64/instruction_set_features_arm64.h"
+#include "arch/instruction_set.h"
 #include "arch/mips/instruction_set_features_mips.h"
 #include "arch/mips64/instruction_set_features_mips64.h"
 #include "arch/x86/instruction_set_features_x86.h"
diff --git a/compiler/optimizing/nodes.cc b/compiler/optimizing/nodes.cc
index 4ca8337..ca48e08 100644
--- a/compiler/optimizing/nodes.cc
+++ b/compiler/optimizing/nodes.cc
@@ -18,16 +18,16 @@
 #include <cfloat>
 
 #include "art_method-inl.h"
+#include "base/bit_utils.h"
+#include "base/bit_vector-inl.h"
+#include "base/stl_util.h"
 #include "class_linker-inl.h"
 #include "code_generator.h"
 #include "common_dominator.h"
-#include "ssa_builder.h"
-#include "base/bit_vector-inl.h"
-#include "base/bit_utils.h"
-#include "base/stl_util.h"
 #include "intrinsics.h"
 #include "mirror/class-inl.h"
 #include "scoped_thread_state_change-inl.h"
+#include "ssa_builder.h"
 
 namespace art {
 
diff --git a/compiler/optimizing/nodes.h b/compiler/optimizing/nodes.h
index 5e072cd..fa29378 100644
--- a/compiler/optimizing/nodes.h
+++ b/compiler/optimizing/nodes.h
@@ -28,14 +28,14 @@
 #include "base/iteration_range.h"
 #include "base/stl_util.h"
 #include "base/transform_array_ref.h"
+#include "deoptimization_kind.h"
 #include "dex_file.h"
 #include "dex_file_types.h"
-#include "deoptimization_kind.h"
 #include "entrypoints/quick/quick_entrypoints_enum.h"
 #include "handle.h"
 #include "handle_scope.h"
-#include "invoke_type.h"
 #include "intrinsics_enum.h"
+#include "invoke_type.h"
 #include "locations.h"
 #include "method_reference.h"
 #include "mirror/class.h"
diff --git a/compiler/optimizing/nodes_shared.cc b/compiler/optimizing/nodes_shared.cc
index f145bf9..f6d33f0 100644
--- a/compiler/optimizing/nodes_shared.cc
+++ b/compiler/optimizing/nodes_shared.cc
@@ -14,9 +14,15 @@
  * limitations under the License.
  */
 
-#include "common_arm64.h"
+// Note: this include order may seem strange and is against the regular style. However it is the
+//       required order as nodes_shared does not have the right dependency chain and compilation
+//       will fail (as AsType on HInstruction will be defined before the full Instruction).
+#include "nodes.h"
+
 #include "nodes_shared.h"
 
+#include "common_arm64.h"
+
 namespace art {
 
 using helpers::CanFitInShifterOperand;
diff --git a/compiler/optimizing/nodes_test.cc b/compiler/optimizing/nodes_test.cc
index 7686ba8..f3a78a0 100644
--- a/compiler/optimizing/nodes_test.cc
+++ b/compiler/optimizing/nodes_test.cc
@@ -14,8 +14,9 @@
  * limitations under the License.
  */
 
-#include "base/arena_allocator.h"
 #include "nodes.h"
+
+#include "base/arena_allocator.h"
 #include "optimizing_unit_test.h"
 
 #include "gtest/gtest.h"
diff --git a/compiler/optimizing/optimizing_cfi_test.cc b/compiler/optimizing/optimizing_cfi_test.cc
index 6cb27b3..c24f1de 100644
--- a/compiler/optimizing/optimizing_cfi_test.cc
+++ b/compiler/optimizing/optimizing_cfi_test.cc
@@ -23,8 +23,8 @@
 #include "gtest/gtest.h"
 #include "optimizing/code_generator.h"
 #include "optimizing/optimizing_unit_test.h"
-#include "utils/assembler.h"
 #include "utils/arm/assembler_arm_vixl.h"
+#include "utils/assembler.h"
 #include "utils/mips/assembler_mips.h"
 #include "utils/mips64/assembler_mips64.h"
 
diff --git a/compiler/optimizing/optimizing_compiler.cc b/compiler/optimizing/optimizing_compiler.cc
index b76a0df..51101f1 100644
--- a/compiler/optimizing/optimizing_compiler.cc
+++ b/compiler/optimizing/optimizing_compiler.cc
@@ -87,8 +87,8 @@
 #include "prepare_for_register_allocation.h"
 #include "reference_type_propagation.h"
 #include "register_allocator_linear_scan.h"
-#include "select_generator.h"
 #include "scheduler.h"
+#include "select_generator.h"
 #include "sharpening.h"
 #include "side_effects_analysis.h"
 #include "ssa_builder.h"
diff --git a/compiler/optimizing/optimizing_unit_test.h b/compiler/optimizing/optimizing_unit_test.h
index 1cdcbd2..08493fa 100644
--- a/compiler/optimizing/optimizing_unit_test.h
+++ b/compiler/optimizing/optimizing_unit_test.h
@@ -17,12 +17,12 @@
 #ifndef ART_COMPILER_OPTIMIZING_OPTIMIZING_UNIT_TEST_H_
 #define ART_COMPILER_OPTIMIZING_OPTIMIZING_UNIT_TEST_H_
 
-#include "nodes.h"
 #include "builder.h"
 #include "common_compiler_test.h"
 #include "dex_file.h"
 #include "dex_instruction.h"
 #include "handle_scope.h"
+#include "nodes.h"
 #include "scoped_thread_state_change.h"
 #include "ssa_builder.h"
 #include "ssa_liveness_analysis.h"
diff --git a/compiler/optimizing/parallel_move_test.cc b/compiler/optimizing/parallel_move_test.cc
index 5e8fe37..50620f0 100644
--- a/compiler/optimizing/parallel_move_test.cc
+++ b/compiler/optimizing/parallel_move_test.cc
@@ -18,8 +18,8 @@
 #include "nodes.h"
 #include "parallel_move_resolver.h"
 
-#include "gtest/gtest.h"
 #include "gtest/gtest-typed-test.h"
+#include "gtest/gtest.h"
 
 namespace art {
 
diff --git a/compiler/optimizing/pretty_printer_test.cc b/compiler/optimizing/pretty_printer_test.cc
index 1af94f3..14d2360 100644
--- a/compiler/optimizing/pretty_printer_test.cc
+++ b/compiler/optimizing/pretty_printer_test.cc
@@ -14,13 +14,14 @@
  * limitations under the License.
  */
 
+#include "pretty_printer.h"
+
 #include "base/arena_allocator.h"
 #include "builder.h"
 #include "dex_file.h"
 #include "dex_instruction.h"
 #include "nodes.h"
 #include "optimizing_unit_test.h"
-#include "pretty_printer.h"
 
 #include "gtest/gtest.h"
 
diff --git a/compiler/optimizing/reference_type_propagation_test.cc b/compiler/optimizing/reference_type_propagation_test.cc
index 0b49ce1..d537459 100644
--- a/compiler/optimizing/reference_type_propagation_test.cc
+++ b/compiler/optimizing/reference_type_propagation_test.cc
@@ -14,12 +14,13 @@
  * limitations under the License.
  */
 
+#include "reference_type_propagation.h"
+
 #include "base/arena_allocator.h"
 #include "builder.h"
 #include "nodes.h"
 #include "object_lock.h"
 #include "optimizing_unit_test.h"
-#include "reference_type_propagation.h"
 
 namespace art {
 
diff --git a/compiler/optimizing/register_allocator.cc b/compiler/optimizing/register_allocator.cc
index 5b768d5..c3b33e2 100644
--- a/compiler/optimizing/register_allocator.cc
+++ b/compiler/optimizing/register_allocator.cc
@@ -25,7 +25,6 @@
 #include "register_allocator_linear_scan.h"
 #include "ssa_liveness_analysis.h"
 
-
 namespace art {
 
 RegisterAllocator::RegisterAllocator(ArenaAllocator* allocator,
diff --git a/compiler/optimizing/register_allocator_test.cc b/compiler/optimizing/register_allocator_test.cc
index 24a2ab2..bcdd7f9 100644
--- a/compiler/optimizing/register_allocator_test.cc
+++ b/compiler/optimizing/register_allocator_test.cc
@@ -14,6 +14,8 @@
  * limitations under the License.
  */
 
+#include "register_allocator.h"
+
 #include "arch/x86/instruction_set_features_x86.h"
 #include "base/arena_allocator.h"
 #include "builder.h"
@@ -25,7 +27,6 @@
 #include "driver/compiler_options.h"
 #include "nodes.h"
 #include "optimizing_unit_test.h"
-#include "register_allocator.h"
 #include "register_allocator_linear_scan.h"
 #include "ssa_liveness_analysis.h"
 #include "ssa_phi_elimination.h"
diff --git a/compiler/optimizing/scheduler.h b/compiler/optimizing/scheduler.h
index 930a2c82..66ffac5 100644
--- a/compiler/optimizing/scheduler.h
+++ b/compiler/optimizing/scheduler.h
@@ -20,11 +20,11 @@
 #include <fstream>
 
 #include "base/time_utils.h"
+#include "code_generator.h"
 #include "driver/compiler_driver.h"
 #include "load_store_analysis.h"
 #include "nodes.h"
 #include "optimization.h"
-#include "code_generator.h"
 
 namespace art {
 
diff --git a/compiler/optimizing/scheduler_arm.cc b/compiler/optimizing/scheduler_arm.cc
index f025c0a..ea15790 100644
--- a/compiler/optimizing/scheduler_arm.cc
+++ b/compiler/optimizing/scheduler_arm.cc
@@ -14,11 +14,12 @@
  * limitations under the License.
  */
 
+#include "scheduler_arm.h"
+
 #include "arch/arm/instruction_set_features_arm.h"
 #include "code_generator_utils.h"
 #include "common_arm.h"
 #include "mirror/array-inl.h"
-#include "scheduler_arm.h"
 
 namespace art {
 namespace arm {
diff --git a/compiler/optimizing/scheduler_arm64.cc b/compiler/optimizing/scheduler_arm64.cc
index 83b487f..f54d3f3 100644
--- a/compiler/optimizing/scheduler_arm64.cc
+++ b/compiler/optimizing/scheduler_arm64.cc
@@ -15,6 +15,7 @@
  */
 
 #include "scheduler_arm64.h"
+
 #include "code_generator_utils.h"
 #include "mirror/array-inl.h"
 
diff --git a/compiler/optimizing/scheduler_test.cc b/compiler/optimizing/scheduler_test.cc
index 10c3cd7..cdb6666 100644
--- a/compiler/optimizing/scheduler_test.cc
+++ b/compiler/optimizing/scheduler_test.cc
@@ -14,6 +14,8 @@
  * limitations under the License.
  */
 
+#include "scheduler.h"
+
 #include "base/arena_allocator.h"
 #include "builder.h"
 #include "codegen_test_utils.h"
@@ -23,7 +25,6 @@
 #include "optimizing_unit_test.h"
 #include "pc_relative_fixups_x86.h"
 #include "register_allocator.h"
-#include "scheduler.h"
 
 #ifdef ART_ENABLE_CODEGEN_arm64
 #include "scheduler_arm64.h"
diff --git a/compiler/optimizing/sharpening.cc b/compiler/optimizing/sharpening.cc
index 8bd568b..9536d14 100644
--- a/compiler/optimizing/sharpening.cc
+++ b/compiler/optimizing/sharpening.cc
@@ -21,10 +21,9 @@
 #include "base/enums.h"
 #include "class_linker.h"
 #include "code_generator.h"
+#include "driver/compiler_driver.h"
 #include "driver/compiler_options.h"
 #include "driver/dex_compilation_unit.h"
-#include "utils/dex_cache_arrays_layout-inl.h"
-#include "driver/compiler_driver.h"
 #include "gc/heap.h"
 #include "gc/space/image_space.h"
 #include "handle_scope-inl.h"
@@ -33,6 +32,7 @@
 #include "nodes.h"
 #include "runtime.h"
 #include "scoped_thread_state_change-inl.h"
+#include "utils/dex_cache_arrays_layout-inl.h"
 
 namespace art {
 
diff --git a/compiler/optimizing/ssa_liveness_analysis_test.cc b/compiler/optimizing/ssa_liveness_analysis_test.cc
index 029eb4b..b46060a 100644
--- a/compiler/optimizing/ssa_liveness_analysis_test.cc
+++ b/compiler/optimizing/ssa_liveness_analysis_test.cc
@@ -14,15 +14,16 @@
  * limitations under the License.
  */
 
+#include "ssa_liveness_analysis.h"
+
 #include "arch/instruction_set.h"
 #include "arch/instruction_set_features.h"
 #include "base/arena_allocator.h"
 #include "base/arena_containers.h"
-#include "driver/compiler_options.h"
 #include "code_generator.h"
+#include "driver/compiler_options.h"
 #include "nodes.h"
 #include "optimizing_unit_test.h"
-#include "ssa_liveness_analysis.h"
 
 namespace art {
 
diff --git a/compiler/optimizing/ssa_phi_elimination.cc b/compiler/optimizing/ssa_phi_elimination.cc
index aec7a3c..b4f8408 100644
--- a/compiler/optimizing/ssa_phi_elimination.cc
+++ b/compiler/optimizing/ssa_phi_elimination.cc
@@ -16,8 +16,8 @@
 
 #include "ssa_phi_elimination.h"
 
-#include "base/arena_containers.h"
 #include "base/arena_bit_vector.h"
+#include "base/arena_containers.h"
 #include "base/bit_vector-inl.h"
 
 namespace art {
diff --git a/compiler/utils/arm/jni_macro_assembler_arm_vixl.cc b/compiler/utils/arm/jni_macro_assembler_arm_vixl.cc
index bebe64c..ed57ca6 100644
--- a/compiler/utils/arm/jni_macro_assembler_arm_vixl.cc
+++ b/compiler/utils/arm/jni_macro_assembler_arm_vixl.cc
@@ -14,10 +14,11 @@
  * limitations under the License.
  */
 
+#include "jni_macro_assembler_arm_vixl.h"
+
 #include <iostream>
 #include <type_traits>
 
-#include "jni_macro_assembler_arm_vixl.h"
 #include "entrypoints/quick/quick_entrypoints.h"
 #include "thread.h"
 
diff --git a/compiler/utils/arm/managed_register_arm_test.cc b/compiler/utils/arm/managed_register_arm_test.cc
index f5d4cc0..43b0b51 100644
--- a/compiler/utils/arm/managed_register_arm_test.cc
+++ b/compiler/utils/arm/managed_register_arm_test.cc
@@ -14,8 +14,8 @@
  * limitations under the License.
  */
 
-#include "globals.h"
 #include "managed_register_arm.h"
+#include "globals.h"
 #include "gtest/gtest.h"
 
 namespace art {
diff --git a/compiler/utils/arm64/assembler_arm64.h b/compiler/utils/arm64/assembler_arm64.h
index 66a7fed..5b8a34e 100644
--- a/compiler/utils/arm64/assembler_arm64.h
+++ b/compiler/utils/arm64/assembler_arm64.h
@@ -23,9 +23,9 @@
 
 #include "base/arena_containers.h"
 #include "base/logging.h"
+#include "offsets.h"
 #include "utils/arm64/managed_register_arm64.h"
 #include "utils/assembler.h"
-#include "offsets.h"
 
 // TODO(VIXL): Make VIXL compile with -Wshadow.
 #pragma GCC diagnostic push
diff --git a/compiler/utils/arm64/jni_macro_assembler_arm64.h b/compiler/utils/arm64/jni_macro_assembler_arm64.h
index 264e99a..baf0434 100644
--- a/compiler/utils/arm64/jni_macro_assembler_arm64.h
+++ b/compiler/utils/arm64/jni_macro_assembler_arm64.h
@@ -25,9 +25,9 @@
 #include "base/arena_containers.h"
 #include "base/enums.h"
 #include "base/logging.h"
+#include "offsets.h"
 #include "utils/assembler.h"
 #include "utils/jni_macro_assembler.h"
-#include "offsets.h"
 
 // TODO(VIXL): Make VIXL compile with -Wshadow.
 #pragma GCC diagnostic push
diff --git a/compiler/utils/arm64/managed_register_arm64_test.cc b/compiler/utils/arm64/managed_register_arm64_test.cc
index 79076b8..2a79313 100644
--- a/compiler/utils/arm64/managed_register_arm64_test.cc
+++ b/compiler/utils/arm64/managed_register_arm64_test.cc
@@ -14,9 +14,10 @@
  * limitations under the License.
  */
 
-#include "globals.h"
-#include "assembler_arm64.h"
 #include "managed_register_arm64.h"
+
+#include "assembler_arm64.h"
+#include "globals.h"
 #include "gtest/gtest.h"
 
 namespace art {
diff --git a/compiler/utils/assembler_test.h b/compiler/utils/assembler_test.h
index f655994..ef53d72 100644
--- a/compiler/utils/assembler_test.h
+++ b/compiler/utils/assembler_test.h
@@ -19,14 +19,15 @@
 
 #include "assembler.h"
 
-#include "assembler_test_base.h"
-#include "common_runtime_test.h"  // For ScratchFile
+#include <sys/stat.h>
 
 #include <cstdio>
 #include <cstdlib>
 #include <fstream>
 #include <iterator>
-#include <sys/stat.h>
+
+#include "assembler_test_base.h"
+#include "common_runtime_test.h"  // For ScratchFile
 
 namespace art {
 
diff --git a/compiler/utils/assembler_test_base.h b/compiler/utils/assembler_test_base.h
index d76cb1c..2ef43bd 100644
--- a/compiler/utils/assembler_test_base.h
+++ b/compiler/utils/assembler_test_base.h
@@ -17,11 +17,11 @@
 #ifndef ART_COMPILER_UTILS_ASSEMBLER_TEST_BASE_H_
 #define ART_COMPILER_UTILS_ASSEMBLER_TEST_BASE_H_
 
+#include <sys/stat.h>
 #include <cstdio>
 #include <cstdlib>
 #include <fstream>
 #include <iterator>
-#include <sys/stat.h>
 
 #include "android-base/strings.h"
 
diff --git a/compiler/utils/assembler_thumb_test.cc b/compiler/utils/assembler_thumb_test.cc
index 741beab..e51b622 100644
--- a/compiler/utils/assembler_thumb_test.cc
+++ b/compiler/utils/assembler_thumb_test.cc
@@ -16,10 +16,10 @@
 
 #include <dirent.h>
 #include <errno.h>
-#include <fstream>
-#include <map>
 #include <string.h>
 #include <sys/types.h>
+#include <fstream>
+#include <map>
 
 #include "gtest/gtest.h"
 
diff --git a/compiler/utils/dedupe_set-inl.h b/compiler/utils/dedupe_set-inl.h
index c06e9ca..c866504 100644
--- a/compiler/utils/dedupe_set-inl.h
+++ b/compiler/utils/dedupe_set-inl.h
@@ -19,14 +19,15 @@
 
 #include "dedupe_set.h"
 
-#include <algorithm>
 #include <inttypes.h>
+
+#include <algorithm>
 #include <unordered_map>
 
 #include "android-base/stringprintf.h"
 
-#include "base/mutex.h"
 #include "base/hash_set.h"
+#include "base/mutex.h"
 #include "base/stl_util.h"
 #include "base/time_utils.h"
 
diff --git a/compiler/utils/dedupe_set.h b/compiler/utils/dedupe_set.h
index b62f216..3baa061 100644
--- a/compiler/utils/dedupe_set.h
+++ b/compiler/utils/dedupe_set.h
@@ -17,8 +17,8 @@
 #ifndef ART_COMPILER_UTILS_DEDUPE_SET_H_
 #define ART_COMPILER_UTILS_DEDUPE_SET_H_
 
-#include <memory>
 #include <stdint.h>
+#include <memory>
 #include <string>
 
 #include "base/macros.h"
diff --git a/compiler/utils/jni_macro_assembler_test.h b/compiler/utils/jni_macro_assembler_test.h
index 293f4cd..6129680 100644
--- a/compiler/utils/jni_macro_assembler_test.h
+++ b/compiler/utils/jni_macro_assembler_test.h
@@ -22,11 +22,12 @@
 #include "assembler_test_base.h"
 #include "common_runtime_test.h"  // For ScratchFile
 
+#include <sys/stat.h>
+
 #include <cstdio>
 #include <cstdlib>
 #include <fstream>
 #include <iterator>
-#include <sys/stat.h>
 
 namespace art {
 
diff --git a/compiler/utils/swap_space.cc b/compiler/utils/swap_space.cc
index 621a652..12d113d 100644
--- a/compiler/utils/swap_space.cc
+++ b/compiler/utils/swap_space.cc
@@ -16,9 +16,10 @@
 
 #include "swap_space.h"
 
+#include <sys/mman.h>
+
 #include <algorithm>
 #include <numeric>
-#include <sys/mman.h>
 
 #include "base/bit_utils.h"
 #include "base/logging.h"
diff --git a/compiler/utils/swap_space.h b/compiler/utils/swap_space.h
index 0ff9fc6..08e243b 100644
--- a/compiler/utils/swap_space.h
+++ b/compiler/utils/swap_space.h
@@ -17,12 +17,12 @@
 #ifndef ART_COMPILER_UTILS_SWAP_SPACE_H_
 #define ART_COMPILER_UTILS_SWAP_SPACE_H_
 
+#include <stddef.h>
+#include <stdint.h>
 #include <cstdlib>
 #include <list>
-#include <vector>
 #include <set>
-#include <stdint.h>
-#include <stddef.h>
+#include <vector>
 
 #include "base/logging.h"
 #include "base/macros.h"
diff --git a/compiler/utils/swap_space_test.cc b/compiler/utils/swap_space_test.cc
index bf50ac3..f4bca59 100644
--- a/compiler/utils/swap_space_test.cc
+++ b/compiler/utils/swap_space_test.cc
@@ -16,10 +16,12 @@
 
 #include "utils/swap_space.h"
 
-#include <cstdio>
-#include <sys/types.h>
-#include <sys/stat.h>
 #include <fcntl.h>
+#include <sys/stat.h>
+#include <sys/types.h>
+
+#include <cstdio>
+
 #include "gtest/gtest.h"
 
 #include "base/unix_file/fd_file.h"
diff --git a/compiler/utils/test_dex_file_builder.h b/compiler/utils/test_dex_file_builder.h
index 6921780..9ba3903 100644
--- a/compiler/utils/test_dex_file_builder.h
+++ b/compiler/utils/test_dex_file_builder.h
@@ -17,12 +17,13 @@
 #ifndef ART_COMPILER_UTILS_TEST_DEX_FILE_BUILDER_H_
 #define ART_COMPILER_UTILS_TEST_DEX_FILE_BUILDER_H_
 
-#include <cstring>
-#include <set>
-#include <map>
-#include <vector>
 #include <zlib.h>
 
+#include <cstring>
+#include <map>
+#include <set>
+#include <vector>
+
 #include "base/bit_utils.h"
 #include "base/logging.h"
 #include "dex_file.h"
diff --git a/compiler/utils/x86/jni_macro_assembler_x86.cc b/compiler/utils/x86/jni_macro_assembler_x86.cc
index cfdf80b..e074346 100644
--- a/compiler/utils/x86/jni_macro_assembler_x86.cc
+++ b/compiler/utils/x86/jni_macro_assembler_x86.cc
@@ -16,10 +16,10 @@
 
 #include "jni_macro_assembler_x86.h"
 
-#include "utils/assembler.h"
 #include "base/casts.h"
 #include "entrypoints/quick/quick_entrypoints.h"
 #include "thread.h"
+#include "utils/assembler.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 4fbafda..0ed5c36 100644
--- a/compiler/utils/x86/managed_register_x86_test.cc
+++ b/compiler/utils/x86/managed_register_x86_test.cc
@@ -14,8 +14,9 @@
  * limitations under the License.
  */
 
-#include "globals.h"
 #include "managed_register_x86.h"
+
+#include "globals.h"
 #include "gtest/gtest.h"
 
 namespace art {
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 2dc7581..e43d717 100644
--- a/compiler/utils/x86_64/managed_register_x86_64_test.cc
+++ b/compiler/utils/x86_64/managed_register_x86_64_test.cc
@@ -14,8 +14,8 @@
  * limitations under the License.
  */
 
-#include "globals.h"
 #include "managed_register_x86_64.h"
+#include "globals.h"
 #include "gtest/gtest.h"
 
 namespace art {
diff --git a/dex2oat/dex2oat_test.cc b/dex2oat/dex2oat_test.cc
index 68ec0b5..32877a8 100644
--- a/dex2oat/dex2oat_test.cc
+++ b/dex2oat/dex2oat_test.cc
@@ -30,9 +30,9 @@
 #include "base/macros.h"
 #include "base/mutex-inl.h"
 #include "bytecode_utils.h"
-#include "dex_file-inl.h"
 #include "dex2oat_environment_test.h"
 #include "dex2oat_return_codes.h"
+#include "dex_file-inl.h"
 #include "jit/profile_compilation_info.h"
 #include "oat.h"
 #include "oat_file.h"
diff --git a/dexdump/dexdump.cc b/dexdump/dexdump.cc
index 8437ea5..0db790b 100644
--- a/dexdump/dexdump.cc
+++ b/dexdump/dexdump.cc
@@ -44,10 +44,10 @@
 
 #include "android-base/stringprintf.h"
 
-#include "dexdump_cfg.h"
 #include "dex_file-inl.h"
 #include "dex_file_types.h"
 #include "dex_instruction-inl.h"
+#include "dexdump_cfg.h"
 
 namespace art {
 
diff --git a/dexdump/dexdump_cfg.cc b/dexdump/dexdump_cfg.cc
index 9c0429f..2831707 100644
--- a/dexdump/dexdump_cfg.cc
+++ b/dexdump/dexdump_cfg.cc
@@ -19,8 +19,9 @@
 #include "dexdump_cfg.h"
 
 #include <inttypes.h>
-#include <ostream>
+
 #include <map>
+#include <ostream>
 #include <set>
 
 #include "dex_file-inl.h"
diff --git a/dexdump/dexdump_main.cc b/dexdump/dexdump_main.cc
index 606d4f8..43c3d12 100644
--- a/dexdump/dexdump_main.cc
+++ b/dexdump/dexdump_main.cc
@@ -29,8 +29,8 @@
 #include <unistd.h>
 
 #include "base/logging.h"
-#include "runtime.h"
 #include "mem_map.h"
+#include "runtime.h"
 
 namespace art {
 
diff --git a/dexdump/dexdump_test.cc b/dexdump/dexdump_test.cc
index 640f387..b8b65d6 100644
--- a/dexdump/dexdump_test.cc
+++ b/dexdump/dexdump_test.cc
@@ -14,9 +14,9 @@
  * limitations under the License.
  */
 
+#include <sstream>
 #include <string>
 #include <vector>
-#include <sstream>
 
 #include <sys/types.h>
 #include <unistd.h>
diff --git a/dexlayout/dex_ir.h b/dexlayout/dex_ir.h
index fe74572..9c887b9 100644
--- a/dexlayout/dex_ir.h
+++ b/dexlayout/dex_ir.h
@@ -19,9 +19,10 @@
 #ifndef ART_DEXLAYOUT_DEX_IR_H_
 #define ART_DEXLAYOUT_DEX_IR_H_
 
+#include <stdint.h>
+
 #include <map>
 #include <vector>
-#include <stdint.h>
 
 #include "base/stl_util.h"
 #include "dex_file-inl.h"
diff --git a/dexlayout/dexlayout.cc b/dexlayout/dexlayout.cc
index c0478bd..fd92d77 100644
--- a/dexlayout/dexlayout.cc
+++ b/dexlayout/dexlayout.cc
@@ -33,10 +33,10 @@
 
 #include "android-base/stringprintf.h"
 
-#include "dex_ir_builder.h"
 #include "dex_file-inl.h"
 #include "dex_file_verifier.h"
 #include "dex_instruction-inl.h"
+#include "dex_ir_builder.h"
 #include "dex_verify.h"
 #include "dex_visualize.h"
 #include "dex_writer.h"
diff --git a/dexlayout/dexlayout_main.cc b/dexlayout/dexlayout_main.cc
index 33d62de..17097f1 100644
--- a/dexlayout/dexlayout_main.cc
+++ b/dexlayout/dexlayout_main.cc
@@ -22,17 +22,17 @@
 
 #include "dexlayout.h"
 
+#include <fcntl.h>
 #include <stdio.h>
 #include <string.h>
-#include <unistd.h>
-#include <sys/types.h>
 #include <sys/stat.h>
-#include <fcntl.h>
+#include <sys/types.h>
+#include <unistd.h>
 
 #include "base/logging.h"
 #include "jit/profile_compilation_info.h"
-#include "runtime.h"
 #include "mem_map.h"
+#include "runtime.h"
 
 namespace art {
 
diff --git a/dexlayout/dexlayout_test.cc b/dexlayout/dexlayout_test.cc
index 43c531d..f3b4c86 100644
--- a/dexlayout/dexlayout_test.cc
+++ b/dexlayout/dexlayout_test.cc
@@ -14,9 +14,9 @@
  * limitations under the License.
  */
 
+#include <sstream>
 #include <string>
 #include <vector>
-#include <sstream>
 
 #include <sys/types.h>
 #include <unistd.h>
diff --git a/dexlist/dexlist.cc b/dexlist/dexlist.cc
index fa232a7..6a1e22a 100644
--- a/dexlist/dexlist.cc
+++ b/dexlist/dexlist.cc
@@ -23,8 +23,8 @@
  * List all methods in all concrete classes in one or more DEX files.
  */
 
-#include <stdlib.h>
 #include <stdio.h>
+#include <stdlib.h>
 
 #include "dex_file-inl.h"
 #include "mem_map.h"
diff --git a/dexlist/dexlist_test.cc b/dexlist/dexlist_test.cc
index 173a456..f645f87 100644
--- a/dexlist/dexlist_test.cc
+++ b/dexlist/dexlist_test.cc
@@ -14,9 +14,9 @@
  * limitations under the License.
  */
 
+#include <sstream>
 #include <string>
 #include <vector>
-#include <sstream>
 
 #include <sys/types.h>
 #include <unistd.h>
diff --git a/disassembler/disassembler_arm.cc b/disassembler/disassembler_arm.cc
index 3347dac..66419e3 100644
--- a/disassembler/disassembler_arm.cc
+++ b/disassembler/disassembler_arm.cc
@@ -26,8 +26,8 @@
 
 #pragma GCC diagnostic push
 #pragma GCC diagnostic ignored "-Wshadow"
-#include "aarch32/instructions-aarch32.h"
 #include "aarch32/disasm-aarch32.h"
+#include "aarch32/instructions-aarch32.h"
 #pragma GCC diagnostic pop
 
 namespace art {
diff --git a/imgdiag/imgdiag.cc b/imgdiag/imgdiag.cc
index 5d9e361..9ac51f1 100644
--- a/imgdiag/imgdiag.cc
+++ b/imgdiag/imgdiag.cc
@@ -20,31 +20,31 @@
 #include <fstream>
 #include <functional>
 #include <iostream>
-#include <string>
-#include <vector>
-#include <set>
 #include <map>
+#include <set>
+#include <string>
 #include <unordered_set>
+#include <vector>
 
 #include "android-base/stringprintf.h"
 
 #include "art_field-inl.h"
 #include "art_method-inl.h"
 #include "base/unix_file/fd_file.h"
-#include "gc/space/image_space.h"
 #include "gc/heap.h"
+#include "gc/space/image_space.h"
+#include "image.h"
 #include "mirror/class-inl.h"
 #include "mirror/object-inl.h"
-#include "image.h"
-#include "scoped_thread_state_change-inl.h"
 #include "os.h"
+#include "scoped_thread_state_change-inl.h"
 
-#include "cmdline.h"
 #include "backtrace/BacktraceMap.h"
+#include "cmdline.h"
 
+#include <signal.h>
 #include <sys/stat.h>
 #include <sys/types.h>
-#include <signal.h>
 
 namespace art {
 
diff --git a/imgdiag/imgdiag_test.cc b/imgdiag/imgdiag_test.cc
index c948d3c..3245795 100644
--- a/imgdiag/imgdiag_test.cc
+++ b/imgdiag/imgdiag_test.cc
@@ -14,21 +14,21 @@
  * limitations under the License.
  */
 
+#include <sstream>
 #include <string>
 #include <vector>
-#include <sstream>
 
 #include "common_runtime_test.h"
 
 #include "android-base/stringprintf.h"
 
-#include "runtime/os.h"
 #include "runtime/arch/instruction_set.h"
 #include "runtime/exec_utils.h"
-#include "runtime/utils.h"
-#include "runtime/gc/space/image_space.h"
 #include "runtime/gc/heap.h"
+#include "runtime/gc/space/image_space.h"
+#include "runtime/os.h"
 #include "runtime/runtime.h"
+#include "runtime/utils.h"
 
 #include <sys/types.h>
 #include <unistd.h>
diff --git a/patchoat/patchoat.cc b/patchoat/patchoat.cc
index 1ee2fbd..ed7623a 100644
--- a/patchoat/patchoat.cc
+++ b/patchoat/patchoat.cc
@@ -35,17 +35,17 @@
 #include "base/stringpiece.h"
 #include "base/unix_file/fd_file.h"
 #include "base/unix_file/random_access_file_utils.h"
-#include "elf_utils.h"
 #include "elf_file.h"
 #include "elf_file_impl.h"
+#include "elf_utils.h"
 #include "gc/space/image_space.h"
 #include "image-inl.h"
 #include "intern_table.h"
 #include "mirror/dex_cache.h"
 #include "mirror/executable.h"
+#include "mirror/method.h"
 #include "mirror/object-inl.h"
 #include "mirror/object-refvisitor-inl.h"
-#include "mirror/method.h"
 #include "mirror/reference.h"
 #include "noop_compiler_callbacks.h"
 #include "offsets.h"
diff --git a/patchoat/patchoat.h b/patchoat/patchoat.h
index 182ce94..d4c5a10 100644
--- a/patchoat/patchoat.h
+++ b/patchoat/patchoat.h
@@ -24,8 +24,8 @@
 #include "elf_file.h"
 #include "elf_utils.h"
 #include "gc/accounting/space_bitmap.h"
-#include "gc/space/image_space.h"
 #include "gc/heap.h"
+#include "gc/space/image_space.h"
 #include "os.h"
 #include "runtime.h"
 
diff --git a/profman/profman.cc b/profman/profman.cc
index 6c8ca56..fd3bd11 100644
--- a/profman/profman.cc
+++ b/profman/profman.cc
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-#include "errno.h"
+#include <errno.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <sys/file.h>
@@ -44,7 +44,6 @@
 #include "runtime.h"
 #include "type_reference.h"
 #include "utils.h"
-#include "type_reference.h"
 #include "zip_archive.h"
 
 namespace art {
diff --git a/runtime/arch/arch_test.cc b/runtime/arch/arch_test.cc
index dd98f51..bfac8c4 100644
--- a/runtime/arch/arch_test.cc
+++ b/runtime/arch/arch_test.cc
@@ -21,7 +21,6 @@
 #include "common_runtime_test.h"
 #include "quick/quick_method_frame_info.h"
 
-
 // asm_support.h declares tests next to the #defines. We use asm_support_check.h to (safely)
 // generate CheckAsmSupportOffsetsAndSizes using gtest's EXPECT for the tests. We also use the
 // RETURN_TYPE, HEADER and FOOTER defines from asm_support_check.h to try to ensure that any
diff --git a/runtime/arch/arm/entrypoints_init_arm.cc b/runtime/arch/arm/entrypoints_init_arm.cc
index 8a8d264..090bab7 100644
--- a/runtime/arch/arm/entrypoints_init_arm.cc
+++ b/runtime/arch/arm/entrypoints_init_arm.cc
@@ -19,13 +19,13 @@
 
 #include "arch/arm/asm_support_arm.h"
 #include "base/bit_utils.h"
+#include "entrypoints/entrypoint_utils.h"
 #include "entrypoints/jni/jni_entrypoints.h"
+#include "entrypoints/math_entrypoints.h"
 #include "entrypoints/quick/quick_alloc_entrypoints.h"
 #include "entrypoints/quick/quick_default_externs.h"
 #include "entrypoints/quick/quick_default_init_entrypoints.h"
 #include "entrypoints/quick/quick_entrypoints.h"
-#include "entrypoints/entrypoint_utils.h"
-#include "entrypoints/math_entrypoints.h"
 #include "entrypoints/runtime_asm_entrypoints.h"
 #include "interpreter/interpreter.h"
 
diff --git a/runtime/arch/arm/fault_handler_arm.cc b/runtime/arch/arm/fault_handler_arm.cc
index b4bca01..5c31378 100644
--- a/runtime/arch/arm/fault_handler_arm.cc
+++ b/runtime/arch/arm/fault_handler_arm.cc
@@ -14,7 +14,6 @@
  * limitations under the License.
  */
 
-
 #include "fault_handler.h"
 
 #include <sys/ucontext.h>
diff --git a/runtime/arch/arm/instruction_set_features_arm.cc b/runtime/arch/arm/instruction_set_features_arm.cc
index 0942356..2496968 100644
--- a/runtime/arch/arm/instruction_set_features_arm.cc
+++ b/runtime/arch/arm/instruction_set_features_arm.cc
@@ -17,11 +17,12 @@
 #include "instruction_set_features_arm.h"
 
 #if defined(ART_TARGET_ANDROID) && defined(__arm__)
-#include <sys/auxv.h>
 #include <asm/hwcap.h>
+#include <sys/auxv.h>
 #endif
 
 #include "signal.h"
+
 #include <fstream>
 
 #include "android-base/stringprintf.h"
diff --git a/runtime/arch/arm64/entrypoints_init_arm64.cc b/runtime/arch/arm64/entrypoints_init_arm64.cc
index 9bbcef3..d270bdb 100644
--- a/runtime/arch/arm64/entrypoints_init_arm64.cc
+++ b/runtime/arch/arm64/entrypoints_init_arm64.cc
@@ -19,13 +19,13 @@
 
 #include "arch/arm64/asm_support_arm64.h"
 #include "base/bit_utils.h"
+#include "entrypoints/entrypoint_utils.h"
 #include "entrypoints/jni/jni_entrypoints.h"
+#include "entrypoints/math_entrypoints.h"
 #include "entrypoints/quick/quick_alloc_entrypoints.h"
 #include "entrypoints/quick/quick_default_externs.h"
 #include "entrypoints/quick/quick_default_init_entrypoints.h"
 #include "entrypoints/quick/quick_entrypoints.h"
-#include "entrypoints/entrypoint_utils.h"
-#include "entrypoints/math_entrypoints.h"
 #include "entrypoints/runtime_asm_entrypoints.h"
 #include "interpreter/interpreter.h"
 
diff --git a/runtime/arch/arm64/fault_handler_arm64.cc b/runtime/arch/arm64/fault_handler_arm64.cc
index 0ead732..b9f9d55 100644
--- a/runtime/arch/arm64/fault_handler_arm64.cc
+++ b/runtime/arch/arm64/fault_handler_arm64.cc
@@ -14,7 +14,6 @@
  * limitations under the License.
  */
 
-
 #include "fault_handler.h"
 
 #include <sys/ucontext.h>
diff --git a/runtime/arch/instruction_set_features.cc b/runtime/arch/instruction_set_features.cc
index 43c1711..ed8ff60 100644
--- a/runtime/arch/instruction_set_features.cc
+++ b/runtime/arch/instruction_set_features.cc
@@ -21,7 +21,6 @@
 #include "base/casts.h"
 #include "utils.h"
 
-
 #include "arm/instruction_set_features_arm.h"
 #include "arm64/instruction_set_features_arm64.h"
 #include "mips/instruction_set_features_mips.h"
diff --git a/runtime/arch/memcmp16_test.cc b/runtime/arch/memcmp16_test.cc
index 9ba7de1..2f3639c 100644
--- a/runtime/arch/memcmp16_test.cc
+++ b/runtime/arch/memcmp16_test.cc
@@ -14,9 +14,10 @@
  * limitations under the License.
  */
 
-#include "gtest/gtest.h"
 #include "memcmp16.h"
 
+#include "gtest/gtest.h"
+
 class RandGen {
  public:
   explicit RandGen(uint32_t seed) : val_(seed) {}
diff --git a/runtime/arch/mips/entrypoints_init_mips.cc b/runtime/arch/mips/entrypoints_init_mips.cc
index 3010246..75cfc41 100644
--- a/runtime/arch/mips/entrypoints_init_mips.cc
+++ b/runtime/arch/mips/entrypoints_init_mips.cc
@@ -18,12 +18,12 @@
 
 #include "arch/mips/asm_support_mips.h"
 #include "atomic.h"
+#include "entrypoints/entrypoint_utils.h"
 #include "entrypoints/jni/jni_entrypoints.h"
+#include "entrypoints/math_entrypoints.h"
 #include "entrypoints/quick/quick_alloc_entrypoints.h"
 #include "entrypoints/quick/quick_default_externs.h"
 #include "entrypoints/quick/quick_entrypoints.h"
-#include "entrypoints/entrypoint_utils.h"
-#include "entrypoints/math_entrypoints.h"
 #include "entrypoints/runtime_asm_entrypoints.h"
 #include "entrypoints_direct_mips.h"
 #include "interpreter/interpreter.h"
diff --git a/runtime/arch/mips/fault_handler_mips.cc b/runtime/arch/mips/fault_handler_mips.cc
index 52a3df5..bf3e96a 100644
--- a/runtime/arch/mips/fault_handler_mips.cc
+++ b/runtime/arch/mips/fault_handler_mips.cc
@@ -14,8 +14,8 @@
  * limitations under the License.
  */
 
-#include "fault_handler.h"
 #include <sys/ucontext.h>
+#include "fault_handler.h"
 
 #include "art_method.h"
 #include "base/callee_save_type.h"
diff --git a/runtime/arch/mips64/entrypoints_init_mips64.cc b/runtime/arch/mips64/entrypoints_init_mips64.cc
index 5e58827..15b3e38 100644
--- a/runtime/arch/mips64/entrypoints_init_mips64.cc
+++ b/runtime/arch/mips64/entrypoints_init_mips64.cc
@@ -19,13 +19,13 @@
 
 #include "arch/mips64/asm_support_mips64.h"
 #include "atomic.h"
+#include "entrypoints/entrypoint_utils.h"
 #include "entrypoints/jni/jni_entrypoints.h"
+#include "entrypoints/math_entrypoints.h"
 #include "entrypoints/quick/quick_alloc_entrypoints.h"
 #include "entrypoints/quick/quick_default_externs.h"
 #include "entrypoints/quick/quick_default_init_entrypoints.h"
 #include "entrypoints/quick/quick_entrypoints.h"
-#include "entrypoints/entrypoint_utils.h"
-#include "entrypoints/math_entrypoints.h"
 #include "entrypoints/runtime_asm_entrypoints.h"
 #include "interpreter/interpreter.h"
 
diff --git a/runtime/arch/x86/fault_handler_x86.cc b/runtime/arch/x86/fault_handler_x86.cc
index 798c500..349ce3b 100644
--- a/runtime/arch/x86/fault_handler_x86.cc
+++ b/runtime/arch/x86/fault_handler_x86.cc
@@ -14,7 +14,6 @@
  * limitations under the License.
  */
 
-
 #include "fault_handler.h"
 
 #include <sys/ucontext.h>
diff --git a/runtime/arch/x86_64/entrypoints_init_x86_64.cc b/runtime/arch/x86_64/entrypoints_init_x86_64.cc
index 1e56e8a..5f7380f 100644
--- a/runtime/arch/x86_64/entrypoints_init_x86_64.cc
+++ b/runtime/arch/x86_64/entrypoints_init_x86_64.cc
@@ -17,13 +17,13 @@
 #include <math.h>
 
 #include "entrypoints/jni/jni_entrypoints.h"
+#include "entrypoints/math_entrypoints.h"
 #include "entrypoints/quick/quick_alloc_entrypoints.h"
 #include "entrypoints/quick/quick_default_externs.h"
 #if !defined(__APPLE__)
 #include "entrypoints/quick/quick_default_init_entrypoints.h"
 #endif
 #include "entrypoints/quick/quick_entrypoints.h"
-#include "entrypoints/math_entrypoints.h"
 #include "entrypoints/runtime_asm_entrypoints.h"
 #include "interpreter/interpreter.h"
 
diff --git a/runtime/art_field-inl.h b/runtime/art_field-inl.h
index a8a58e1..057f58c 100644
--- a/runtime/art_field-inl.h
+++ b/runtime/art_field-inl.h
@@ -22,14 +22,14 @@
 #include "base/logging.h"
 #include "class_linker.h"
 #include "dex_file-inl.h"
-#include "gc_root-inl.h"
 #include "gc/accounting/card_table-inl.h"
+#include "gc_root-inl.h"
 #include "jvalue.h"
 #include "mirror/dex_cache-inl.h"
 #include "mirror/object-inl.h"
 #include "primitive.h"
-#include "thread-current-inl.h"
 #include "scoped_thread_state_change-inl.h"
+#include "thread-current-inl.h"
 #include "well_known_classes.h"
 
 namespace art {
diff --git a/runtime/art_method-inl.h b/runtime/art_method-inl.h
index 4300544..9a9f125 100644
--- a/runtime/art_method-inl.h
+++ b/runtime/art_method-inl.h
@@ -24,9 +24,9 @@
 #include "base/logging.h"
 #include "class_linker-inl.h"
 #include "common_throws.h"
+#include "dex_file-inl.h"
 #include "dex_file.h"
 #include "dex_file_annotations.h"
-#include "dex_file-inl.h"
 #include "gc_root-inl.h"
 #include "invoke_type.h"
 #include "jit/profiling_info.h"
diff --git a/runtime/art_method.cc b/runtime/art_method.cc
index d8984e8..631f5e7 100644
--- a/runtime/art_method.cc
+++ b/runtime/art_method.cc
@@ -38,8 +38,8 @@
 #include "mirror/class-inl.h"
 #include "mirror/class_ext.h"
 #include "mirror/executable.h"
-#include "mirror/object_array-inl.h"
 #include "mirror/object-inl.h"
+#include "mirror/object_array-inl.h"
 #include "mirror/string.h"
 #include "oat_file-inl.h"
 #include "runtime_callbacks.h"
diff --git a/runtime/asm_support_check.h b/runtime/asm_support_check.h
index cc6a578..3163506 100644
--- a/runtime/asm_support_check.h
+++ b/runtime/asm_support_check.h
@@ -28,10 +28,10 @@
 #include "mirror/class.h"
 #include "mirror/dex_cache.h"
 #include "mirror/string.h"
-#include "utils/dex_cache_arrays_layout.h"
 #include "runtime.h"
 #include "stack.h"
 #include "thread.h"
+#include "utils/dex_cache_arrays_layout.h"
 
 #ifndef ADD_TEST_EQ
 #define ADD_TEST_EQ(x, y) CHECK_EQ(x, y);
diff --git a/runtime/barrier_test.cc b/runtime/barrier_test.cc
index 25b6925..ecdabba 100644
--- a/runtime/barrier_test.cc
+++ b/runtime/barrier_test.cc
@@ -21,8 +21,8 @@
 #include "atomic.h"
 #include "common_runtime_test.h"
 #include "mirror/object_array-inl.h"
-#include "thread_pool.h"
 #include "thread-current-inl.h"
+#include "thread_pool.h"
 
 namespace art {
 class CheckWaitTask : public Task {
diff --git a/runtime/base/arena_allocator.cc b/runtime/base/arena_allocator.cc
index 54b40f2..148ef86 100644
--- a/runtime/base/arena_allocator.cc
+++ b/runtime/base/arena_allocator.cc
@@ -26,8 +26,8 @@
 #include "logging.h"
 #include "mem_map.h"
 #include "mutex.h"
-#include "thread-current-inl.h"
 #include "systrace.h"
+#include "thread-current-inl.h"
 
 namespace art {
 
diff --git a/runtime/base/arena_allocator.h b/runtime/base/arena_allocator.h
index a484c5c..0b1a3ba 100644
--- a/runtime/base/arena_allocator.h
+++ b/runtime/base/arena_allocator.h
@@ -17,8 +17,8 @@
 #ifndef ART_RUNTIME_BASE_ARENA_ALLOCATOR_H_
 #define ART_RUNTIME_BASE_ARENA_ALLOCATOR_H_
 
-#include <stdint.h>
 #include <stddef.h>
+#include <stdint.h>
 
 #include "base/bit_utils.h"
 #include "base/dchecked_vector.h"
diff --git a/runtime/base/array_slice.h b/runtime/base/array_slice.h
index 0da977d..a7bce7d 100644
--- a/runtime/base/array_slice.h
+++ b/runtime/base/array_slice.h
@@ -17,10 +17,10 @@
 #ifndef ART_RUNTIME_BASE_ARRAY_SLICE_H_
 #define ART_RUNTIME_BASE_ARRAY_SLICE_H_
 
-#include "stride_iterator.h"
 #include "base/bit_utils.h"
 #include "base/casts.h"
 #include "base/iteration_range.h"
+#include "stride_iterator.h"
 
 namespace art {
 
diff --git a/runtime/base/casts.h b/runtime/base/casts.h
index c5b0af6..0cbabba 100644
--- a/runtime/base/casts.h
+++ b/runtime/base/casts.h
@@ -18,9 +18,10 @@
 #define ART_RUNTIME_BASE_CASTS_H_
 
 #include <assert.h>
-#include <limits>
 #include <stdint.h>
 #include <string.h>
+
+#include <limits>
 #include <type_traits>
 
 #include "base/logging.h"
diff --git a/runtime/base/hash_set.h b/runtime/base/hash_set.h
index a22efcf..c472a9e 100644
--- a/runtime/base/hash_set.h
+++ b/runtime/base/hash_set.h
@@ -17,10 +17,11 @@
 #ifndef ART_RUNTIME_BASE_HASH_SET_H_
 #define ART_RUNTIME_BASE_HASH_SET_H_
 
+#include <stdint.h>
+
 #include <functional>
 #include <iterator>
 #include <memory>
-#include <stdint.h>
 #include <utility>
 
 #include "bit_utils.h"
diff --git a/runtime/base/hash_set_test.cc b/runtime/base/hash_set_test.cc
index 8254063..31b28eb 100644
--- a/runtime/base/hash_set_test.cc
+++ b/runtime/base/hash_set_test.cc
@@ -16,8 +16,8 @@
 
 #include "hash_set.h"
 
-#include <map>
 #include <forward_list>
+#include <map>
 #include <sstream>
 #include <string>
 #include <unordered_set>
diff --git a/runtime/base/histogram.h b/runtime/base/histogram.h
index 0e3bc8e..e0c921e 100644
--- a/runtime/base/histogram.h
+++ b/runtime/base/histogram.h
@@ -16,8 +16,8 @@
 #ifndef ART_RUNTIME_BASE_HISTOGRAM_H_
 #define ART_RUNTIME_BASE_HISTOGRAM_H_
 
-#include <vector>
 #include <string>
+#include <vector>
 
 #include "base/logging.h"
 
diff --git a/runtime/base/length_prefixed_array.h b/runtime/base/length_prefixed_array.h
index a570b81..2df5a99 100644
--- a/runtime/base/length_prefixed_array.h
+++ b/runtime/base/length_prefixed_array.h
@@ -20,10 +20,10 @@
 #include <stddef.h>  // for offsetof()
 #include <string.h>  // for memset()
 
-#include "stride_iterator.h"
 #include "base/bit_utils.h"
 #include "base/casts.h"
 #include "base/iteration_range.h"
+#include "stride_iterator.h"
 
 namespace art {
 
diff --git a/runtime/base/memory_tool.h b/runtime/base/memory_tool.h
index 42cbaa0..223c1de 100644
--- a/runtime/base/memory_tool.h
+++ b/runtime/base/memory_tool.h
@@ -52,8 +52,8 @@
 
 #else
 
-#include <valgrind.h>
 #include <memcheck/memcheck.h>
+#include <valgrind.h>
 #define MEMORY_TOOL_MAKE_NOACCESS(p, s) VALGRIND_MAKE_MEM_NOACCESS(p, s)
 #define MEMORY_TOOL_MAKE_UNDEFINED(p, s) VALGRIND_MAKE_MEM_UNDEFINED(p, s)
 #define MEMORY_TOOL_MAKE_DEFINED(p, s) VALGRIND_MAKE_MEM_DEFINED(p, s)
diff --git a/runtime/base/mutex.cc b/runtime/base/mutex.cc
index 03dda12..6392198 100644
--- a/runtime/base/mutex.cc
+++ b/runtime/base/mutex.cc
@@ -23,8 +23,8 @@
 
 #include "atomic.h"
 #include "base/logging.h"
-#include "base/time_utils.h"
 #include "base/systrace.h"
+#include "base/time_utils.h"
 #include "base/value_object.h"
 #include "mutex-inl.h"
 #include "scoped_thread_state_change-inl.h"
diff --git a/runtime/base/safe_copy.cc b/runtime/base/safe_copy.cc
index 06249ac..c76ea11 100644
--- a/runtime/base/safe_copy.cc
+++ b/runtime/base/safe_copy.cc
@@ -16,9 +16,9 @@
 
 #include "safe_copy.h"
 
-#include <unistd.h>
 #include <sys/uio.h>
 #include <sys/user.h>
+#include <unistd.h>
 
 #include <algorithm>
 
diff --git a/runtime/base/scoped_arena_containers.h b/runtime/base/scoped_arena_containers.h
index 7964705..4a6c907 100644
--- a/runtime/base/scoped_arena_containers.h
+++ b/runtime/base/scoped_arena_containers.h
@@ -26,8 +26,8 @@
 
 #include "arena_containers.h"  // For ArenaAllocatorAdapterKind.
 #include "base/dchecked_vector.h"
-#include "scoped_arena_allocator.h"
 #include "safe_map.h"
+#include "scoped_arena_allocator.h"
 
 namespace art {
 
diff --git a/runtime/base/systrace.h b/runtime/base/systrace.h
index 3901f96..06db48a 100644
--- a/runtime/base/systrace.h
+++ b/runtime/base/systrace.h
@@ -19,9 +19,10 @@
 
 #define ATRACE_TAG ATRACE_TAG_DALVIK
 #include <cutils/trace.h>
-#include <string>
 #include <utils/Trace.h>
 
+#include <string>
+
 namespace art {
 
 class ScopedTrace {
diff --git a/runtime/base/time_utils.h b/runtime/base/time_utils.h
index dbb8bcd..919937f 100644
--- a/runtime/base/time_utils.h
+++ b/runtime/base/time_utils.h
@@ -18,9 +18,10 @@
 #define ART_RUNTIME_BASE_TIME_UTILS_H_
 
 #include <stdint.h>
-#include <string>
 #include <time.h>
 
+#include <string>
+
 #include "base/macros.h"
 
 namespace art {
diff --git a/runtime/base/timing_logger.cc b/runtime/base/timing_logger.cc
index aaa2431..b2e5251 100644
--- a/runtime/base/timing_logger.cc
+++ b/runtime/base/timing_logger.cc
@@ -14,14 +14,13 @@
  * limitations under the License.
  */
 
-
 #include <stdio.h>
 
 #include "timing_logger.h"
 
+#include "base/histogram-inl.h"
 #include "base/logging.h"
 #include "base/stl_util.h"
-#include "base/histogram-inl.h"
 #include "base/systrace.h"
 #include "base/time_utils.h"
 #include "gc/heap.h"
diff --git a/runtime/base/unix_file/fd_file.cc b/runtime/base/unix_file/fd_file.cc
index 00b5567..0c73ce7 100644
--- a/runtime/base/unix_file/fd_file.cc
+++ b/runtime/base/unix_file/fd_file.cc
@@ -17,11 +17,12 @@
 #include "base/unix_file/fd_file.h"
 
 #include <errno.h>
-#include <limits>
 #include <sys/stat.h>
 #include <sys/types.h>
 #include <unistd.h>
 
+#include <limits>
+
 #include "base/logging.h"
 
 // Includes needed for FdFile::Copy().
diff --git a/runtime/base/unix_file/fd_file.h b/runtime/base/unix_file/fd_file.h
index eb85c4f..e07c3fd 100644
--- a/runtime/base/unix_file/fd_file.h
+++ b/runtime/base/unix_file/fd_file.h
@@ -21,8 +21,8 @@
 
 #include <string>
 
-#include "base/unix_file/random_access_file.h"
 #include "base/macros.h"
+#include "base/unix_file/random_access_file.h"
 
 namespace unix_file {
 
diff --git a/runtime/base/unix_file/random_access_file_utils.cc b/runtime/base/unix_file/random_access_file_utils.cc
index df3b308..aae65c1 100644
--- a/runtime/base/unix_file/random_access_file_utils.cc
+++ b/runtime/base/unix_file/random_access_file_utils.cc
@@ -14,8 +14,10 @@
  * limitations under the License.
  */
 
-#include <vector>
 #include "base/unix_file/random_access_file_utils.h"
+
+#include <vector>
+
 #include "base/unix_file/random_access_file.h"
 
 namespace unix_file {
diff --git a/runtime/bytecode_utils.h b/runtime/bytecode_utils.h
index fa87b1d..b6a3c03 100644
--- a/runtime/bytecode_utils.h
+++ b/runtime/bytecode_utils.h
@@ -18,8 +18,8 @@
 #define ART_RUNTIME_BYTECODE_UTILS_H_
 
 #include "base/arena_object.h"
-#include "dex_file.h"
 #include "dex_file-inl.h"
+#include "dex_file.h"
 #include "dex_instruction-inl.h"
 
 namespace art {
diff --git a/runtime/cha.h b/runtime/cha.h
index 81458db..1af3161 100644
--- a/runtime/cha.h
+++ b/runtime/cha.h
@@ -17,13 +17,14 @@
 #ifndef ART_RUNTIME_CHA_H_
 #define ART_RUNTIME_CHA_H_
 
+#include <unordered_map>
+#include <unordered_set>
+
 #include "base/enums.h"
 #include "base/mutex.h"
 #include "handle.h"
 #include "mirror/class.h"
 #include "oat_quick_method_header.h"
-#include <unordered_map>
-#include <unordered_set>
 
 namespace art {
 
diff --git a/runtime/check_jni.cc b/runtime/check_jni.cc
index 1c3328e..c3dd702 100644
--- a/runtime/check_jni.cc
+++ b/runtime/check_jni.cc
@@ -16,18 +16,19 @@
 
 #include "check_jni.h"
 
-#include <iomanip>
 #include <sys/mman.h>
 #include <zlib.h>
 
+#include <iomanip>
+
 #include "android-base/stringprintf.h"
 
 #include "art_field-inl.h"
 #include "art_method-inl.h"
 #include "base/logging.h"
 #include "base/to_str.h"
-#include "class_linker.h"
 #include "class_linker-inl.h"
+#include "class_linker.h"
 #include "dex_file-inl.h"
 #include "gc/space/space.h"
 #include "java_vm_ext.h"
diff --git a/runtime/class_linker-inl.h b/runtime/class_linker-inl.h
index 9a73697..0096c37 100644
--- a/runtime/class_linker-inl.h
+++ b/runtime/class_linker-inl.h
@@ -19,14 +19,14 @@
 
 #include "art_field.h"
 #include "class_linker.h"
-#include "gc_root-inl.h"
 #include "gc/heap-inl.h"
-#include "obj_ptr-inl.h"
+#include "gc_root-inl.h"
+#include "handle_scope-inl.h"
 #include "mirror/class_loader.h"
 #include "mirror/dex_cache-inl.h"
 #include "mirror/iftable.h"
 #include "mirror/object_array-inl.h"
-#include "handle_scope-inl.h"
+#include "obj_ptr-inl.h"
 #include "scoped_thread_state_change-inl.h"
 
 #include <atomic>
diff --git a/runtime/class_linker.cc b/runtime/class_linker.cc
index 9e3e76c..c5e11f1 100644
--- a/runtime/class_linker.cc
+++ b/runtime/class_linker.cc
@@ -16,6 +16,8 @@
 
 #include "class_linker.h"
 
+#include <unistd.h>
+
 #include <algorithm>
 #include <deque>
 #include <iostream>
@@ -24,7 +26,6 @@
 #include <queue>
 #include <string>
 #include <tuple>
-#include <unistd.h>
 #include <unordered_map>
 #include <utility>
 #include <vector>
diff --git a/runtime/class_linker_test.cc b/runtime/class_linker_test.cc
index 39d77f0..5e9707c 100644
--- a/runtime/class_linker_test.cc
+++ b/runtime/class_linker_test.cc
@@ -28,9 +28,10 @@
 #include "common_runtime_test.h"
 #include "dex_file.h"
 #include "dex_file_types.h"
-#include "experimental_flags.h"
 #include "entrypoints/entrypoint_utils-inl.h"
+#include "experimental_flags.h"
 #include "gc/heap.h"
+#include "handle_scope-inl.h"
 #include "mirror/accessible_object.h"
 #include "mirror/call_site.h"
 #include "mirror/class-inl.h"
@@ -39,16 +40,15 @@
 #include "mirror/emulated_stack_frame.h"
 #include "mirror/executable.h"
 #include "mirror/field.h"
-#include "mirror/method_type.h"
 #include "mirror/method_handle_impl.h"
 #include "mirror/method_handles_lookup.h"
+#include "mirror/method_type.h"
 #include "mirror/object-inl.h"
 #include "mirror/object_array-inl.h"
 #include "mirror/proxy.h"
 #include "mirror/reference.h"
 #include "mirror/stack_trace_element.h"
 #include "mirror/string-inl.h"
-#include "handle_scope-inl.h"
 #include "scoped_thread_state_change-inl.h"
 #include "thread-current-inl.h"
 
diff --git a/runtime/class_loader_context_test.cc b/runtime/class_loader_context_test.cc
index a87552d..5655aec 100644
--- a/runtime/class_loader_context_test.cc
+++ b/runtime/class_loader_context_test.cc
@@ -16,7 +16,6 @@
 
 #include <gtest/gtest.h>
 
-
 #include "class_loader_context.h"
 #include "common_runtime_test.h"
 
diff --git a/runtime/common_runtime_test.cc b/runtime/common_runtime_test.cc
index 7e762c3..29b376a 100644
--- a/runtime/common_runtime_test.cc
+++ b/runtime/common_runtime_test.cc
@@ -16,12 +16,12 @@
 
 #include "common_runtime_test.h"
 
-#include <cstdio>
 #include <dirent.h>
 #include <dlfcn.h>
 #include <fcntl.h>
-#include "nativehelper/ScopedLocalRef.h"
 #include <stdlib.h>
+#include <cstdio>
+#include "nativehelper/ScopedLocalRef.h"
 
 #include "../../external/icu/icu4c/source/common/unicode/uvernum.h"
 #include "android-base/stringprintf.h"
diff --git a/runtime/debugger.h b/runtime/debugger.h
index 4f3ff40..0be46d6 100644
--- a/runtime/debugger.h
+++ b/runtime/debugger.h
@@ -27,8 +27,8 @@
 #include <string>
 #include <vector>
 
-#include "gc_root.h"
 #include "class_linker.h"
+#include "gc_root.h"
 #include "handle.h"
 #include "jdwp/jdwp.h"
 #include "jni.h"
diff --git a/runtime/dex_file_verifier_test.cc b/runtime/dex_file_verifier_test.cc
index 0e58e6d..e2770d1 100644
--- a/runtime/dex_file_verifier_test.cc
+++ b/runtime/dex_file_verifier_test.cc
@@ -16,14 +16,15 @@
 
 #include "dex_file_verifier.h"
 
-#include "sys/mman.h"
-#include "zlib.h"
+#include <sys/mman.h>
+#include <zlib.h>
+
 #include <functional>
 #include <memory>
 
-#include "base/unix_file/fd_file.h"
 #include "base/bit_utils.h"
 #include "base/macros.h"
+#include "base/unix_file/fd_file.h"
 #include "common_runtime_test.h"
 #include "dex_file-inl.h"
 #include "dex_file_types.h"
diff --git a/runtime/dex_reference_collection.h b/runtime/dex_reference_collection.h
index 01b9b97..047771f 100644
--- a/runtime/dex_reference_collection.h
+++ b/runtime/dex_reference_collection.h
@@ -17,10 +17,10 @@
 #ifndef ART_RUNTIME_DEX_REFERENCE_COLLECTION_H_
 #define ART_RUNTIME_DEX_REFERENCE_COLLECTION_H_
 
-#include "base/macros.h"
-
-#include <vector>
 #include <map>
+#include <vector>
+
+#include "base/macros.h"
 
 namespace art {
 
diff --git a/runtime/entrypoints/entrypoint_utils.h b/runtime/entrypoints/entrypoint_utils.h
index fe85887..4f90908 100644
--- a/runtime/entrypoints/entrypoint_utils.h
+++ b/runtime/entrypoints/entrypoint_utils.h
@@ -23,8 +23,8 @@
 #include "base/callee_save_type.h"
 #include "base/macros.h"
 #include "base/mutex.h"
-#include "dex_instruction.h"
 #include "dex_file_types.h"
+#include "dex_instruction.h"
 #include "gc/allocator_type.h"
 #include "handle.h"
 #include "invoke_type.h"
diff --git a/runtime/entrypoints/quick/quick_alloc_entrypoints.cc b/runtime/entrypoints/quick/quick_alloc_entrypoints.cc
index 582f0cf..b8d96af 100644
--- a/runtime/entrypoints/quick/quick_alloc_entrypoints.cc
+++ b/runtime/entrypoints/quick/quick_alloc_entrypoints.cc
@@ -22,8 +22,8 @@
 #include "dex_file_types.h"
 #include "entrypoints/entrypoint_utils-inl.h"
 #include "mirror/class-inl.h"
-#include "mirror/object_array-inl.h"
 #include "mirror/object-inl.h"
+#include "mirror/object_array-inl.h"
 
 namespace art {
 
diff --git a/runtime/entrypoints/quick/quick_dexcache_entrypoints.cc b/runtime/entrypoints/quick/quick_dexcache_entrypoints.cc
index fe56543..a2a6e08 100644
--- a/runtime/entrypoints/quick/quick_dexcache_entrypoints.cc
+++ b/runtime/entrypoints/quick/quick_dexcache_entrypoints.cc
@@ -17,16 +17,16 @@
 #include "art_method-inl.h"
 #include "base/callee_save_type.h"
 #include "callee_save_frame.h"
-#include "entrypoints/entrypoint_utils-inl.h"
 #include "class_linker-inl.h"
 #include "class_table-inl.h"
 #include "dex_file-inl.h"
 #include "dex_file_types.h"
+#include "entrypoints/entrypoint_utils-inl.h"
 #include "gc/heap.h"
 #include "mirror/class-inl.h"
 #include "mirror/class_loader.h"
-#include "mirror/object_array-inl.h"
 #include "mirror/object-inl.h"
+#include "mirror/object_array-inl.h"
 #include "oat_file.h"
 #include "runtime.h"
 
diff --git a/runtime/entrypoints/quick/quick_entrypoints_enum.h b/runtime/entrypoints/quick/quick_entrypoints_enum.h
index abf2c34..1cf7f8d 100644
--- a/runtime/entrypoints/quick/quick_entrypoints_enum.h
+++ b/runtime/entrypoints/quick/quick_entrypoints_enum.h
@@ -24,8 +24,7 @@
 namespace art {
 
 // Define an enum for the entrypoints. Names are prepended a 'kQuick'.
-enum QuickEntrypointEnum
-{  // NOLINT(whitespace/braces)
+enum QuickEntrypointEnum {  // NOLINT(whitespace/braces)
 #define ENTRYPOINT_ENUM(name, rettype, ...) kQuick ## name,
 #include "quick_entrypoints_list.h"
   QUICK_ENTRYPOINT_LIST(ENTRYPOINT_ENUM)
@@ -58,7 +57,7 @@
 #define ENTRYPOINT_ENUM(name, ...) \
 template <> inline void CheckEntrypointTypes<kQuick ## name, __VA_ARGS__>() {};  // NOLINT [readability/braces] [4]
 #include "quick_entrypoints_list.h"
-  QUICK_ENTRYPOINT_LIST(ENTRYPOINT_ENUM)
+QUICK_ENTRYPOINT_LIST(ENTRYPOINT_ENUM)
 #undef QUICK_ENTRYPOINT_LIST
 #undef ENTRYPOINT_ENUM
 
diff --git a/runtime/entrypoints/quick/quick_fillarray_entrypoints.cc b/runtime/entrypoints/quick/quick_fillarray_entrypoints.cc
index f63c9c2..d4bc1c7 100644
--- a/runtime/entrypoints/quick/quick_fillarray_entrypoints.cc
+++ b/runtime/entrypoints/quick/quick_fillarray_entrypoints.cc
@@ -16,8 +16,8 @@
 
 #include "art_method-inl.h"
 #include "callee_save_frame.h"
-#include "mirror/array.h"
 #include "entrypoints/entrypoint_utils.h"
+#include "mirror/array.h"
 
 namespace art {
 
diff --git a/runtime/entrypoints/quick/quick_trampoline_entrypoints.cc b/runtime/entrypoints/quick/quick_trampoline_entrypoints.cc
index 3061365..6250d9f 100644
--- a/runtime/entrypoints/quick/quick_trampoline_entrypoints.cc
+++ b/runtime/entrypoints/quick/quick_trampoline_entrypoints.cc
@@ -27,8 +27,8 @@
 #include "gc/accounting/card_table-inl.h"
 #include "imt_conflict_table.h"
 #include "imtable-inl.h"
-#include "interpreter/interpreter.h"
 #include "instrumentation.h"
+#include "interpreter/interpreter.h"
 #include "linear_alloc.h"
 #include "method_bss_mapping.h"
 #include "method_handles.h"
diff --git a/runtime/entrypoints_order_test.cc b/runtime/entrypoints_order_test.cc
index a3c3981..281dfd9 100644
--- a/runtime/entrypoints_order_test.cc
+++ b/runtime/entrypoints_order_test.cc
@@ -14,9 +14,10 @@
  * limitations under the License.
  */
 
-#include <memory>
 #include <setjmp.h>
 
+#include <memory>
+
 #include "base/macros.h"
 #include "common_runtime_test.h"
 #include "thread.h"
diff --git a/runtime/fault_handler.h b/runtime/fault_handler.h
index d56cf17..3e2664c 100644
--- a/runtime/fault_handler.h
+++ b/runtime/fault_handler.h
@@ -18,12 +18,13 @@
 #ifndef ART_RUNTIME_FAULT_HANDLER_H_
 #define ART_RUNTIME_FAULT_HANDLER_H_
 
-#include <signal.h>
-#include <vector>
 #include <setjmp.h>
+#include <signal.h>
 #include <stdint.h>
 
-#include "base/mutex.h"   // For annotalysis.
+#include <vector>
+
+#include "base/mutex.h"  // For annotalysis.
 
 namespace art {
 
diff --git a/runtime/gc/accounting/mod_union_table.h b/runtime/gc/accounting/mod_union_table.h
index 9e261fd..ee25eae 100644
--- a/runtime/gc/accounting/mod_union_table.h
+++ b/runtime/gc/accounting/mod_union_table.h
@@ -17,8 +17,8 @@
 #ifndef ART_RUNTIME_GC_ACCOUNTING_MOD_UNION_TABLE_H_
 #define ART_RUNTIME_GC_ACCOUNTING_MOD_UNION_TABLE_H_
 
-#include "bitmap.h"
 #include "base/allocator.h"
+#include "bitmap.h"
 #include "card_table.h"
 #include "globals.h"
 #include "mirror/object_reference.h"
diff --git a/runtime/gc/accounting/remembered_set.cc b/runtime/gc/accounting/remembered_set.cc
index f2fe58a..9dea2f8 100644
--- a/runtime/gc/accounting/remembered_set.cc
+++ b/runtime/gc/accounting/remembered_set.cc
@@ -20,12 +20,12 @@
 
 #include "base/stl_util.h"
 #include "card_table-inl.h"
-#include "heap_bitmap.h"
-#include "gc/collector/mark_sweep.h"
 #include "gc/collector/mark_sweep-inl.h"
+#include "gc/collector/mark_sweep.h"
 #include "gc/collector/semi_space.h"
 #include "gc/heap.h"
 #include "gc/space/space.h"
+#include "heap_bitmap.h"
 #include "mirror/class-inl.h"
 #include "mirror/object-inl.h"
 #include "mirror/object-refvisitor-inl.h"
diff --git a/runtime/gc/accounting/space_bitmap.cc b/runtime/gc/accounting/space_bitmap.cc
index 317e2fc..92b4360 100644
--- a/runtime/gc/accounting/space_bitmap.cc
+++ b/runtime/gc/accounting/space_bitmap.cc
@@ -21,8 +21,8 @@
 #include "art_field-inl.h"
 #include "dex_file-inl.h"
 #include "mem_map.h"
-#include "mirror/object-inl.h"
 #include "mirror/class-inl.h"
+#include "mirror/object-inl.h"
 #include "mirror/object_array.h"
 
 namespace art {
diff --git a/runtime/gc/allocation_listener.h b/runtime/gc/allocation_listener.h
index 21fa214..0be9aec 100644
--- a/runtime/gc/allocation_listener.h
+++ b/runtime/gc/allocation_listener.h
@@ -22,8 +22,8 @@
 
 #include "base/macros.h"
 #include "base/mutex.h"
-#include "obj_ptr.h"
 #include "gc_root.h"
+#include "obj_ptr.h"
 
 namespace art {
 
diff --git a/runtime/gc/allocation_record.h b/runtime/gc/allocation_record.h
index d31e442..fcd08c1 100644
--- a/runtime/gc/allocation_record.h
+++ b/runtime/gc/allocation_record.h
@@ -21,8 +21,8 @@
 #include <memory>
 
 #include "base/mutex.h"
-#include "obj_ptr.h"
 #include "gc_root.h"
+#include "obj_ptr.h"
 
 namespace art {
 
diff --git a/runtime/gc/allocator/dlmalloc.cc b/runtime/gc/allocator/dlmalloc.cc
index 0c84224..ef916f8 100644
--- a/runtime/gc/allocator/dlmalloc.cc
+++ b/runtime/gc/allocator/dlmalloc.cc
@@ -55,9 +55,10 @@
       << " not expected";
 }
 
+#include <sys/mman.h>
+
 #include "globals.h"
 #include "utils.h"
-#include <sys/mman.h>
 
 extern "C" void DlmallocMadviseCallback(void* start, void* end, size_t used_bytes, void* arg) {
   // Is this chunk in use?
diff --git a/runtime/gc/allocator/rosalloc.cc b/runtime/gc/allocator/rosalloc.cc
index d5d3540..b742ac4 100644
--- a/runtime/gc/allocator/rosalloc.cc
+++ b/runtime/gc/allocator/rosalloc.cc
@@ -16,8 +16,8 @@
 
 #include "rosalloc.h"
 
-#include <map>
 #include <list>
+#include <map>
 #include <sstream>
 #include <vector>
 
@@ -28,8 +28,8 @@
 #include "gc/space/memory_tool_settings.h"
 #include "mem_map.h"
 #include "mirror/class-inl.h"
-#include "mirror/object.h"
 #include "mirror/object-inl.h"
+#include "mirror/object.h"
 #include "thread-current-inl.h"
 #include "thread_list.h"
 
diff --git a/runtime/gc/allocator/rosalloc.h b/runtime/gc/allocator/rosalloc.h
index b85d7df..2c90773 100644
--- a/runtime/gc/allocator/rosalloc.h
+++ b/runtime/gc/allocator/rosalloc.h
@@ -28,8 +28,8 @@
 
 #include "base/allocator.h"
 #include "base/bit_utils.h"
-#include "base/mutex.h"
 #include "base/logging.h"
+#include "base/mutex.h"
 #include "globals.h"
 #include "thread.h"
 
diff --git a/runtime/gc/collector/concurrent_copying.h b/runtime/gc/collector/concurrent_copying.h
index ab60990..cc7072d 100644
--- a/runtime/gc/collector/concurrent_copying.h
+++ b/runtime/gc/collector/concurrent_copying.h
@@ -21,8 +21,8 @@
 #include "garbage_collector.h"
 #include "immune_spaces.h"
 #include "jni.h"
-#include "offsets.h"
 #include "mirror/object_reference.h"
+#include "offsets.h"
 #include "safe_map.h"
 
 #include <unordered_map>
diff --git a/runtime/gc/collector/immune_spaces.cc b/runtime/gc/collector/immune_spaces.cc
index 1e5f283..1024050 100644
--- a/runtime/gc/collector/immune_spaces.cc
+++ b/runtime/gc/collector/immune_spaces.cc
@@ -16,8 +16,8 @@
 
 #include "immune_spaces.h"
 
-#include <vector>
 #include <tuple>
+#include <vector>
 
 #include "gc/space/space-inl.h"
 #include "mirror/object.h"
diff --git a/runtime/gc/collector/iteration.h b/runtime/gc/collector/iteration.h
index fbe4166..363459a 100644
--- a/runtime/gc/collector/iteration.h
+++ b/runtime/gc/collector/iteration.h
@@ -22,6 +22,7 @@
 
 #include "android-base/macros.h"
 #include "base/timing_logger.h"
+#include "gc/gc_cause.h"
 #include "object_byte_pair.h"
 
 namespace art {
diff --git a/runtime/gc/collector/mark_compact.h b/runtime/gc/collector/mark_compact.h
index 0bf4095..7d64a0c 100644
--- a/runtime/gc/collector/mark_compact.h
+++ b/runtime/gc/collector/mark_compact.h
@@ -24,8 +24,8 @@
 #include "base/macros.h"
 #include "base/mutex.h"
 #include "garbage_collector.h"
-#include "gc_root.h"
 #include "gc/accounting/heap_bitmap.h"
+#include "gc_root.h"
 #include "immune_spaces.h"
 #include "lock_word.h"
 #include "offsets.h"
diff --git a/runtime/gc/collector/mark_sweep.cc b/runtime/gc/collector/mark_sweep.cc
index fb82b4d..34de83a 100644
--- a/runtime/gc/collector/mark_sweep.cc
+++ b/runtime/gc/collector/mark_sweep.cc
@@ -17,9 +17,9 @@
 #include "mark_sweep.h"
 
 #include <atomic>
+#include <climits>
 #include <functional>
 #include <numeric>
-#include <climits>
 #include <vector>
 
 #include "base/bounded_fifo.h"
diff --git a/runtime/gc/collector/mark_sweep.h b/runtime/gc/collector/mark_sweep.h
index b9e06f9..53b899e 100644
--- a/runtime/gc/collector/mark_sweep.h
+++ b/runtime/gc/collector/mark_sweep.h
@@ -24,8 +24,8 @@
 #include "base/macros.h"
 #include "base/mutex.h"
 #include "garbage_collector.h"
-#include "gc_root.h"
 #include "gc/accounting/heap_bitmap.h"
+#include "gc_root.h"
 #include "immune_spaces.h"
 #include "offsets.h"
 
diff --git a/runtime/gc/collector/semi_space.cc b/runtime/gc/collector/semi_space.cc
index d379892..9fb37b6 100644
--- a/runtime/gc/collector/semi_space.cc
+++ b/runtime/gc/collector/semi_space.cc
@@ -32,8 +32,8 @@
 #include "gc/accounting/space_bitmap-inl.h"
 #include "gc/heap.h"
 #include "gc/reference_processor.h"
-#include "gc/space/bump_pointer_space.h"
 #include "gc/space/bump_pointer_space-inl.h"
+#include "gc/space/bump_pointer_space.h"
 #include "gc/space/image_space.h"
 #include "gc/space/large_object_space.h"
 #include "gc/space/space-inl.h"
@@ -41,10 +41,10 @@
 #include "intern_table.h"
 #include "jni_internal.h"
 #include "mark_sweep-inl.h"
-#include "monitor.h"
-#include "mirror/reference-inl.h"
 #include "mirror/object-inl.h"
 #include "mirror/object-refvisitor-inl.h"
+#include "mirror/reference-inl.h"
+#include "monitor.h"
 #include "runtime.h"
 #include "thread-inl.h"
 #include "thread_list.h"
diff --git a/runtime/gc/collector/semi_space.h b/runtime/gc/collector/semi_space.h
index d3858ba..fd52da3 100644
--- a/runtime/gc/collector/semi_space.h
+++ b/runtime/gc/collector/semi_space.h
@@ -23,8 +23,8 @@
 #include "base/macros.h"
 #include "base/mutex.h"
 #include "garbage_collector.h"
-#include "gc_root.h"
 #include "gc/accounting/heap_bitmap.h"
+#include "gc_root.h"
 #include "immune_spaces.h"
 #include "mirror/object_reference.h"
 #include "offsets.h"
diff --git a/runtime/gc/gc_cause.cc b/runtime/gc/gc_cause.cc
index a3a2051..8712080 100644
--- a/runtime/gc/gc_cause.cc
+++ b/runtime/gc/gc_cause.cc
@@ -15,8 +15,8 @@
  */
 
 #include "gc_cause.h"
-#include "globals.h"
 #include "base/logging.h"
+#include "globals.h"
 
 #include <ostream>
 
diff --git a/runtime/gc/heap-inl.h b/runtime/gc/heap-inl.h
index bf5cf29..2047646 100644
--- a/runtime/gc/heap-inl.h
+++ b/runtime/gc/heap-inl.h
@@ -30,9 +30,9 @@
 #include "gc/space/large_object_space.h"
 #include "gc/space/region_space-inl.h"
 #include "gc/space/rosalloc_space-inl.h"
+#include "handle_scope-inl.h"
 #include "obj_ptr-inl.h"
 #include "runtime.h"
-#include "handle_scope-inl.h"
 #include "thread-inl.h"
 #include "utils.h"
 #include "verify_object.h"
diff --git a/runtime/gc/heap.h b/runtime/gc/heap.h
index e172d2d..1534fd6 100644
--- a/runtime/gc/heap.h
+++ b/runtime/gc/heap.h
@@ -27,10 +27,10 @@
 #include "atomic.h"
 #include "base/mutex.h"
 #include "base/time_utils.h"
-#include "gc/gc_cause.h"
 #include "gc/collector/gc_type.h"
 #include "gc/collector/iteration.h"
 #include "gc/collector_type.h"
+#include "gc/gc_cause.h"
 #include "gc/space/large_object_space.h"
 #include "globals.h"
 #include "handle.h"
diff --git a/runtime/gc/reference_queue_test.cc b/runtime/gc/reference_queue_test.cc
index 613b034..ce0807c 100644
--- a/runtime/gc/reference_queue_test.cc
+++ b/runtime/gc/reference_queue_test.cc
@@ -17,9 +17,9 @@
 #include <sstream>
 
 #include "common_runtime_test.h"
-#include "reference_queue.h"
 #include "handle_scope-inl.h"
 #include "mirror/class-inl.h"
+#include "reference_queue.h"
 #include "scoped_thread_state_change-inl.h"
 
 namespace art {
diff --git a/runtime/gc/space/bump_pointer_space.cc b/runtime/gc/space/bump_pointer_space.cc
index 5d91f4b..ce0e0f3 100644
--- a/runtime/gc/space/bump_pointer_space.cc
+++ b/runtime/gc/space/bump_pointer_space.cc
@@ -16,8 +16,8 @@
 
 #include "bump_pointer_space.h"
 #include "bump_pointer_space-inl.h"
-#include "mirror/object-inl.h"
 #include "mirror/class-inl.h"
+#include "mirror/object-inl.h"
 #include "thread_list.h"
 
 namespace art {
diff --git a/runtime/gc/space/image_space.cc b/runtime/gc/space/image_space.cc
index fe0d35f..1484382 100644
--- a/runtime/gc/space/image_space.cc
+++ b/runtime/gc/space/image_space.cc
@@ -17,11 +17,12 @@
 #include "image_space.h"
 
 #include <lz4.h>
-#include <random>
 #include <sys/statvfs.h>
 #include <sys/types.h>
 #include <unistd.h>
 
+#include <random>
+
 #include "android-base/stringprintf.h"
 #include "android-base/strings.h"
 
@@ -30,8 +31,8 @@
 #include "base/callee_save_type.h"
 #include "base/enums.h"
 #include "base/macros.h"
-#include "base/stl_util.h"
 #include "base/scoped_flock.h"
+#include "base/stl_util.h"
 #include "base/systrace.h"
 #include "base/time_utils.h"
 #include "exec_utils.h"
diff --git a/runtime/gc/space/large_object_space_test.cc b/runtime/gc/space/large_object_space_test.cc
index 2544914..79b775a 100644
--- a/runtime/gc/space/large_object_space_test.cc
+++ b/runtime/gc/space/large_object_space_test.cc
@@ -14,9 +14,10 @@
  * limitations under the License.
  */
 
+#include "large_object_space.h"
+
 #include "base/time_utils.h"
 #include "space_test.h"
-#include "large_object_space.h"
 
 namespace art {
 namespace gc {
diff --git a/runtime/gc/space/malloc_space.cc b/runtime/gc/space/malloc_space.cc
index 1154620..c2a8de3 100644
--- a/runtime/gc/space/malloc_space.cc
+++ b/runtime/gc/space/malloc_space.cc
@@ -23,10 +23,10 @@
 #include "gc/heap.h"
 #include "gc/space/space-inl.h"
 #include "gc/space/zygote_space.h"
+#include "handle_scope-inl.h"
 #include "mirror/class-inl.h"
 #include "mirror/object-inl.h"
 #include "runtime.h"
-#include "handle_scope-inl.h"
 #include "thread.h"
 #include "thread_list.h"
 #include "utils.h"
diff --git a/runtime/gc/space/memory_tool_malloc_space-inl.h b/runtime/gc/space/memory_tool_malloc_space-inl.h
index 6cb2465..8282f3d 100644
--- a/runtime/gc/space/memory_tool_malloc_space-inl.h
+++ b/runtime/gc/space/memory_tool_malloc_space-inl.h
@@ -17,9 +17,11 @@
 #ifndef ART_RUNTIME_GC_SPACE_MEMORY_TOOL_MALLOC_SPACE_INL_H_
 #define ART_RUNTIME_GC_SPACE_MEMORY_TOOL_MALLOC_SPACE_INL_H_
 
-#include "base/memory_tool.h"
 #include "memory_tool_malloc_space.h"
+
+#include "base/memory_tool.h"
 #include "memory_tool_settings.h"
+#include "mirror/object-inl.h"
 
 namespace art {
 namespace gc {
diff --git a/runtime/gc/space/region_space.cc b/runtime/gc/space/region_space.cc
index fe3c1c0..b2e1fa5 100644
--- a/runtime/gc/space/region_space.cc
+++ b/runtime/gc/space/region_space.cc
@@ -14,11 +14,11 @@
  * limitations under the License.
  */
 
-#include "bump_pointer_space.h"
 #include "bump_pointer_space-inl.h"
+#include "bump_pointer_space.h"
 #include "gc/accounting/read_barrier_table.h"
-#include "mirror/object-inl.h"
 #include "mirror/class-inl.h"
+#include "mirror/object-inl.h"
 #include "thread_list.h"
 
 namespace art {
diff --git a/runtime/gc/space/rosalloc_space.cc b/runtime/gc/space/rosalloc_space.cc
index 9e900e4..eca0e43 100644
--- a/runtime/gc/space/rosalloc_space.cc
+++ b/runtime/gc/space/rosalloc_space.cc
@@ -21,6 +21,7 @@
 #include "gc/accounting/card_table.h"
 #include "gc/accounting/space_bitmap-inl.h"
 #include "gc/heap.h"
+#include "memory_tool_malloc_space-inl.h"
 #include "mirror/class-inl.h"
 #include "mirror/object-inl.h"
 #include "runtime.h"
@@ -28,7 +29,6 @@
 #include "thread.h"
 #include "thread_list.h"
 #include "utils.h"
-#include "memory_tool_malloc_space-inl.h"
 
 namespace art {
 namespace gc {
diff --git a/runtime/gc/task_processor_test.cc b/runtime/gc/task_processor_test.cc
index 5a75b37..77b40e4 100644
--- a/runtime/gc/task_processor_test.cc
+++ b/runtime/gc/task_processor_test.cc
@@ -14,11 +14,11 @@
  * limitations under the License.
  */
 
+#include "task_processor.h"
 #include "base/time_utils.h"
 #include "common_runtime_test.h"
-#include "task_processor.h"
-#include "thread_pool.h"
 #include "thread-current-inl.h"
+#include "thread_pool.h"
 
 namespace art {
 namespace gc {
diff --git a/runtime/hprof/hprof.cc b/runtime/hprof/hprof.cc
index f428bc2..7976a1a 100644
--- a/runtime/hprof/hprof.cc
+++ b/runtime/hprof/hprof.cc
@@ -32,8 +32,8 @@
 #include <sys/time.h>
 #include <sys/uio.h>
 #include <time.h>
-#include <time.h>
 #include <unistd.h>
+
 #include <set>
 
 #include "android-base/stringprintf.h"
@@ -47,18 +47,18 @@
 #include "common_throws.h"
 #include "debugger.h"
 #include "dex_file-inl.h"
-#include "gc_root.h"
 #include "gc/accounting/heap_bitmap.h"
 #include "gc/allocation_record.h"
-#include "gc/scoped_gc_critical_section.h"
-#include "gc/heap.h"
 #include "gc/heap-visit-objects-inl.h"
+#include "gc/heap.h"
+#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.h"
 #include "mirror/class-inl.h"
+#include "mirror/class.h"
 #include "mirror/object-refvisitor-inl.h"
 #include "os.h"
 #include "safe_map.h"
diff --git a/runtime/image.cc b/runtime/image.cc
index 7d0a709..950ac5d 100644
--- a/runtime/image.cc
+++ b/runtime/image.cc
@@ -18,9 +18,9 @@
 
 #include "base/bit_utils.h"
 #include "base/length_prefixed_array.h"
-#include "mirror/object_array.h"
-#include "mirror/object_array-inl.h"
 #include "mirror/object-inl.h"
+#include "mirror/object_array-inl.h"
+#include "mirror/object_array.h"
 #include "utils.h"
 
 namespace art {
diff --git a/runtime/imtable_test.cc b/runtime/imtable_test.cc
index d482183..d662114 100644
--- a/runtime/imtable_test.cc
+++ b/runtime/imtable_test.cc
@@ -24,10 +24,10 @@
 #include "base/mutex.h"
 #include "class_linker.h"
 #include "common_runtime_test.h"
+#include "handle_scope-inl.h"
 #include "mirror/accessible_object.h"
 #include "mirror/class.h"
 #include "mirror/class_loader.h"
-#include "handle_scope-inl.h"
 #include "scoped_thread_state_change-inl.h"
 #include "thread-current-inl.h"
 
diff --git a/runtime/indenter.h b/runtime/indenter.h
index 78b18f6..cc6d4c4 100644
--- a/runtime/indenter.h
+++ b/runtime/indenter.h
@@ -17,11 +17,12 @@
 #ifndef ART_RUNTIME_INDENTER_H_
 #define ART_RUNTIME_INDENTER_H_
 
-#include "base/logging.h"
-#include "base/macros.h"
 #include <ostream>
 #include <streambuf>
 
+#include "base/logging.h"
+#include "base/macros.h"
+
 namespace art {
 
 constexpr char kIndentChar =' ';
diff --git a/runtime/indenter_test.cc b/runtime/indenter_test.cc
index 1a26d7b..09c0c54 100644
--- a/runtime/indenter_test.cc
+++ b/runtime/indenter_test.cc
@@ -14,9 +14,10 @@
  * limitations under the License.
  */
 
-#include "gtest/gtest.h"
 #include "indenter.h"
 
+#include "gtest/gtest.h"
+
 namespace art {
 
 TEST(IndenterTest, MultiLineTest) {
diff --git a/runtime/instrumentation.cc b/runtime/instrumentation.cc
index 8120cc4..a8cf59b 100644
--- a/runtime/instrumentation.cc
+++ b/runtime/instrumentation.cc
@@ -19,15 +19,15 @@
 #include <sstream>
 
 #include "arch/context.h"
-#include "art_method-inl.h"
 #include "art_field-inl.h"
+#include "art_method-inl.h"
 #include "atomic.h"
 #include "base/callee_save_type.h"
 #include "class_linker.h"
 #include "debugger.h"
 #include "dex_file-inl.h"
-#include "entrypoints/quick/quick_entrypoints.h"
 #include "entrypoints/quick/quick_alloc_entrypoints.h"
+#include "entrypoints/quick/quick_entrypoints.h"
 #include "entrypoints/runtime_asm_entrypoints.h"
 #include "gc_root-inl.h"
 #include "interpreter/interpreter.h"
@@ -36,8 +36,8 @@
 #include "jvalue-inl.h"
 #include "mirror/class-inl.h"
 #include "mirror/dex_cache.h"
-#include "mirror/object_array-inl.h"
 #include "mirror/object-inl.h"
+#include "mirror/object_array-inl.h"
 #include "nth_caller_visitor.h"
 #include "oat_quick_method_header.h"
 #include "thread.h"
diff --git a/runtime/instrumentation_test.cc b/runtime/instrumentation_test.cc
index 9e9fa71..d25655f 100644
--- a/runtime/instrumentation_test.cc
+++ b/runtime/instrumentation_test.cc
@@ -18,9 +18,9 @@
 
 #include "art_method-inl.h"
 #include "base/enums.h"
+#include "class_linker-inl.h"
 #include "common_runtime_test.h"
 #include "common_throws.h"
-#include "class_linker-inl.h"
 #include "dex_file.h"
 #include "gc/scoped_gc_critical_section.h"
 #include "handle_scope-inl.h"
@@ -28,8 +28,8 @@
 #include "jvalue.h"
 #include "runtime.h"
 #include "scoped_thread_state_change-inl.h"
-#include "thread_list.h"
 #include "thread-inl.h"
+#include "thread_list.h"
 #include "well_known_classes.h"
 
 namespace art {
diff --git a/runtime/intern_table.cc b/runtime/intern_table.cc
index 2bac231..f4da5a4 100644
--- a/runtime/intern_table.cc
+++ b/runtime/intern_table.cc
@@ -18,14 +18,14 @@
 
 #include <memory>
 
-#include "gc_root-inl.h"
 #include "gc/collector/garbage_collector.h"
 #include "gc/space/image_space.h"
 #include "gc/weak_root_state.h"
+#include "gc_root-inl.h"
 #include "image-inl.h"
 #include "mirror/dex_cache-inl.h"
-#include "mirror/object_array-inl.h"
 #include "mirror/object-inl.h"
+#include "mirror/object_array-inl.h"
 #include "mirror/string-inl.h"
 #include "object_callbacks.h"
 #include "scoped_thread_state_change-inl.h"
diff --git a/runtime/intern_table.h b/runtime/intern_table.h
index 2ec03be..8714840 100644
--- a/runtime/intern_table.h
+++ b/runtime/intern_table.h
@@ -23,8 +23,8 @@
 #include "base/allocator.h"
 #include "base/hash_set.h"
 #include "base/mutex.h"
-#include "gc_root.h"
 #include "gc/weak_root_state.h"
+#include "gc_root.h"
 
 namespace art {
 
diff --git a/runtime/intern_table_test.cc b/runtime/intern_table_test.cc
index bb27b34..9c3ea8d 100644
--- a/runtime/intern_table_test.cc
+++ b/runtime/intern_table_test.cc
@@ -19,8 +19,8 @@
 #include "base/hash_set.h"
 #include "common_runtime_test.h"
 #include "gc_root-inl.h"
-#include "mirror/object.h"
 #include "handle_scope-inl.h"
+#include "mirror/object.h"
 #include "mirror/string.h"
 #include "scoped_thread_state_change-inl.h"
 #include "utf.h"
diff --git a/runtime/interpreter/interpreter_common.cc b/runtime/interpreter/interpreter_common.cc
index be2d34d..85904ee 100644
--- a/runtime/interpreter/interpreter_common.cc
+++ b/runtime/interpreter/interpreter_common.cc
@@ -23,14 +23,14 @@
 #include "entrypoints/runtime_asm_entrypoints.h"
 #include "jit/jit.h"
 #include "jvalue.h"
-#include "method_handles.h"
 #include "method_handles-inl.h"
+#include "method_handles.h"
 #include "mirror/array-inl.h"
 #include "mirror/class.h"
 #include "mirror/emulated_stack_frame.h"
 #include "mirror/method_handle_impl-inl.h"
-#include "reflection.h"
 #include "reflection-inl.h"
+#include "reflection.h"
 #include "stack.h"
 #include "thread-inl.h"
 #include "well_known_classes.h"
diff --git a/runtime/interpreter/interpreter_common.h b/runtime/interpreter/interpreter_common.h
index 74fec48..d293aeb 100644
--- a/runtime/interpreter/interpreter_common.h
+++ b/runtime/interpreter/interpreter_common.h
@@ -22,9 +22,9 @@
 
 #include <math.h>
 
+#include <atomic>
 #include <iostream>
 #include <sstream>
-#include <atomic>
 
 #include "android-base/stringprintf.h"
 
diff --git a/runtime/interpreter/mterp/mterp.cc b/runtime/interpreter/mterp/mterp.cc
index 5f94d04..5955b90 100644
--- a/runtime/interpreter/mterp/mterp.cc
+++ b/runtime/interpreter/mterp/mterp.cc
@@ -17,11 +17,11 @@
 /*
  * Mterp entry point and support functions.
  */
-#include "interpreter/interpreter_common.h"
-#include "interpreter/interpreter_intrinsics.h"
-#include "entrypoints/entrypoint_utils-inl.h"
 #include "mterp.h"
 #include "debugger.h"
+#include "entrypoints/entrypoint_utils-inl.h"
+#include "interpreter/interpreter_common.h"
+#include "interpreter/interpreter_intrinsics.h"
 
 namespace art {
 namespace interpreter {
diff --git a/runtime/interpreter/mterp/mterp.h b/runtime/interpreter/mterp/mterp.h
index 45ab98b..1a56d26 100644
--- a/runtime/interpreter/mterp/mterp.h
+++ b/runtime/interpreter/mterp/mterp.h
@@ -17,6 +17,9 @@
 #ifndef ART_RUNTIME_INTERPRETER_MTERP_MTERP_H_
 #define ART_RUNTIME_INTERPRETER_MTERP_MTERP_H_
 
+#include <cstddef>
+#include <cstdint>
+
 /*
  * Mterp assembly handler bases
  */
@@ -26,6 +29,9 @@
 extern "C" void* artMterpAsmAltInstructionEnd[];
 
 namespace art {
+
+class Thread;
+
 namespace interpreter {
 
 void InitMterpTls(Thread* self);
diff --git a/runtime/interpreter/shadow_frame.h b/runtime/interpreter/shadow_frame.h
index 69b2382..05768cd 100644
--- a/runtime/interpreter/shadow_frame.h
+++ b/runtime/interpreter/shadow_frame.h
@@ -17,8 +17,8 @@
 #ifndef ART_RUNTIME_INTERPRETER_SHADOW_FRAME_H_
 #define ART_RUNTIME_INTERPRETER_SHADOW_FRAME_H_
 
+#include <cstdint>
 #include <cstring>
-#include <stdint.h>
 #include <string>
 
 #include "base/macros.h"
diff --git a/runtime/interpreter/unstarted_runtime_test.cc b/runtime/interpreter/unstarted_runtime_test.cc
index 87fa8be..71ab01e 100644
--- a/runtime/interpreter/unstarted_runtime_test.cc
+++ b/runtime/interpreter/unstarted_runtime_test.cc
@@ -29,8 +29,8 @@
 #include "handle_scope-inl.h"
 #include "interpreter/interpreter_common.h"
 #include "mirror/class_loader.h"
-#include "mirror/object_array-inl.h"
 #include "mirror/object-inl.h"
+#include "mirror/object_array-inl.h"
 #include "mirror/string-inl.h"
 #include "runtime.h"
 #include "scoped_thread_state_change-inl.h"
diff --git a/runtime/jit/profile_compilation_info.cc b/runtime/jit/profile_compilation_info.cc
index 0b7063d..c9bfc9c 100644
--- a/runtime/jit/profile_compilation_info.cc
+++ b/runtime/jit/profile_compilation_info.cc
@@ -16,20 +16,20 @@
 
 #include "profile_compilation_info.h"
 
-#include "errno.h"
-#include <limits.h>
-#include <string>
-#include <vector>
-#include <stdlib.h>
 #include <sys/file.h>
 #include <sys/stat.h>
+#include <sys/types.h>
 #include <sys/uio.h>
-#include <sys/types.h>
-#include <unistd.h>
-#include <sys/types.h>
 #include <unistd.h>
 #include <zlib.h>
-#include <base/time_utils.h>
+
+#include <cerrno>
+#include <climits>
+#include <cstdlib>
+#include <string>
+#include <vector>
+
+#include "android-base/file.h"
 
 #include "base/arena_allocator.h"
 #include "base/dumpable.h"
@@ -37,12 +37,12 @@
 #include "base/scoped_flock.h"
 #include "base/stl_util.h"
 #include "base/systrace.h"
+#include "base/time_utils.h"
 #include "base/unix_file/fd_file.h"
 #include "jit/profiling_info.h"
 #include "os.h"
 #include "safe_map.h"
 #include "utils.h"
-#include "android-base/file.h"
 
 namespace art {
 
diff --git a/runtime/jit/profile_compilation_info.h b/runtime/jit/profile_compilation_info.h
index 4ab8be8..ffb67ae 100644
--- a/runtime/jit/profile_compilation_info.h
+++ b/runtime/jit/profile_compilation_info.h
@@ -21,8 +21,8 @@
 #include <vector>
 
 #include "atomic.h"
-#include "base/arena_object.h"
 #include "base/arena_containers.h"
+#include "base/arena_object.h"
 #include "bit_memory_region.h"
 #include "dex_cache_resolved_classes.h"
 #include "dex_file.h"
diff --git a/runtime/jit/profile_compilation_info_test.cc b/runtime/jit/profile_compilation_info_test.cc
index 1ba98ac..6010bce 100644
--- a/runtime/jit/profile_compilation_info_test.cc
+++ b/runtime/jit/profile_compilation_info_test.cc
@@ -16,17 +16,17 @@
 
 #include <gtest/gtest.h>
 
-#include "base/unix_file/fd_file.h"
 #include "art_method-inl.h"
+#include "base/unix_file/fd_file.h"
 #include "class_linker-inl.h"
 #include "common_runtime_test.h"
 #include "dex_file.h"
-#include "method_reference.h"
-#include "mirror/class-inl.h"
-#include "mirror/class_loader.h"
 #include "handle_scope-inl.h"
 #include "jit/profile_compilation_info.h"
 #include "linear_alloc.h"
+#include "method_reference.h"
+#include "mirror/class-inl.h"
+#include "mirror/class_loader.h"
 #include "scoped_thread_state_change-inl.h"
 #include "type_reference.h"
 
diff --git a/runtime/jit/profile_saver.cc b/runtime/jit/profile_saver.cc
index 61e5be3..381e95f 100644
--- a/runtime/jit/profile_saver.cc
+++ b/runtime/jit/profile_saver.cc
@@ -16,10 +16,10 @@
 
 #include "profile_saver.h"
 
-#include <sys/resource.h>
-#include <sys/types.h>
-#include <sys/stat.h>
 #include <fcntl.h>
+#include <sys/resource.h>
+#include <sys/stat.h>
+#include <sys/types.h>
 
 #include "android-base/strings.h"
 
diff --git a/runtime/jit/profile_saver_options.h b/runtime/jit/profile_saver_options.h
index 251227e..d1e14e2 100644
--- a/runtime/jit/profile_saver_options.h
+++ b/runtime/jit/profile_saver_options.h
@@ -13,8 +13,8 @@
 #ifndef ART_RUNTIME_JIT_PROFILE_SAVER_OPTIONS_H_
 #define ART_RUNTIME_JIT_PROFILE_SAVER_OPTIONS_H_
 
-#include <string>
 #include <ostream>
+#include <string>
 
 namespace art {
 
diff --git a/runtime/leb128_test.cc b/runtime/leb128_test.cc
index 122f55e..747fc19 100644
--- a/runtime/leb128_test.cc
+++ b/runtime/leb128_test.cc
@@ -17,6 +17,7 @@
 #include "leb128.h"
 
 #include "gtest/gtest.h"
+
 #include "base/histogram-inl.h"
 #include "base/time_utils.h"
 
diff --git a/runtime/lock_word.h b/runtime/lock_word.h
index edc64f3..14f638e 100644
--- a/runtime/lock_word.h
+++ b/runtime/lock_word.h
@@ -17,8 +17,8 @@
 #ifndef ART_RUNTIME_LOCK_WORD_H_
 #define ART_RUNTIME_LOCK_WORD_H_
 
+#include <cstdint>
 #include <iosfwd>
-#include <stdint.h>
 
 #include "base/bit_utils.h"
 #include "base/logging.h"
diff --git a/runtime/managed_stack-inl.h b/runtime/managed_stack-inl.h
index bdf8100..689dd80 100644
--- a/runtime/managed_stack-inl.h
+++ b/runtime/managed_stack-inl.h
@@ -19,10 +19,6 @@
 
 #include "managed_stack.h"
 
-#include <cstring>
-#include <stdint.h>
-#include <string>
-
 #include "interpreter/shadow_frame.h"
 
 namespace art {
diff --git a/runtime/managed_stack.h b/runtime/managed_stack.h
index 8337f96..4f1984d 100644
--- a/runtime/managed_stack.h
+++ b/runtime/managed_stack.h
@@ -17,8 +17,8 @@
 #ifndef ART_RUNTIME_MANAGED_STACK_H_
 #define ART_RUNTIME_MANAGED_STACK_H_
 
+#include <cstdint>
 #include <cstring>
-#include <stdint.h>
 #include <string>
 
 #include "base/logging.h"
diff --git a/runtime/mem_map.cc b/runtime/mem_map.cc
index 17035dd..da3da0f 100644
--- a/runtime/mem_map.cc
+++ b/runtime/mem_map.cc
@@ -38,7 +38,6 @@
 #include "globals.h"
 #include "utils.h"
 
-
 #ifndef MAP_ANONYMOUS
 #define MAP_ANONYMOUS MAP_ANON
 #endif
diff --git a/runtime/mem_map_test.cc b/runtime/mem_map_test.cc
index 8d6bb38..99bf004 100644
--- a/runtime/mem_map_test.cc
+++ b/runtime/mem_map_test.cc
@@ -20,9 +20,9 @@
 
 #include <memory>
 
-#include "common_runtime_test.h"
 #include "base/memory_tool.h"
 #include "base/unix_file/fd_file.h"
+#include "common_runtime_test.h"
 
 namespace art {
 
diff --git a/runtime/memory_region_test.cc b/runtime/memory_region_test.cc
index 6634c60..e3aead4 100644
--- a/runtime/memory_region_test.cc
+++ b/runtime/memory_region_test.cc
@@ -14,11 +14,12 @@
  * limitations under the License.
  */
 
-#include "bit_memory_region.h"
 #include "memory_region.h"
 
 #include "gtest/gtest.h"
 
+#include "bit_memory_region.h"
+
 namespace art {
 
 TEST(MemoryRegion, LoadUnaligned) {
diff --git a/runtime/method_handles.cc b/runtime/method_handles.cc
index f0d3cae..65f39e4 100644
--- a/runtime/method_handles.cc
+++ b/runtime/method_handles.cc
@@ -19,13 +19,13 @@
 #include "android-base/stringprintf.h"
 
 #include "common_dex_operations.h"
-#include "jvalue.h"
 #include "jvalue-inl.h"
+#include "jvalue.h"
 #include "mirror/emulated_stack_frame.h"
 #include "mirror/method_handle_impl-inl.h"
 #include "mirror/method_type.h"
-#include "reflection.h"
 #include "reflection-inl.h"
+#include "reflection.h"
 #include "well_known_classes.h"
 
 namespace art {
diff --git a/runtime/mirror/array-inl.h b/runtime/mirror/array-inl.h
index bfbd4df..63142d5 100644
--- a/runtime/mirror/array-inl.h
+++ b/runtime/mirror/array-inl.h
@@ -26,8 +26,8 @@
 #include "base/logging.h"
 #include "class.h"
 #include "gc/heap-inl.h"
-#include "object-inl.h"
 #include "obj_ptr-inl.h"
+#include "object-inl.h"
 #include "thread.h"
 
 namespace art {
diff --git a/runtime/mirror/array.cc b/runtime/mirror/array.cc
index f283ec3..6218dd9 100644
--- a/runtime/mirror/array.cc
+++ b/runtime/mirror/array.cc
@@ -16,15 +16,15 @@
 
 #include "array-inl.h"
 
-#include "class.h"
 #include "class-inl.h"
+#include "class.h"
 #include "class_linker-inl.h"
 #include "common_throws.h"
 #include "dex_file-inl.h"
 #include "gc/accounting/card_table-inl.h"
+#include "handle_scope-inl.h"
 #include "object-inl.h"
 #include "object_array-inl.h"
-#include "handle_scope-inl.h"
 #include "thread.h"
 #include "utils.h"
 
diff --git a/runtime/mirror/array.h b/runtime/mirror/array.h
index 99565c6..11128bb 100644
--- a/runtime/mirror/array.h
+++ b/runtime/mirror/array.h
@@ -18,8 +18,8 @@
 #define ART_RUNTIME_MIRROR_ARRAY_H_
 
 #include "base/enums.h"
-#include "gc_root.h"
 #include "gc/allocator_type.h"
+#include "gc_root.h"
 #include "obj_ptr.h"
 #include "object.h"
 
diff --git a/runtime/mirror/class-inl.h b/runtime/mirror/class-inl.h
index 121c259..67aeeff 100644
--- a/runtime/mirror/class-inl.h
+++ b/runtime/mirror/class-inl.h
@@ -30,8 +30,8 @@
 #include "dex_file-inl.h"
 #include "gc/heap-inl.h"
 #include "iftable.h"
-#include "object_array.h"
 #include "object-inl.h"
+#include "object_array.h"
 #include "read_barrier-inl.h"
 #include "reference-inl.h"
 #include "runtime.h"
diff --git a/runtime/mirror/class.cc b/runtime/mirror/class.cc
index 6f70b19..6642869 100644
--- a/runtime/mirror/class.cc
+++ b/runtime/mirror/class.cc
@@ -20,19 +20,19 @@
 
 #include "art_field-inl.h"
 #include "art_method-inl.h"
+#include "class-inl.h"
 #include "class_ext.h"
 #include "class_linker-inl.h"
 #include "class_loader.h"
-#include "class-inl.h"
 #include "dex_cache.h"
 #include "dex_file-inl.h"
 #include "dex_file_annotations.h"
 #include "gc/accounting/card_table-inl.h"
 #include "handle_scope-inl.h"
 #include "method.h"
-#include "object_array-inl.h"
 #include "object-inl.h"
 #include "object-refvisitor-inl.h"
+#include "object_array-inl.h"
 #include "object_lock.h"
 #include "runtime.h"
 #include "thread.h"
diff --git a/runtime/mirror/class.h b/runtime/mirror/class.h
index c626897..250604b 100644
--- a/runtime/mirror/class.h
+++ b/runtime/mirror/class.h
@@ -20,11 +20,11 @@
 #include "base/bit_utils.h"
 #include "base/enums.h"
 #include "base/iteration_range.h"
+#include "class_flags.h"
 #include "dex_file.h"
 #include "dex_file_types.h"
-#include "class_flags.h"
-#include "gc_root.h"
 #include "gc/allocator_type.h"
+#include "gc_root.h"
 #include "imtable.h"
 #include "invoke_type.h"
 #include "modifiers.h"
diff --git a/runtime/mirror/class_loader.h b/runtime/mirror/class_loader.h
index 381d96b..f25f18f 100644
--- a/runtime/mirror/class_loader.h
+++ b/runtime/mirror/class_loader.h
@@ -18,9 +18,9 @@
 #define ART_RUNTIME_MIRROR_CLASS_LOADER_H_
 
 #include "base/mutex.h"
+#include "obj_ptr.h"
 #include "object.h"
 #include "object_reference.h"
-#include "obj_ptr.h"
 
 namespace art {
 
diff --git a/runtime/mirror/dex_cache-inl.h b/runtime/mirror/dex_cache-inl.h
index fdb14f1..8b11c12 100644
--- a/runtime/mirror/dex_cache-inl.h
+++ b/runtime/mirror/dex_cache-inl.h
@@ -26,13 +26,13 @@
 #include "base/logging.h"
 #include "class_linker.h"
 #include "dex_file.h"
-#include "gc_root.h"
 #include "gc/heap-inl.h"
-#include "mirror/class.h"
+#include "gc_root.h"
 #include "mirror/call_site.h"
+#include "mirror/class.h"
 #include "mirror/method_type.h"
-#include "runtime.h"
 #include "obj_ptr.h"
+#include "runtime.h"
 
 #include <atomic>
 
diff --git a/runtime/mirror/dex_cache.cc b/runtime/mirror/dex_cache.cc
index 1a9f999..f6f20ba 100644
--- a/runtime/mirror/dex_cache.cc
+++ b/runtime/mirror/dex_cache.cc
@@ -24,8 +24,8 @@
 #include "globals.h"
 #include "linear_alloc.h"
 #include "oat_file.h"
-#include "object.h"
 #include "object-inl.h"
+#include "object.h"
 #include "object_array-inl.h"
 #include "runtime.h"
 #include "string.h"
diff --git a/runtime/mirror/dex_cache_test.cc b/runtime/mirror/dex_cache_test.cc
index d2b9240..a3d9035 100644
--- a/runtime/mirror/dex_cache_test.cc
+++ b/runtime/mirror/dex_cache_test.cc
@@ -21,10 +21,10 @@
 #include "art_method-inl.h"
 #include "class_linker.h"
 #include "common_runtime_test.h"
+#include "handle_scope-inl.h"
 #include "linear_alloc.h"
 #include "mirror/class_loader-inl.h"
 #include "mirror/dex_cache-inl.h"
-#include "handle_scope-inl.h"
 #include "scoped_thread_state_change-inl.h"
 
 namespace art {
diff --git a/runtime/mirror/emulated_stack_frame.cc b/runtime/mirror/emulated_stack_frame.cc
index be0eac0..a6129cc 100644
--- a/runtime/mirror/emulated_stack_frame.cc
+++ b/runtime/mirror/emulated_stack_frame.cc
@@ -19,8 +19,8 @@
 #include "class-inl.h"
 #include "gc_root-inl.h"
 #include "jvalue-inl.h"
-#include "method_handles.h"
 #include "method_handles-inl.h"
+#include "method_handles.h"
 #include "reflection-inl.h"
 
 namespace art {
diff --git a/runtime/mirror/executable.cc b/runtime/mirror/executable.cc
index 17c16a2..fac3319 100644
--- a/runtime/mirror/executable.cc
+++ b/runtime/mirror/executable.cc
@@ -14,9 +14,10 @@
  * limitations under the License.
  */
 
-#include "art_method-inl.h"
 #include "executable.h"
 
+#include "art_method-inl.h"
+
 namespace art {
 namespace mirror {
 
diff --git a/runtime/mirror/field.cc b/runtime/mirror/field.cc
index 54034c2..b4d93b6 100644
--- a/runtime/mirror/field.cc
+++ b/runtime/mirror/field.cc
@@ -18,8 +18,8 @@
 
 #include "class-inl.h"
 #include "dex_cache-inl.h"
-#include "object_array-inl.h"
 #include "object-inl.h"
+#include "object_array-inl.h"
 
 namespace art {
 namespace mirror {
diff --git a/runtime/mirror/method.h b/runtime/mirror/method.h
index 205ea7a..61332e3 100644
--- a/runtime/mirror/method.h
+++ b/runtime/mirror/method.h
@@ -17,8 +17,8 @@
 #ifndef ART_RUNTIME_MIRROR_METHOD_H_
 #define ART_RUNTIME_MIRROR_METHOD_H_
 
-#include "gc_root.h"
 #include "executable.h"
+#include "gc_root.h"
 
 namespace art {
 namespace mirror {
diff --git a/runtime/mirror/method_handle_impl.h b/runtime/mirror/method_handle_impl.h
index c598fa3..f362d43 100644
--- a/runtime/mirror/method_handle_impl.h
+++ b/runtime/mirror/method_handle_impl.h
@@ -21,8 +21,8 @@
 #include "art_method.h"
 #include "class.h"
 #include "gc_root.h"
-#include "object.h"
 #include "method_type.h"
+#include "object.h"
 
 namespace art {
 
diff --git a/runtime/mirror/method_handles_lookup.cc b/runtime/mirror/method_handles_lookup.cc
index 9eada6d..a390a2e 100644
--- a/runtime/mirror/method_handles_lookup.cc
+++ b/runtime/mirror/method_handles_lookup.cc
@@ -18,11 +18,11 @@
 
 #include "class-inl.h"
 #include "gc_root-inl.h"
-#include "object-inl.h"
 #include "handle_scope.h"
 #include "jni_internal.h"
 #include "mirror/method_handle_impl.h"
 #include "modifiers.h"
+#include "object-inl.h"
 #include "well_known_classes.h"
 
 namespace art {
diff --git a/runtime/mirror/method_handles_lookup.h b/runtime/mirror/method_handles_lookup.h
index 2109f60..dd8d45e 100644
--- a/runtime/mirror/method_handles_lookup.h
+++ b/runtime/mirror/method_handles_lookup.h
@@ -17,10 +17,10 @@
 #ifndef ART_RUNTIME_MIRROR_METHOD_HANDLES_LOOKUP_H_
 #define ART_RUNTIME_MIRROR_METHOD_HANDLES_LOOKUP_H_
 
-#include "obj_ptr.h"
 #include "gc_root.h"
-#include "object.h"
 #include "handle.h"
+#include "obj_ptr.h"
+#include "object.h"
 #include "utils.h"
 
 namespace art {
diff --git a/runtime/mirror/method_type.h b/runtime/mirror/method_type.h
index 374bbe5..a9f3c9c 100644
--- a/runtime/mirror/method_type.h
+++ b/runtime/mirror/method_type.h
@@ -17,9 +17,9 @@
 #ifndef ART_RUNTIME_MIRROR_METHOD_TYPE_H_
 #define ART_RUNTIME_MIRROR_METHOD_TYPE_H_
 
+#include "object_array.h"
 #include "object.h"
 #include "string.h"
-#include "mirror/object_array.h"
 #include "utils.h"
 
 namespace art {
diff --git a/runtime/mirror/object-inl.h b/runtime/mirror/object-inl.h
index 43d70b7..086925b 100644
--- a/runtime/mirror/object-inl.h
+++ b/runtime/mirror/object-inl.h
@@ -19,20 +19,20 @@
 
 #include "object.h"
 
+#include "array-inl.h"
 #include "art_field.h"
 #include "art_method.h"
 #include "atomic.h"
-#include "array-inl.h"
 #include "class-inl.h"
 #include "class_flags.h"
 #include "class_linker.h"
 #include "dex_cache.h"
 #include "lock_word-inl.h"
 #include "monitor.h"
+#include "obj_ptr-inl.h"
+#include "object-readbarrier-inl.h"
 #include "object_array-inl.h"
 #include "object_reference-inl.h"
-#include "object-readbarrier-inl.h"
-#include "obj_ptr-inl.h"
 #include "read_barrier-inl.h"
 #include "reference.h"
 #include "runtime.h"
diff --git a/runtime/mirror/object-refvisitor-inl.h b/runtime/mirror/object-refvisitor-inl.h
index f5ab4dd..39e32bf 100644
--- a/runtime/mirror/object-refvisitor-inl.h
+++ b/runtime/mirror/object-refvisitor-inl.h
@@ -19,8 +19,8 @@
 
 #include "object-inl.h"
 
-#include "class_loader-inl.h"
 #include "class-refvisitor-inl.h"
+#include "class_loader-inl.h"
 #include "dex_cache-inl.h"
 
 namespace art {
diff --git a/runtime/mirror/object.cc b/runtime/mirror/object.cc
index 6e5fdb7..78ef339 100644
--- a/runtime/mirror/object.cc
+++ b/runtime/mirror/object.cc
@@ -18,22 +18,22 @@
 
 #include "object.h"
 
-#include "art_field.h"
-#include "art_field-inl.h"
 #include "array-inl.h"
-#include "class.h"
+#include "art_field-inl.h"
+#include "art_field.h"
 #include "class-inl.h"
+#include "class.h"
 #include "class_linker-inl.h"
 #include "dex_file-inl.h"
 #include "gc/accounting/card_table-inl.h"
 #include "gc/heap.h"
+#include "handle_scope-inl.h"
 #include "iftable-inl.h"
 #include "monitor.h"
 #include "object-inl.h"
 #include "object-refvisitor-inl.h"
 #include "object_array-inl.h"
 #include "runtime.h"
-#include "handle_scope-inl.h"
 #include "throwable.h"
 #include "well_known_classes.h"
 
diff --git a/runtime/mirror/object_array-inl.h b/runtime/mirror/object_array-inl.h
index dbec40c..5cfc987 100644
--- a/runtime/mirror/object_array-inl.h
+++ b/runtime/mirror/object_array-inl.h
@@ -26,10 +26,10 @@
 #include "array-inl.h"
 #include "class.h"
 #include "gc/heap.h"
-#include "object-inl.h"
-#include "obj_ptr-inl.h"
-#include "runtime.h"
 #include "handle_scope-inl.h"
+#include "obj_ptr-inl.h"
+#include "object-inl.h"
+#include "runtime.h"
 #include "thread.h"
 #include "utils.h"
 
diff --git a/runtime/mirror/object_test.cc b/runtime/mirror/object_test.cc
index 6230ae9..1a0fc76 100644
--- a/runtime/mirror/object_test.cc
+++ b/runtime/mirror/object_test.cc
@@ -26,8 +26,8 @@
 #include "asm_support.h"
 #include "base/enums.h"
 #include "class-inl.h"
-#include "class_linker.h"
 #include "class_linker-inl.h"
+#include "class_linker.h"
 #include "common_runtime_test.h"
 #include "dex_file.h"
 #include "entrypoints/entrypoint_utils-inl.h"
diff --git a/runtime/mirror/stack_trace_element.cc b/runtime/mirror/stack_trace_element.cc
index 53de821..bb3242e 100644
--- a/runtime/mirror/stack_trace_element.cc
+++ b/runtime/mirror/stack_trace_element.cc
@@ -16,12 +16,12 @@
 
 #include "stack_trace_element.h"
 
-#include "class.h"
 #include "class-inl.h"
+#include "class.h"
 #include "gc/accounting/card_table-inl.h"
 #include "gc_root-inl.h"
-#include "object-inl.h"
 #include "handle_scope-inl.h"
+#include "object-inl.h"
 #include "string.h"
 
 namespace art {
diff --git a/runtime/mirror/string.h b/runtime/mirror/string.h
index 7fbe8bd..545fe93 100644
--- a/runtime/mirror/string.h
+++ b/runtime/mirror/string.h
@@ -17,8 +17,8 @@
 #ifndef ART_RUNTIME_MIRROR_STRING_H_
 #define ART_RUNTIME_MIRROR_STRING_H_
 
-#include "gc_root.h"
 #include "gc/allocator_type.h"
+#include "gc_root.h"
 #include "object.h"
 
 namespace art {
diff --git a/runtime/mirror/throwable.cc b/runtime/mirror/throwable.cc
index aee4b19..077ad50 100644
--- a/runtime/mirror/throwable.cc
+++ b/runtime/mirror/throwable.cc
@@ -24,8 +24,8 @@
 #include "dex_file-inl.h"
 #include "gc/accounting/card_table-inl.h"
 #include "object-inl.h"
-#include "object_array.h"
 #include "object_array-inl.h"
+#include "object_array.h"
 #include "stack_trace_element.h"
 #include "string.h"
 #include "utils.h"
diff --git a/runtime/monitor_pool.cc b/runtime/monitor_pool.cc
index 48e9a6b..9d221cc 100644
--- a/runtime/monitor_pool.cc
+++ b/runtime/monitor_pool.cc
@@ -18,8 +18,8 @@
 
 #include "base/logging.h"
 #include "base/mutex-inl.h"
-#include "thread-current-inl.h"
 #include "monitor.h"
+#include "thread-current-inl.h"
 
 namespace art {
 
diff --git a/runtime/monitor_test.cc b/runtime/monitor_test.cc
index fb12841..7d89652 100644
--- a/runtime/monitor_test.cc
+++ b/runtime/monitor_test.cc
@@ -14,12 +14,12 @@
  * limitations under the License.
  */
 
-#include "barrier.h"
 #include "monitor.h"
 
 #include <string>
 
 #include "atomic.h"
+#include "barrier.h"
 #include "base/time_utils.h"
 #include "class_linker-inl.h"
 #include "common_runtime_test.h"
diff --git a/runtime/native/dalvik_system_VMRuntime.cc b/runtime/native/dalvik_system_VMRuntime.cc
index 020612b..4db9feb 100644
--- a/runtime/native/dalvik_system_VMRuntime.cc
+++ b/runtime/native/dalvik_system_VMRuntime.cc
@@ -17,8 +17,8 @@
 #include "dalvik_system_VMRuntime.h"
 
 #ifdef ART_TARGET_ANDROID
-#include <sys/time.h>
 #include <sys/resource.h>
+#include <sys/time.h>
 extern "C" void android_set_application_target_sdk_version(uint32_t version);
 #endif
 #include <limits.h>
@@ -31,8 +31,8 @@
 
 #include "android-base/stringprintf.h"
 
-#include "art_method-inl.h"
 #include "arch/instruction_set.h"
+#include "art_method-inl.h"
 #include "base/enums.h"
 #include "class_linker-inl.h"
 #include "common_throws.h"
diff --git a/runtime/native/dalvik_system_VMStack.cc b/runtime/native/dalvik_system_VMStack.cc
index 2aeef60..a88563d 100644
--- a/runtime/native/dalvik_system_VMStack.cc
+++ b/runtime/native/dalvik_system_VMStack.cc
@@ -21,11 +21,11 @@
 #include "art_method-inl.h"
 #include "gc/task_processor.h"
 #include "jni_internal.h"
-#include "nth_caller_visitor.h"
 #include "mirror/class-inl.h"
 #include "mirror/class_loader.h"
 #include "mirror/object-inl.h"
 #include "native_util.h"
+#include "nth_caller_visitor.h"
 #include "scoped_fast_native_object_access-inl.h"
 #include "scoped_thread_state_change-inl.h"
 #include "thread_list.h"
diff --git a/runtime/native/java_lang_System.cc b/runtime/native/java_lang_System.cc
index 0e5d740..553cbea 100644
--- a/runtime/native/java_lang_System.cc
+++ b/runtime/native/java_lang_System.cc
@@ -22,8 +22,8 @@
 #include "gc/accounting/card_table-inl.h"
 #include "jni_internal.h"
 #include "mirror/array.h"
-#include "mirror/class.h"
 #include "mirror/class-inl.h"
+#include "mirror/class.h"
 #include "mirror/object-inl.h"
 #include "mirror/object_array-inl.h"
 #include "native_util.h"
diff --git a/runtime/native/java_lang_reflect_Constructor.cc b/runtime/native/java_lang_reflect_Constructor.cc
index 242e87a..abbb347 100644
--- a/runtime/native/java_lang_reflect_Constructor.cc
+++ b/runtime/native/java_lang_reflect_Constructor.cc
@@ -20,8 +20,8 @@
 
 #include "art_method-inl.h"
 #include "base/enums.h"
-#include "class_linker.h"
 #include "class_linker-inl.h"
+#include "class_linker.h"
 #include "dex_file_annotations.h"
 #include "jni_internal.h"
 #include "mirror/class-inl.h"
diff --git a/runtime/native/java_lang_reflect_Field.cc b/runtime/native/java_lang_reflect_Field.cc
index f19004d..9f59a1f 100644
--- a/runtime/native/java_lang_reflect_Field.cc
+++ b/runtime/native/java_lang_reflect_Field.cc
@@ -20,8 +20,8 @@
 #include "nativehelper/jni_macros.h"
 
 #include "art_field-inl.h"
-#include "class_linker.h"
 #include "class_linker-inl.h"
+#include "class_linker.h"
 #include "common_throws.h"
 #include "dex_file-inl.h"
 #include "dex_file_annotations.h"
diff --git a/runtime/native/java_lang_reflect_Method.cc b/runtime/native/java_lang_reflect_Method.cc
index cbbb6a8..18ff9c3 100644
--- a/runtime/native/java_lang_reflect_Method.cc
+++ b/runtime/native/java_lang_reflect_Method.cc
@@ -20,8 +20,8 @@
 
 #include "art_method-inl.h"
 #include "base/enums.h"
-#include "class_linker.h"
 #include "class_linker-inl.h"
+#include "class_linker.h"
 #include "dex_file_annotations.h"
 #include "jni_internal.h"
 #include "mirror/class-inl.h"
diff --git a/runtime/native/libcore_util_CharsetUtils.cc b/runtime/native/libcore_util_CharsetUtils.cc
index c698548..9743c94 100644
--- a/runtime/native/libcore_util_CharsetUtils.cc
+++ b/runtime/native/libcore_util_CharsetUtils.cc
@@ -27,7 +27,6 @@
 #include "scoped_fast_native_object_access-inl.h"
 #include "unicode/utf16.h"
 
-
 namespace art {
 
 /**
diff --git a/runtime/native/sun_misc_Unsafe.cc b/runtime/native/sun_misc_Unsafe.cc
index e78c9da..761362f 100644
--- a/runtime/native/sun_misc_Unsafe.cc
+++ b/runtime/native/sun_misc_Unsafe.cc
@@ -16,11 +16,12 @@
 
 #include "sun_misc_Unsafe.h"
 
-#include <atomic>
-#include <stdlib.h>
-#include <string.h>
 #include <unistd.h>
 
+#include <cstdlib>
+#include <cstring>
+#include <atomic>
+
 #include "nativehelper/jni_macros.h"
 
 #include "common_throws.h"
diff --git a/runtime/oat_file.cc b/runtime/oat_file.cc
index 1c1189d..4033f8c 100644
--- a/runtime/oat_file.cc
+++ b/runtime/oat_file.cc
@@ -17,15 +17,15 @@
 #include "oat_file.h"
 
 #include <dlfcn.h>
-#include <string.h>
-#include <type_traits>
-#include <unistd.h>
-
-#include <cstdlib>
 #ifndef __APPLE__
 #include <link.h>  // for dl_iterate_phdr.
 #endif
+#include <unistd.h>
+
+#include <cstdlib>
+#include <cstring>
 #include <sstream>
+#include <type_traits>
 
 // dlopen_ext support from bionic.
 #ifdef ART_TARGET_ANDROID
@@ -44,10 +44,10 @@
 #include "elf_file.h"
 #include "elf_utils.h"
 #include "gc_root.h"
-#include "oat.h"
 #include "mem_map.h"
 #include "mirror/class.h"
 #include "mirror/object-inl.h"
+#include "oat.h"
 #include "oat_file-inl.h"
 #include "oat_file_manager.h"
 #include "os.h"
diff --git a/runtime/oat_file_assistant.cc b/runtime/oat_file_assistant.cc
index 96423c3..dae41c1 100644
--- a/runtime/oat_file_assistant.cc
+++ b/runtime/oat_file_assistant.cc
@@ -25,8 +25,8 @@
 
 #include "base/logging.h"
 #include "base/stl_util.h"
-#include "compiler_filter.h"
 #include "class_linker.h"
+#include "compiler_filter.h"
 #include "exec_utils.h"
 #include "gc/heap.h"
 #include "gc/space/image_space.h"
diff --git a/runtime/oat_file_assistant_test.cc b/runtime/oat_file_assistant_test.cc
index 1ecdd0d..c59dafc 100644
--- a/runtime/oat_file_assistant_test.cc
+++ b/runtime/oat_file_assistant_test.cc
@@ -14,18 +14,21 @@
  * limitations under the License.
  */
 
-#include <string>
-#include <vector>
+#include "oat_file_assistant.h"
+
 #include <sys/param.h>
 
-#include "android-base/strings.h"
+#include <string>
+#include <vector>
+
 #include <gtest/gtest.h>
 
+#include "android-base/strings.h"
+
 #include "art_field-inl.h"
 #include "class_linker-inl.h"
 #include "common_runtime_test.h"
 #include "dexopt_test.h"
-#include "oat_file_assistant.h"
 #include "oat_file_manager.h"
 #include "os.h"
 #include "scoped_thread_state_change-inl.h"
diff --git a/runtime/oat_quick_method_header.h b/runtime/oat_quick_method_header.h
index 152b0ba..3625b9e 100644
--- a/runtime/oat_quick_method_header.h
+++ b/runtime/oat_quick_method_header.h
@@ -19,8 +19,8 @@
 
 #include "arch/instruction_set.h"
 #include "base/macros.h"
-#include "quick/quick_method_frame_info.h"
 #include "method_info.h"
+#include "quick/quick_method_frame_info.h"
 #include "stack_map.h"
 #include "utils.h"
 
diff --git a/runtime/object_lock.cc b/runtime/object_lock.cc
index f6db544..744bc42 100644
--- a/runtime/object_lock.cc
+++ b/runtime/object_lock.cc
@@ -16,8 +16,8 @@
 
 #include "object_lock.h"
 
-#include "mirror/object-inl.h"
 #include "mirror/class_ext.h"
+#include "mirror/object-inl.h"
 #include "monitor.h"
 
 namespace art {
diff --git a/runtime/openjdkjvm/OpenjdkJvm.cc b/runtime/openjdkjvm/OpenjdkJvm.cc
index c1b2636..b212ea1 100644
--- a/runtime/openjdkjvm/OpenjdkJvm.cc
+++ b/runtime/openjdkjvm/OpenjdkJvm.cc
@@ -32,12 +32,12 @@
 /*
  * Services that OpenJDK expects the VM to provide.
  */
-#include<stdio.h>
 #include <dlfcn.h>
 #include <limits.h>
-#include <sys/time.h>
-#include <sys/socket.h>
+#include <stdio.h>
 #include <sys/ioctl.h>
+#include <sys/socket.h>
+#include <sys/time.h>
 #include <unistd.h>
 
 #include "../../libcore/ojluni/src/main/native/jvm.h"  // TODO(narayan): fix it
diff --git a/runtime/openjdkjvmti/fixed_up_dex_file.h b/runtime/openjdkjvmti/fixed_up_dex_file.h
index db12f48..a96ee12 100644
--- a/runtime/openjdkjvmti/fixed_up_dex_file.h
+++ b/runtime/openjdkjvmti/fixed_up_dex_file.h
@@ -37,6 +37,7 @@
 
 #include "jni.h"
 #include "jvmti.h"
+
 #include "base/mutex.h"
 #include "dex_file.h"
 
diff --git a/runtime/openjdkjvmti/ti_class_definition.cc b/runtime/openjdkjvmti/ti_class_definition.cc
index 8e8ab19..c73ef0d 100644
--- a/runtime/openjdkjvmti/ti_class_definition.cc
+++ b/runtime/openjdkjvmti/ti_class_definition.cc
@@ -35,10 +35,10 @@
 #include "class_linker-inl.h"
 #include "dex_file.h"
 #include "fixed_up_dex_file.h"
-#include "handle_scope-inl.h"
 #include "handle.h"
-#include "mirror/class_ext.h"
+#include "handle_scope-inl.h"
 #include "mirror/class-inl.h"
+#include "mirror/class_ext.h"
 #include "mirror/object-inl.h"
 #include "reflection.h"
 #include "thread.h"
diff --git a/runtime/openjdkjvmti/ti_class_loader.h b/runtime/openjdkjvmti/ti_class_loader.h
index 1ac4988..af66c5f 100644
--- a/runtime/openjdkjvmti/ti_class_loader.h
+++ b/runtime/openjdkjvmti/ti_class_loader.h
@@ -57,8 +57,8 @@
 #include "obj_ptr.h"
 #include "scoped_thread_state_change-inl.h"
 #include "stack.h"
-#include "ti_class_definition.h"
 #include "thread_list.h"
+#include "ti_class_definition.h"
 #include "transform.h"
 #include "utf.h"
 #include "utils/dex_cache_arrays_layout-inl.h"
diff --git a/runtime/openjdkjvmti/ti_dump.cc b/runtime/openjdkjvmti/ti_dump.cc
index 7a1e53f..809a5e4 100644
--- a/runtime/openjdkjvmti/ti_dump.cc
+++ b/runtime/openjdkjvmti/ti_dump.cc
@@ -33,7 +33,6 @@
 
 #include <limits>
 
-
 #include "art_jvmti.h"
 #include "base/mutex.h"
 #include "events-inl.h"
diff --git a/runtime/openjdkjvmti/ti_field.cc b/runtime/openjdkjvmti/ti_field.cc
index 32c064e..c45b926 100644
--- a/runtime/openjdkjvmti/ti_field.cc
+++ b/runtime/openjdkjvmti/ti_field.cc
@@ -31,8 +31,8 @@
 
 #include "ti_field.h"
 
-#include "art_jvmti.h"
 #include "art_field-inl.h"
+#include "art_jvmti.h"
 #include "base/enums.h"
 #include "dex_file_annotations.h"
 #include "jni_internal.h"
diff --git a/runtime/openjdkjvmti/ti_heap.cc b/runtime/openjdkjvmti/ti_heap.cc
index 91fdaca..3397210 100644
--- a/runtime/openjdkjvmti/ti_heap.cc
+++ b/runtime/openjdkjvmti/ti_heap.cc
@@ -21,8 +21,8 @@
 #include "base/macros.h"
 #include "base/mutex.h"
 #include "class_linker.h"
-#include "gc/heap.h"
 #include "gc/heap-visit-objects-inl.h"
+#include "gc/heap.h"
 #include "gc_root-inl.h"
 #include "java_frame_root_info.h"
 #include "jni_env_ext.h"
@@ -31,8 +31,8 @@
 #include "mirror/class.h"
 #include "mirror/object-inl.h"
 #include "mirror/object_array-inl.h"
-#include "object_tagging.h"
 #include "obj_ptr-inl.h"
+#include "object_tagging.h"
 #include "primitive.h"
 #include "runtime.h"
 #include "scoped_thread_state_change-inl.h"
diff --git a/runtime/openjdkjvmti/ti_redefine.h b/runtime/openjdkjvmti/ti_redefine.h
index 27d7c3d..03b4bf2 100644
--- a/runtime/openjdkjvmti/ti_redefine.h
+++ b/runtime/openjdkjvmti/ti_redefine.h
@@ -57,8 +57,8 @@
 #include "obj_ptr.h"
 #include "scoped_thread_state_change-inl.h"
 #include "stack.h"
-#include "ti_class_definition.h"
 #include "thread_list.h"
+#include "ti_class_definition.h"
 #include "transform.h"
 #include "utf.h"
 #include "utils/dex_cache_arrays_layout-inl.h"
diff --git a/runtime/openjdkjvmti/transform.h b/runtime/openjdkjvmti/transform.h
index ba40e04..ed24068 100644
--- a/runtime/openjdkjvmti/transform.h
+++ b/runtime/openjdkjvmti/transform.h
@@ -35,10 +35,10 @@
 #include <string>
 
 #include <jni.h>
+#include "jvmti.h"
 
 #include "art_jvmti.h"
 #include "ti_class_definition.h"
-#include "jvmti.h"
 
 namespace openjdkjvmti {
 
diff --git a/runtime/os_linux.cc b/runtime/os_linux.cc
index 0add496..a463f70 100644
--- a/runtime/os_linux.cc
+++ b/runtime/os_linux.cc
@@ -16,9 +16,10 @@
 
 #include "os.h"
 
-#include <sys/types.h>
-#include <sys/stat.h>
 #include <fcntl.h>
+#include <sys/stat.h>
+#include <sys/types.h>
+
 #include <cstddef>
 #include <memory>
 
diff --git a/runtime/parsed_options.h b/runtime/parsed_options.h
index 1f5beb9..0f8555a 100644
--- a/runtime/parsed_options.h
+++ b/runtime/parsed_options.h
@@ -22,11 +22,11 @@
 
 #include <jni.h>
 
-#include "globals.h"
+#include "arch/instruction_set.h"
 #include "gc/collector_type.h"
 #include "gc/space/large_object_space.h"
-#include "arch/instruction_set.h"
-#include "jit/profile_saver_options.h"
+#include "globals.h"
+// #include "jit/profile_saver_options.h"
 #include "runtime_options.h"
 
 namespace art {
diff --git a/runtime/read_barrier-inl.h b/runtime/read_barrier-inl.h
index 2d06e54..b0935c0 100644
--- a/runtime/read_barrier-inl.h
+++ b/runtime/read_barrier-inl.h
@@ -22,8 +22,8 @@
 #include "gc/accounting/read_barrier_table.h"
 #include "gc/collector/concurrent_copying-inl.h"
 #include "gc/heap.h"
-#include "mirror/object_reference.h"
 #include "mirror/object-readbarrier-inl.h"
+#include "mirror/object_reference.h"
 #include "mirror/reference.h"
 #include "runtime.h"
 #include "utils.h"
diff --git a/runtime/read_barrier.h b/runtime/read_barrier.h
index ca77685..d36acbc 100644
--- a/runtime/read_barrier.h
+++ b/runtime/read_barrier.h
@@ -18,8 +18,8 @@
 #define ART_RUNTIME_READ_BARRIER_H_
 
 #include "base/logging.h"
-#include "base/mutex.h"
 #include "base/macros.h"
+#include "base/mutex.h"
 #include "gc_root.h"
 #include "jni.h"
 #include "mirror/object_reference.h"
diff --git a/runtime/reference_table.cc b/runtime/reference_table.cc
index d8b9dcc..e6e588e 100644
--- a/runtime/reference_table.cc
+++ b/runtime/reference_table.cc
@@ -20,10 +20,10 @@
 
 #include "base/mutex.h"
 #include "indirect_reference_table.h"
-#include "mirror/array.h"
 #include "mirror/array-inl.h"
-#include "mirror/class.h"
+#include "mirror/array.h"
 #include "mirror/class-inl.h"
+#include "mirror/class.h"
 #include "mirror/object-inl.h"
 #include "mirror/string-inl.h"
 #include "runtime-inl.h"
diff --git a/runtime/runtime.cc b/runtime/runtime.cc
index 2366e10..2712419 100644
--- a/runtime/runtime.cc
+++ b/runtime/runtime.cc
@@ -23,9 +23,10 @@
 #include <sys/prctl.h>
 #endif
 
+#include <fcntl.h>
 #include <signal.h>
 #include <sys/syscall.h>
-#include "base/memory_tool.h"
+
 #if defined(__APPLE__)
 #include <crt_externs.h>  // for _NSGetEnviron
 #endif
@@ -33,9 +34,7 @@
 #include <cstdio>
 #include <cstdlib>
 #include <limits>
-#include <memory_representation.h>
 #include <vector>
-#include <fcntl.h>
 
 #include "android-base/strings.h"
 
@@ -60,6 +59,7 @@
 #include "base/arena_allocator.h"
 #include "base/dumpable.h"
 #include "base/enums.h"
+#include "base/memory_tool.h"
 #include "base/stl_util.h"
 #include "base/systrace.h"
 #include "base/unix_file/fd_file.h"
@@ -88,6 +88,7 @@
 #include "jit/profile_saver.h"
 #include "jni_internal.h"
 #include "linear_alloc.h"
+#include "memory_representation.h"
 #include "mirror/array.h"
 #include "mirror/class-inl.h"
 #include "mirror/class_ext.h"
diff --git a/runtime/runtime_callbacks_test.cc b/runtime/runtime_callbacks_test.cc
index 0ea3180..983278d 100644
--- a/runtime/runtime_callbacks_test.cc
+++ b/runtime/runtime_callbacks_test.cc
@@ -16,7 +16,6 @@
 
 #include "runtime_callbacks.h"
 
-#include "jni.h"
 #include <signal.h>
 #include <sys/types.h>
 #include <unistd.h>
@@ -25,6 +24,8 @@
 #include <memory>
 #include <string>
 
+#include "jni.h"
+
 #include "art_method-inl.h"
 #include "base/mutex.h"
 #include "class_linker.h"
diff --git a/runtime/runtime_options.cc b/runtime/runtime_options.cc
index aa14719..b072bb0 100644
--- a/runtime/runtime_options.cc
+++ b/runtime/runtime_options.cc
@@ -18,13 +18,13 @@
 
 #include <memory>
 
+#include "debugger.h"
 #include "gc/heap.h"
 #include "monitor.h"
 #include "runtime.h"
 #include "thread_list.h"
 #include "trace.h"
 #include "utils.h"
-#include "debugger.h"
 
 namespace art {
 
diff --git a/runtime/runtime_options.h b/runtime/runtime_options.h
index c509992..89a1dcb 100644
--- a/runtime/runtime_options.h
+++ b/runtime/runtime_options.h
@@ -17,21 +17,20 @@
 #ifndef ART_RUNTIME_RUNTIME_OPTIONS_H_
 #define ART_RUNTIME_RUNTIME_OPTIONS_H_
 
-#include <vector>
+#include <cstdarg>
+#include <cstdio>
 #include <string>
+#include <vector>
 
-#include <stdio.h>
-#include <stdarg.h>
-
+#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"
+#include "gc/space/large_object_space.h"
 #include "jdwp/jdwp.h"
 #include "jit/jit.h"
 #include "jit/jit_code_cache.h"
-#include "gc/collector_type.h"
-#include "gc/space/large_object_space.h"
-#include "arch/instruction_set.h"
 #include "jit/profile_saver_options.h"
 #include "verifier/verifier_enums.h"
 
diff --git a/runtime/stack_map.h b/runtime/stack_map.h
index 21780a1..3931b62 100644
--- a/runtime/stack_map.h
+++ b/runtime/stack_map.h
@@ -20,13 +20,13 @@
 #include <limits>
 
 #include "arch/code_offset.h"
-#include "base/bit_vector.h"
 #include "base/bit_utils.h"
+#include "base/bit_vector.h"
 #include "bit_memory_region.h"
 #include "dex_file.h"
+#include "leb128.h"
 #include "memory_region.h"
 #include "method_info.h"
-#include "leb128.h"
 
 namespace art {
 
diff --git a/runtime/thread.h b/runtime/thread.h
index e1102ed..776096a 100644
--- a/runtime/thread.h
+++ b/runtime/thread.h
@@ -17,12 +17,13 @@
 #ifndef ART_RUNTIME_THREAD_H_
 #define ART_RUNTIME_THREAD_H_
 
+#include <setjmp.h>
+
 #include <bitset>
 #include <deque>
 #include <iosfwd>
 #include <list>
 #include <memory>
-#include <setjmp.h>
 #include <string>
 
 #include "arch/context.h"
diff --git a/runtime/thread_android.cc b/runtime/thread_android.cc
index d5db983..8ff6c52 100644
--- a/runtime/thread_android.cc
+++ b/runtime/thread_android.cc
@@ -16,10 +16,10 @@
 
 #include "thread.h"
 
-#include <sys/time.h>
-#include <sys/resource.h>
-#include <limits.h>
 #include <errno.h>
+#include <limits.h>
+#include <sys/resource.h>
+#include <sys/time.h>
 
 #include <cutils/sched_policy.h>
 #include <utils/threads.h>
diff --git a/runtime/thread_list.cc b/runtime/thread_list.cc
index f1a7b65..488e4a6 100644
--- a/runtime/thread_list.cc
+++ b/runtime/thread_list.cc
@@ -16,16 +16,16 @@
 
 #include "thread_list.h"
 
-#include <backtrace/BacktraceMap.h>
 #include <dirent.h>
-#include "nativehelper/ScopedLocalRef.h"
-#include "nativehelper/ScopedUtfChars.h"
 #include <sys/types.h>
 #include <unistd.h>
 
 #include <sstream>
 
 #include "android-base/stringprintf.h"
+#include "backtrace/BacktraceMap.h"
+#include "nativehelper/ScopedLocalRef.h"
+#include "nativehelper/ScopedUtfChars.h"
 
 #include "base/histogram-inl.h"
 #include "base/mutex-inl.h"
diff --git a/runtime/thread_pool.cc b/runtime/thread_pool.cc
index 8349f33..fb77b84 100644
--- a/runtime/thread_pool.cc
+++ b/runtime/thread_pool.cc
@@ -16,11 +16,11 @@
 
 #include "thread_pool.h"
 
-#include <pthread.h>
-
 #include <sys/mman.h>
-#include <sys/time.h>
 #include <sys/resource.h>
+#include <sys/time.h>
+
+#include <pthread.h>
 
 #include "android-base/stringprintf.h"
 
diff --git a/runtime/transaction.cc b/runtime/transaction.cc
index 359030e..9e62aa6 100644
--- a/runtime/transaction.cc
+++ b/runtime/transaction.cc
@@ -16,8 +16,8 @@
 
 #include "transaction.h"
 
-#include "base/stl_util.h"
 #include "base/logging.h"
+#include "base/stl_util.h"
 #include "gc/accounting/card_table-inl.h"
 #include "gc_root-inl.h"
 #include "intern_table.h"
diff --git a/runtime/type_lookup_table.cc b/runtime/type_lookup_table.cc
index 16cd722..4fab39c 100644
--- a/runtime/type_lookup_table.cc
+++ b/runtime/type_lookup_table.cc
@@ -16,14 +16,14 @@
 
 #include "type_lookup_table.h"
 
+#include <cstring>
+#include <memory>
+
 #include "base/bit_utils.h"
 #include "dex_file-inl.h"
 #include "utf-inl.h"
 #include "utils.h"
 
-#include <memory>
-#include <cstring>
-
 namespace art {
 
 static uint16_t MakeData(uint16_t class_def_idx, uint32_t hash, uint32_t mask) {
diff --git a/runtime/type_lookup_table_test.cc b/runtime/type_lookup_table_test.cc
index ec38b41..ac11871 100644
--- a/runtime/type_lookup_table_test.cc
+++ b/runtime/type_lookup_table_test.cc
@@ -14,13 +14,13 @@
  * limitations under the License.
  */
 
+#include "type_lookup_table.h"
 
 #include <memory>
 
 #include "common_runtime_test.h"
 #include "dex_file-inl.h"
 #include "scoped_thread_state_change-inl.h"
-#include "type_lookup_table.h"
 #include "utf-inl.h"
 
 namespace art {
diff --git a/runtime/utils.cc b/runtime/utils.cc
index c4b0441..ffa9d45 100644
--- a/runtime/utils.cc
+++ b/runtime/utils.cc
@@ -23,6 +23,7 @@
 #include <sys/types.h>
 #include <sys/wait.h>
 #include <unistd.h>
+
 #include <memory>
 
 #include "android-base/stringprintf.h"
@@ -38,9 +39,9 @@
 #include "utf-inl.h"
 
 #if defined(__APPLE__)
-#include "AvailabilityMacros.h"  // For MAC_OS_X_VERSION_MAX_ALLOWED
-#include <sys/syscall.h>
 #include <crt_externs.h>
+#include <sys/syscall.h>
+#include "AvailabilityMacros.h"  // For MAC_OS_X_VERSION_MAX_ALLOWED
 #endif
 
 #if defined(__linux__)
diff --git a/runtime/utils_test.cc b/runtime/utils_test.cc
index 48b703a..ee8eb36 100644
--- a/runtime/utils_test.cc
+++ b/runtime/utils_test.cc
@@ -22,13 +22,13 @@
 #include "class_linker-inl.h"
 #include "common_runtime_test.h"
 #include "exec_utils.h"
-#include "mirror/array.h"
+#include "handle_scope-inl.h"
 #include "mirror/array-inl.h"
+#include "mirror/array.h"
 #include "mirror/object-inl.h"
 #include "mirror/object_array-inl.h"
 #include "mirror/string.h"
 #include "scoped_thread_state_change-inl.h"
-#include "handle_scope-inl.h"
 
 #include "base/memory_tool.h"
 
diff --git a/runtime/verifier/method_verifier-inl.h b/runtime/verifier/method_verifier-inl.h
index 363bd8f..6c832e3 100644
--- a/runtime/verifier/method_verifier-inl.h
+++ b/runtime/verifier/method_verifier-inl.h
@@ -17,11 +17,12 @@
 #ifndef ART_RUNTIME_VERIFIER_METHOD_VERIFIER_INL_H_
 #define ART_RUNTIME_VERIFIER_METHOD_VERIFIER_INL_H_
 
-#include "base/logging.h"
 #include "method_verifier.h"
+
+#include "base/logging.h"
+#include "handle_scope-inl.h"
 #include "mirror/class_loader.h"
 #include "mirror/dex_cache.h"
-#include "handle_scope-inl.h"
 
 namespace art {
 namespace verifier {
diff --git a/runtime/verifier/method_verifier.cc b/runtime/verifier/method_verifier.cc
index 6dc7953..6149f0d 100644
--- a/runtime/verifier/method_verifier.cc
+++ b/runtime/verifier/method_verifier.cc
@@ -39,8 +39,8 @@
 #include "indenter.h"
 #include "intern_table.h"
 #include "leb128.h"
-#include "mirror/class.h"
 #include "mirror/class-inl.h"
+#include "mirror/class.h"
 #include "mirror/dex_cache-inl.h"
 #include "mirror/method_handle_impl.h"
 #include "mirror/object-inl.h"
@@ -51,8 +51,8 @@
 #include "scoped_thread_state_change-inl.h"
 #include "stack.h"
 #include "utils.h"
-#include "verifier_deps.h"
 #include "verifier_compiler_binding.h"
+#include "verifier_deps.h"
 
 namespace art {
 namespace verifier {
diff --git a/runtime/verifier/method_verifier.h b/runtime/verifier/method_verifier.h
index 46fdc54..ea8729c 100644
--- a/runtime/verifier/method_verifier.h
+++ b/runtime/verifier/method_verifier.h
@@ -30,8 +30,8 @@
 #include "handle.h"
 #include "instruction_flags.h"
 #include "method_reference.h"
-#include "register_line.h"
 #include "reg_type_cache.h"
+#include "register_line.h"
 #include "verifier_enums.h"
 
 namespace art {
diff --git a/runtime/verifier/reg_type-inl.h b/runtime/verifier/reg_type-inl.h
index 9245828..704d2a8 100644
--- a/runtime/verifier/reg_type-inl.h
+++ b/runtime/verifier/reg_type-inl.h
@@ -21,8 +21,8 @@
 
 #include "base/casts.h"
 #include "base/scoped_arena_allocator.h"
-#include "mirror/class.h"
 #include "method_verifier.h"
+#include "mirror/class.h"
 #include "verifier_deps.h"
 
 namespace art {
diff --git a/runtime/verifier/reg_type.cc b/runtime/verifier/reg_type.cc
index 883de38..8df2e0f 100644
--- a/runtime/verifier/reg_type.cc
+++ b/runtime/verifier/reg_type.cc
@@ -24,8 +24,8 @@
 #include "class_linker-inl.h"
 #include "dex_file-inl.h"
 #include "method_verifier.h"
-#include "mirror/class.h"
 #include "mirror/class-inl.h"
+#include "mirror/class.h"
 #include "mirror/object-inl.h"
 #include "mirror/object_array-inl.h"
 #include "reg_type_cache-inl.h"
diff --git a/runtime/verifier/reg_type_cache.h b/runtime/verifier/reg_type_cache.h
index c9bf6a9..7077c55 100644
--- a/runtime/verifier/reg_type_cache.h
+++ b/runtime/verifier/reg_type_cache.h
@@ -48,6 +48,7 @@
 class IntegerType;
 class LongHiType;
 class LongLoType;
+class MethodVerifier;
 class PreciseConstType;
 class PreciseReferenceType;
 class RegType;
diff --git a/runtime/verifier/reg_type_test.cc b/runtime/verifier/reg_type_test.cc
index 1aa0966..1bc48ed 100644
--- a/runtime/verifier/reg_type_test.cc
+++ b/runtime/verifier/reg_type_test.cc
@@ -23,8 +23,8 @@
 #include "base/scoped_arena_allocator.h"
 #include "common_runtime_test.h"
 #include "compiler_callbacks.h"
-#include "reg_type_cache-inl.h"
 #include "reg_type-inl.h"
+#include "reg_type_cache-inl.h"
 #include "scoped_thread_state_change-inl.h"
 #include "thread-current-inl.h"
 
diff --git a/runtime/verifier/register_line.cc b/runtime/verifier/register_line.cc
index 383d890..34c406e 100644
--- a/runtime/verifier/register_line.cc
+++ b/runtime/verifier/register_line.cc
@@ -20,8 +20,8 @@
 
 #include "dex_instruction-inl.h"
 #include "method_verifier-inl.h"
-#include "register_line-inl.h"
 #include "reg_type-inl.h"
+#include "register_line-inl.h"
 
 namespace art {
 namespace verifier {
diff --git a/test/004-JniTest/jni_test.cc b/test/004-JniTest/jni_test.cc
index f2edd0f..a34d633 100644
--- a/test/004-JniTest/jni_test.cc
+++ b/test/004-JniTest/jni_test.cc
@@ -14,9 +14,10 @@
  * limitations under the License.
  */
 
-#include <iostream>
 #include <pthread.h>
-#include <stdio.h>
+
+#include <cstdio>
+#include <iostream>
 #include <vector>
 
 #include "art_method-inl.h"
diff --git a/test/004-UnsafeTest/unsafe_test.cc b/test/004-UnsafeTest/unsafe_test.cc
index 4f6ae5a..18d9ea8 100644
--- a/test/004-UnsafeTest/unsafe_test.cc
+++ b/test/004-UnsafeTest/unsafe_test.cc
@@ -17,8 +17,8 @@
 #include "art_method-inl.h"
 #include "jni.h"
 #include "mirror/array.h"
-#include "mirror/class.h"
 #include "mirror/class-inl.h"
+#include "mirror/class.h"
 #include "mirror/object-inl.h"
 #include "scoped_thread_state_change-inl.h"
 
diff --git a/test/115-native-bridge/nativebridge.cc b/test/115-native-bridge/nativebridge.cc
index 307fd9b..a049b97 100644
--- a/test/115-native-bridge/nativebridge.cc
+++ b/test/115-native-bridge/nativebridge.cc
@@ -16,20 +16,21 @@
 
 // A simple implementation of the native-bridge interface.
 
-#include <algorithm>
 #include <dlfcn.h>
-#include <jni.h>
-#include <stdlib.h>
+#include <setjmp.h>
 #include <signal.h>
+#include <sys/stat.h>
+#include <unistd.h>
+
+#include <algorithm>
+#include <cstdio>
+#include <cstdlib>
 #include <vector>
 
-#include "stdio.h"
-#include "unistd.h"
-#include "sys/stat.h"
-#include "setjmp.h"
+#include <jni.h>
+#include <nativebridge/native_bridge.h>
 
 #include "base/macros.h"
-#include "nativebridge/native_bridge.h"
 
 struct NativeBridgeMethod {
   const char* name;
diff --git a/test/137-cfi/cfi.cc b/test/137-cfi/cfi.cc
index 1ed1f5a..ad705c5 100644
--- a/test/137-cfi/cfi.cc
+++ b/test/137-cfi/cfi.cc
@@ -18,15 +18,15 @@
 #include <errno.h>
 #include <signal.h>
 #include <string.h>
-#include <unistd.h>
 #include <sys/ptrace.h>
 #include <sys/wait.h>
+#include <unistd.h>
 #endif
 
 #include "jni.h"
 
-#include "android-base/stringprintf.h"
 #include <backtrace/Backtrace.h>
+#include "android-base/stringprintf.h"
 
 #include "base/logging.h"
 #include "base/macros.h"
diff --git a/test/1901-get-bytecodes/bytecodes.cc b/test/1901-get-bytecodes/bytecodes.cc
index edcb734..2b3f8c8 100644
--- a/test/1901-get-bytecodes/bytecodes.cc
+++ b/test/1901-get-bytecodes/bytecodes.cc
@@ -14,18 +14,19 @@
  * limitations under the License.
  */
 
-#include <iostream>
 #include <pthread.h>
-#include <stdio.h>
+
+#include <cstdio>
+#include <iostream>
 #include <vector>
 
 #include "android-base/logging.h"
 #include "jni.h"
+#include "jvmti.h"
+
 #include "scoped_local_ref.h"
 #include "scoped_primitive_array.h"
 
-#include "jvmti.h"
-
 // Test infrastructure
 #include "jvmti_helper.h"
 #include "test_env.h"
diff --git a/test/596-app-images/app_images.cc b/test/596-app-images/app_images.cc
index fa9c902..498ea1d 100644
--- a/test/596-app-images/app_images.cc
+++ b/test/596-app-images/app_images.cc
@@ -14,16 +14,18 @@
  * limitations under the License.
  */
 
-#include <iostream>
 #include <pthread.h>
-#include <stdio.h>
+
+#include <cstdio>
+#include <iostream>
 #include <vector>
 
+#include "jni.h"
+
 #include "gc/heap.h"
 #include "gc/space/image_space.h"
 #include "gc/space/space-inl.h"
 #include "image.h"
-#include "jni.h"
 #include "mirror/class.h"
 #include "runtime.h"
 #include "scoped_thread_state_change-inl.h"
diff --git a/test/597-deopt-new-string/deopt.cc b/test/597-deopt-new-string/deopt.cc
index 0f02efe..fe229e4 100644
--- a/test/597-deopt-new-string/deopt.cc
+++ b/test/597-deopt-new-string/deopt.cc
@@ -15,13 +15,14 @@
  */
 
 #include "jni.h"
-#include "mirror/class-inl.h"
-#include "runtime.h"
-#include "thread_list.h"
-#include "thread_state.h"
+
 #include "gc/gc_cause.h"
 #include "gc/scoped_gc_critical_section.h"
+#include "mirror/class-inl.h"
+#include "runtime.h"
 #include "scoped_thread_state_change-inl.h"
+#include "thread_list.h"
+#include "thread_state.h"
 
 namespace art {
 
diff --git a/test/903-hello-tagging/tagging.cc b/test/903-hello-tagging/tagging.cc
index a2694e7..e0a0136 100644
--- a/test/903-hello-tagging/tagging.cc
+++ b/test/903-hello-tagging/tagging.cc
@@ -14,18 +14,18 @@
  * limitations under the License.
  */
 
-#include <iostream>
 #include <pthread.h>
-#include <stdio.h>
+
+#include <cstdio>
+#include <iostream>
 #include <vector>
 
 #include "android-base/logging.h"
 #include "jni.h"
+#include "jvmti.h"
 #include "scoped_local_ref.h"
 #include "scoped_primitive_array.h"
 
-#include "jvmti.h"
-
 // Test infrastructure
 #include "jvmti_helper.h"
 #include "test_env.h"
diff --git a/test/904-object-allocation/tracking.cc b/test/904-object-allocation/tracking.cc
index 20b5328..9d2592a 100644
--- a/test/904-object-allocation/tracking.cc
+++ b/test/904-object-allocation/tracking.cc
@@ -14,10 +14,11 @@
  * limitations under the License.
  */
 
+#include <pthread.h>
+
+#include <cstdio>
 #include <iostream>
 #include <mutex>
-#include <pthread.h>
-#include <stdio.h>
 #include <vector>
 
 #include "android-base/logging.h"
diff --git a/test/905-object-free/tracking_free.cc b/test/905-object-free/tracking_free.cc
index 5479772..bf86c9a 100644
--- a/test/905-object-free/tracking_free.cc
+++ b/test/905-object-free/tracking_free.cc
@@ -14,9 +14,10 @@
  * limitations under the License.
  */
 
-#include <iostream>
 #include <pthread.h>
-#include <stdio.h>
+
+#include <cstdio>
+#include <iostream>
 #include <vector>
 
 #include "android-base/logging.h"
diff --git a/test/906-iterate-heap/iterate_heap.cc b/test/906-iterate-heap/iterate_heap.cc
index 02ac699..57c0274 100644
--- a/test/906-iterate-heap/iterate_heap.cc
+++ b/test/906-iterate-heap/iterate_heap.cc
@@ -14,13 +14,13 @@
  * limitations under the License.
  */
 
-#include "inttypes.h"
+#include <inttypes.h>
+#include <pthread.h>
 
+#include <cstdio>
 #include <iomanip>
 #include <iostream>
-#include <pthread.h>
 #include <sstream>
-#include <stdio.h>
 #include <vector>
 
 #include "android-base/logging.h"
diff --git a/test/907-get-loaded-classes/get_loaded_classes.cc b/test/907-get-loaded-classes/get_loaded_classes.cc
index 1eadf15..87c98e1 100644
--- a/test/907-get-loaded-classes/get_loaded_classes.cc
+++ b/test/907-get-loaded-classes/get_loaded_classes.cc
@@ -14,9 +14,10 @@
  * limitations under the License.
  */
 
-#include <iostream>
 #include <pthread.h>
-#include <stdio.h>
+
+#include <cstdio>
+#include <iostream>
 #include <vector>
 
 #include "android-base/macros.h"
diff --git a/test/911-get-stack-trace/stack_trace.cc b/test/911-get-stack-trace/stack_trace.cc
index 985120c..2b620b1 100644
--- a/test/911-get-stack-trace/stack_trace.cc
+++ b/test/911-get-stack-trace/stack_trace.cc
@@ -15,8 +15,9 @@
  */
 
 #include <inttypes.h>
+
+#include <cstdio>
 #include <memory>
-#include <stdio.h>
 
 #include "android-base/logging.h"
 #include "android-base/stringprintf.h"
diff --git a/test/913-heaps/heaps.cc b/test/913-heaps/heaps.cc
index bf3f7b6..f7862c7 100644
--- a/test/913-heaps/heaps.cc
+++ b/test/913-heaps/heaps.cc
@@ -15,15 +15,15 @@
  */
 
 #include <inttypes.h>
-#include <stdio.h>
-#include <string.h>
 
+#include <cstdio>
+#include <cstring>
 #include <iostream>
 #include <sstream>
 #include <vector>
 
-#include "android-base/macros.h"
 #include "android-base/logging.h"
+#include "android-base/macros.h"
 #include "android-base/stringprintf.h"
 
 #include "jni.h"
diff --git a/test/933-misc-events/misc_events.cc b/test/933-misc-events/misc_events.cc
index 27dab8b..d2ae0f4 100644
--- a/test/933-misc-events/misc_events.cc
+++ b/test/933-misc-events/misc_events.cc
@@ -14,10 +14,11 @@
  * limitations under the License.
  */
 
-#include <atomic>
 #include <signal.h>
 #include <sys/types.h>
 
+#include <atomic>
+
 #include "android-base/logging.h"
 #include "android-base/macros.h"
 #include "jni.h"
diff --git a/test/945-obsolete-native/obsolete_native.cc b/test/945-obsolete-native/obsolete_native.cc
index e3090f5..418ce90 100644
--- a/test/945-obsolete-native/obsolete_native.cc
+++ b/test/945-obsolete-native/obsolete_native.cc
@@ -15,8 +15,9 @@
  */
 
 #include <inttypes.h>
+
+#include <cstdio>
 #include <memory>
-#include <stdio.h>
 
 #include "android-base/stringprintf.h"
 #include "jni.h"
@@ -24,8 +25,8 @@
 
 // Test infrastructure
 #include "jni_binder.h"
-#include "test_env.h"
 #include "scoped_local_ref.h"
+#include "test_env.h"
 
 namespace art {
 namespace Test945ObsoleteNative {
diff --git a/test/983-source-transform-verify/source_transform.cc b/test/983-source-transform-verify/source_transform.cc
index 7cd39f4..570ade3 100644
--- a/test/983-source-transform-verify/source_transform.cc
+++ b/test/983-source-transform-verify/source_transform.cc
@@ -15,13 +15,15 @@
  */
 
 #include <inttypes.h>
-#include <stdio.h>
-#include <string.h>
 
+#include <cstdio>
+#include <cstring>
 #include <iostream>
 #include <vector>
 
 #include "android-base/stringprintf.h"
+#include "jni.h"
+#include "jvmti.h"
 
 #include "base/logging.h"
 #include "base/macros.h"
@@ -29,9 +31,7 @@
 #include "dex_file.h"
 #include "dex_instruction.h"
 #include "jit/jit.h"
-#include "jni.h"
 #include "native_stack_dump.h"
-#include "jvmti.h"
 #include "runtime.h"
 #include "scoped_thread_state_change-inl.h"
 #include "thread-current-inl.h"
diff --git a/test/986-native-method-bind/native_bind.cc b/test/986-native-method-bind/native_bind.cc
index eec635b..1afe4db 100644
--- a/test/986-native-method-bind/native_bind.cc
+++ b/test/986-native-method-bind/native_bind.cc
@@ -14,10 +14,11 @@
  * limitations under the License.
  */
 
-#include <inttypes.h>
-#include <memory>
-#include <stdio.h>
 #include <dlfcn.h>
+#include <inttypes.h>
+
+#include <cstdio>
+#include <memory>
 
 #include "android-base/stringprintf.h"
 #include "jni.h"
@@ -26,8 +27,8 @@
 // Test infrastructure
 #include "jni_binder.h"
 #include "jvmti_helper.h"
-#include "test_env.h"
 #include "scoped_local_ref.h"
+#include "test_env.h"
 
 namespace art {
 namespace Test986NativeBind {
diff --git a/test/987-agent-bind/agent_bind.cc b/test/987-agent-bind/agent_bind.cc
index 44366c1..7dbdd8e 100644
--- a/test/987-agent-bind/agent_bind.cc
+++ b/test/987-agent-bind/agent_bind.cc
@@ -14,10 +14,11 @@
  * limitations under the License.
  */
 
-#include <inttypes.h>
-#include <memory>
-#include <stdio.h>
 #include <dlfcn.h>
+#include <inttypes.h>
+
+#include <cstdio>
+#include <memory>
 
 #include "android-base/stringprintf.h"
 #include "jni.h"
@@ -26,8 +27,8 @@
 // Test infrastructure
 #include "jni_binder.h"
 #include "jvmti_helper.h"
-#include "test_env.h"
 #include "scoped_local_ref.h"
+#include "test_env.h"
 
 namespace art {
 namespace Test987AgentBind {
diff --git a/test/989-method-trace-throw/method_trace.cc b/test/989-method-trace-throw/method_trace.cc
index 554784e..019b6a9 100644
--- a/test/989-method-trace-throw/method_trace.cc
+++ b/test/989-method-trace-throw/method_trace.cc
@@ -15,8 +15,9 @@
  */
 
 #include <inttypes.h>
+
+#include <cstdio>
 #include <memory>
-#include <stdio.h>
 
 #include "android-base/logging.h"
 #include "android-base/stringprintf.h"
diff --git a/test/992-source-data/source_file.cc b/test/992-source-data/source_file.cc
index 3e8989e..46d197d 100644
--- a/test/992-source-data/source_file.cc
+++ b/test/992-source-data/source_file.cc
@@ -15,8 +15,9 @@
  */
 
 #include <inttypes.h>
+
+#include <cstdio>
 #include <memory>
-#include <stdio.h>
 
 #include "android-base/logging.h"
 #include "android-base/stringprintf.h"
diff --git a/test/993-breakpoints/breakpoints.cc b/test/993-breakpoints/breakpoints.cc
index 1292070..3734ce8 100644
--- a/test/993-breakpoints/breakpoints.cc
+++ b/test/993-breakpoints/breakpoints.cc
@@ -15,8 +15,9 @@
  */
 
 #include <inttypes.h>
+
+#include <cstdio>
 #include <memory>
-#include <stdio.h>
 
 #include "android-base/logging.h"
 #include "android-base/stringprintf.h"
diff --git a/test/996-breakpoint-obsolete/obsolete_breakpoints.cc b/test/996-breakpoint-obsolete/obsolete_breakpoints.cc
index b6a67e4..820af47 100644
--- a/test/996-breakpoint-obsolete/obsolete_breakpoints.cc
+++ b/test/996-breakpoint-obsolete/obsolete_breakpoints.cc
@@ -15,8 +15,9 @@
  */
 
 #include <inttypes.h>
+
+#include <cstdio>
 #include <memory>
-#include <stdio.h>
 
 #include "android-base/logging.h"
 #include "android-base/stringprintf.h"
diff --git a/test/ti-agent/jvmti_helper.cc b/test/ti-agent/jvmti_helper.cc
index ccd3cab..51d3406 100644
--- a/test/ti-agent/jvmti_helper.cc
+++ b/test/ti-agent/jvmti_helper.cc
@@ -16,11 +16,12 @@
 
 #include "jvmti_helper.h"
 
-#include <algorithm>
 #include <dlfcn.h>
-#include <stdio.h>
+
+#include <algorithm>
+#include <cstdio>
+#include <cstring>
 #include <sstream>
-#include <string.h>
 
 #include "android-base/logging.h"
 #include "scoped_local_ref.h"
diff --git a/test/ti-agent/jvmti_helper.h b/test/ti-agent/jvmti_helper.h
index 0145f36..78d238a 100644
--- a/test/ti-agent/jvmti_helper.h
+++ b/test/ti-agent/jvmti_helper.h
@@ -17,11 +17,12 @@
 #ifndef ART_TEST_TI_AGENT_JVMTI_HELPER_H_
 #define ART_TEST_TI_AGENT_JVMTI_HELPER_H_
 
-#include "jni.h"
-#include "jvmti.h"
 #include <memory>
 #include <ostream>
 
+#include "jni.h"
+#include "jvmti.h"
+
 #include "android-base/logging.h"
 
 namespace art {
diff --git a/test/ti-agent/redefinition_helper.cc b/test/ti-agent/redefinition_helper.cc
index 75a6f5f..76371de 100644
--- a/test/ti-agent/redefinition_helper.cc
+++ b/test/ti-agent/redefinition_helper.cc
@@ -16,9 +16,9 @@
 
 #include "common_helper.h"
 
+#include <cstdio>
 #include <deque>
 #include <map>
-#include <stdio.h>
 #include <sstream>
 #include <string>
 #include <vector>
diff --git a/test/ti-stress/stress.cc b/test/ti-stress/stress.cc
index aa50648..06d5af0 100644
--- a/test/ti-stress/stress.cc
+++ b/test/ti-stress/stress.cc
@@ -14,18 +14,18 @@
  * limitations under the License.
  */
 
-#include <jni.h>
-#include <stdio.h>
-#include <iostream>
-#include <iomanip>
+#include <cstdio>
 #include <fstream>
+#include <iomanip>
+#include <iostream>
 #include <memory>
-#include <stdio.h>
 #include <sstream>
 #include <strstream>
 
-#include "jvmti.h"
+#include <jni.h>
+
 #include "exec_utils.h"
+#include "jvmti.h"
 #include "utils.h"
 
 namespace art {
diff --git a/tools/cpp-define-generator/main.cc b/tools/cpp-define-generator/main.cc
index fc99f8a..7c515be 100644
--- a/tools/cpp-define-generator/main.cc
+++ b/tools/cpp-define-generator/main.cc
@@ -14,12 +14,12 @@
  * limitations under the License.
  */
 
+#include <algorithm>
+#include <ios>
 #include <iostream>
 #include <sstream>
-#include <type_traits>
-#include <ios>
-#include <algorithm>
 #include <string>
+#include <type_traits>
 
 // Art Offset file dependencies
 #define DEFINE_INCLUDE_DEPENDENCIES
diff --git a/tools/jfuzz/jfuzz.cc b/tools/jfuzz/jfuzz.cc
index 4cd2335..016d708 100644
--- a/tools/jfuzz/jfuzz.cc
+++ b/tools/jfuzz/jfuzz.cc
@@ -18,8 +18,8 @@
 #include <random>
 
 #include <inttypes.h>
-#include <stdlib.h>
 #include <stdio.h>
+#include <stdlib.h>
 #include <string.h>
 #include <unistd.h>