am fc0e3219: Fix multiple inclusion guards to match new pathnames

* commit 'fc0e3219edc9a5bf81b166e82fd5db2796eb6a0d':
  Fix multiple inclusion guards to match new pathnames

51 files changed, 153 insertions, 153 deletions

diff --git a/compiler/dex/arena_allocator.h b/compiler/dex/arena_allocator.h
index 78d4614f90..23d6b9f06b 100644
--- a/compiler/dex/arena_allocator.h
+++ b/compiler/dex/arena_allocator.h
@@ -14,8 +14,8 @@
  * limitations under the License.
  */
 
-#ifndef ART_SRC_COMPILER_DEX_COMPILER_ARENA_ALLOCATOR_H_
-#define ART_SRC_COMPILER_DEX_COMPILER_ARENA_ALLOCATOR_H_
+#ifndef ART_COMPILER_DEX_ARENA_ALLOCATOR_H_
+#define ART_COMPILER_DEX_ARENA_ALLOCATOR_H_
 
 #include <stdint.h>
 #include <stddef.h>
@@ -93,4 +93,4 @@ struct MemStats {
 
 }  // namespace art
 
-#endif  // ART_SRC_COMPILER_DEX_COMPILER_ARENA_ALLOCATOR_H_
+#endif  // ART_COMPILER_DEX_ARENA_ALLOCATOR_H_
diff --git a/compiler/dex/arena_bit_vector.h b/compiler/dex/arena_bit_vector.h
index a950e82498..0b7bbc5f16 100644
--- a/compiler/dex/arena_bit_vector.h
+++ b/compiler/dex/arena_bit_vector.h
@@ -14,8 +14,8 @@
  * limitations under the License.
  */
 
-#ifndef ART_SRC_COMPILER_DEX_COMPILER_ARENA_BIT_VECTOR_H_
-#define ART_SRC_COMPILER_DEX_COMPILER_ARENA_BIT_VECTOR_H_
+#ifndef ART_COMPILER_DEX_ARENA_BIT_VECTOR_H_
+#define ART_COMPILER_DEX_ARENA_BIT_VECTOR_H_
 
 #include <stdint.h>
 #include <stddef.h>
@@ -124,4 +124,4 @@ class ArenaBitVector {
 
 }  // namespace art
 
-#endif  // ART_SRC_COMPILER_DEX_COMPILER_ARENA_BIT_VECTOR_H_
+#endif  // ART_COMPILER_DEX_ARENA_BIT_VECTOR_H_
diff --git a/compiler/dex/backend.h b/compiler/dex/backend.h
index 45a1531b85..6f5ba388e1 100644
--- a/compiler/dex/backend.h
+++ b/compiler/dex/backend.h
@@ -14,8 +14,8 @@
  * limitations under the License.
  */
 
-#ifndef ART_SRC_COMPILER_DEX_BACKEND_H_
-#define ART_SRC_COMPILER_DEX_BACKEND_H_
+#ifndef ART_COMPILER_DEX_BACKEND_H_
+#define ART_COMPILER_DEX_BACKEND_H_
 
 #include "compiled_method.h"
 #include "arena_allocator.h"
@@ -37,4 +37,4 @@ class Backend {
 
 }  // namespace art
 
-#endif // ART_SRC_COMPILER_DEX_BACKEND_H_
+#endif  // ART_COMPILER_DEX_BACKEND_H_
diff --git a/compiler/dex/compiler_enums.h b/compiler/dex/compiler_enums.h
index bc456b2e70..88240e8c40 100644
--- a/compiler/dex/compiler_enums.h
+++ b/compiler/dex/compiler_enums.h
@@ -14,8 +14,8 @@
  * limitations under the License.
  */
 
-#ifndef ART_SRC_COMPILER_DEX_COMPILERENUMS_H_
-#define ART_SRC_COMPILER_DEX_COMPILERENUMS_H_
+#ifndef ART_COMPILER_DEX_COMPILER_ENUMS_H_
+#define ART_COMPILER_DEX_COMPILER_ENUMS_H_
 
 #include "dex_instruction.h"
 
@@ -414,4 +414,4 @@ std::ostream& operator<<(std::ostream& os, const OatBitMapKind& kind);
 
 }  // namespace art
 
-#endif // ART_SRC_COMPILER_DEX_COMPILERENUMS_H_
+#endif  // ART_COMPILER_DEX_COMPILER_ENUMS_H_
diff --git a/compiler/dex/compiler_internals.h b/compiler/dex/compiler_internals.h
index a3fa25e842..9dd0272e50 100644
--- a/compiler/dex/compiler_internals.h
+++ b/compiler/dex/compiler_internals.h
@@ -14,8 +14,8 @@
  * limitations under the License.
  */
 
-#ifndef ART_SRC_COMPILER_DEX_COMPILER_INTERNAL_H_
-#define ART_SRC_COMPILER_DEX_COMPILER_INTERNAL_H_
+#ifndef ART_COMPILER_DEX_COMPILER_INTERNALS_H_
+#define ART_COMPILER_DEX_COMPILER_INTERNALS_H_
 
 #include <assert.h>
 #include <stdbool.h>
@@ -33,4 +33,4 @@
 #include "thread.h"
 #include "utils.h"
 
-#endif  // ART_SRC_COMPILER_DEX_COMPILER_INTERNAL_H_
+#endif  // ART_COMPILER_DEX_COMPILER_INTERNALS_H_
diff --git a/compiler/dex/compiler_ir.h b/compiler/dex/compiler_ir.h
index c6f99f3a88..a9b5bf68fc 100644
--- a/compiler/dex/compiler_ir.h
+++ b/compiler/dex/compiler_ir.h
@@ -14,8 +14,8 @@
  * limitations under the License.
  */
 
-#ifndef ART_SRC_COMPILER_DEX_COMPILER_IR_H_
-#define ART_SRC_COMPILER_DEX_COMPILER_IR_H_
+#ifndef ART_COMPILER_DEX_COMPILER_IR_H_
+#define ART_COMPILER_DEX_COMPILER_IR_H_
 
 #include <vector>
 #include <llvm/IR/Module.h>
@@ -112,4 +112,4 @@ struct CompilationUnit {
 
 }  // namespace art
 
-#endif // ART_SRC_COMPILER_DEX_COMPILER_IR_H_
+#endif  // ART_COMPILER_DEX_COMPILER_IR_H_
diff --git a/compiler/dex/dataflow_iterator-inl.h b/compiler/dex/dataflow_iterator-inl.h
index b20004decc..06cc505a9a 100644
--- a/compiler/dex/dataflow_iterator-inl.h
+++ b/compiler/dex/dataflow_iterator-inl.h
@@ -14,8 +14,8 @@
  * limitations under the License.
  */
 
-#ifndef ART_SRC_COMPILER_DEX_DATAFLOW_ITERATOR_INL_H_
-#define ART_SRC_COMPILER_DEX_DATAFLOW_ITERATOR_INL_H_
+#ifndef ART_COMPILER_DEX_DATAFLOW_ITERATOR_INL_H_
+#define ART_COMPILER_DEX_DATAFLOW_ITERATOR_INL_H_
 
 #include "dataflow_iterator.h"
 
@@ -65,4 +65,4 @@ inline BasicBlock* AllNodesIterator::NextBody(bool had_change) {
 
 }  // namespace art
 
-#endif  // ART_SRC_COMPILER_DEX_DATAFLOW_ITERATOR_INL_H_
+#endif  // ART_COMPILER_DEX_DATAFLOW_ITERATOR_INL_H_
diff --git a/compiler/dex/dataflow_iterator.h b/compiler/dex/dataflow_iterator.h
index 12cbf9cadf..4c112f9678 100644
--- a/compiler/dex/dataflow_iterator.h
+++ b/compiler/dex/dataflow_iterator.h
@@ -14,8 +14,8 @@
  * limitations under the License.
  */
 
-#ifndef ART_SRC_COMPILER_DEX_DATAFLOW_ITERATOR_H_
-#define ART_SRC_COMPILER_DEX_DATAFLOW_ITERATOR_H_
+#ifndef ART_COMPILER_DEX_DATAFLOW_ITERATOR_H_
+#define ART_COMPILER_DEX_DATAFLOW_ITERATOR_H_
 
 #include "compiler_ir.h"
 #include "mir_graph.h"
@@ -155,4 +155,4 @@ namespace art {
 
 }  // namespace art
 
-#endif // ART_SRC_COMPILER_DEX_DATAFLOW_ITERATOR_H_
+#endif  // ART_COMPILER_DEX_DATAFLOW_ITERATOR_H_
diff --git a/compiler/dex/frontend.h b/compiler/dex/frontend.h
index 69d7f7728c..a86338950c 100644
--- a/compiler/dex/frontend.h
+++ b/compiler/dex/frontend.h
@@ -14,8 +14,8 @@
  * limitations under the License.
  */
 
-#ifndef ART_SRC_COMPILER_DEX_COMPILER_H_
-#define ART_SRC_COMPILER_DEX_COMPILER_H_
+#ifndef ART_COMPILER_DEX_FRONTEND_H_
+#define ART_COMPILER_DEX_FRONTEND_H_
 
 #include "dex_file.h"
 #include "dex_instruction.h"
@@ -123,4 +123,4 @@ extern "C" art::CompiledMethod* ArtCompileMethod(art::CompilerDriver& driver,
 
 
 
-#endif // ART_SRC_COMPILER_DEX_COMPILER_H_
+#endif  // ART_COMPILER_DEX_FRONTEND_H_
diff --git a/compiler/dex/growable_array.h b/compiler/dex/growable_array.h
index c4684a71f6..6ab0f1630a 100644
--- a/compiler/dex/growable_array.h
+++ b/compiler/dex/growable_array.h
@@ -14,8 +14,8 @@
  * limitations under the License.
  */
 
-#ifndef ART_SRC_COMPILER_DEX_GROWABLE_LIST_H_
-#define ART_SRC_COMPILER_DEX_GROWABLE_LIST_H_
+#ifndef ART_COMPILER_DEX_GROWABLE_ARRAY_H_
+#define ART_COMPILER_DEX_GROWABLE_ARRAY_H_
 
 #include <stdint.h>
 #include <stddef.h>
@@ -168,4 +168,4 @@ class GrowableArray {
 
 }  // namespace art
 
-#endif  // ART_SRC_COMPILER_DEX_GROWABLE_LIST_H_
+#endif  // ART_COMPILER_DEX_GROWABLE_ARRAY_H_
diff --git a/compiler/dex/local_value_numbering.h b/compiler/dex/local_value_numbering.h
index beb4cea733..f2b2291e56 100644
--- a/compiler/dex/local_value_numbering.h
+++ b/compiler/dex/local_value_numbering.h
@@ -14,8 +14,8 @@
  * limitations under the License.
  */
 
-#ifndef ART_SRC_COMPILER_DEX_LOCAL_VALUE_NUMBERING_H_
-#define ART_SRC_COMPILER_DEX_LOCAL_VALUE_NUMBERING_H_
+#ifndef ART_COMPILER_DEX_LOCAL_VALUE_NUMBERING_H_
+#define ART_COMPILER_DEX_LOCAL_VALUE_NUMBERING_H_
 
 #include "compiler_internals.h"
 
@@ -140,4 +140,4 @@ class LocalValueNumbering {
 
 } // namespace art
 
-#endif   // ART_SRC_COMPILER_DEX_LOCAL_VALUE_NUMBERING_H_
+#endif  // ART_COMPILER_DEX_LOCAL_VALUE_NUMBERING_H_
diff --git a/compiler/dex/mir_graph.h b/compiler/dex/mir_graph.h
index 2b1c21fd70..a40fa97ad5 100644
--- a/compiler/dex/mir_graph.h
+++ b/compiler/dex/mir_graph.h
@@ -14,8 +14,8 @@
  * limitations under the License.
  */
 
-#ifndef ART_SRC_COMPILER_DEX_MIRGRAPH_H_
-#define ART_SRC_COMPILER_DEX_MIRGRAPH_H_
+#ifndef ART_COMPILER_DEX_MIR_GRAPH_H_
+#define ART_COMPILER_DEX_MIR_GRAPH_H_
 
 #include "dex_file.h"
 #include "dex_instruction.h"
@@ -667,4 +667,4 @@ class MIRGraph {
 
 }  // namespace art
 
-#endif // ART_SRC_COMPILER_DEX_MIRGRAPH_H_
+#endif  // ART_COMPILER_DEX_MIR_GRAPH_H_
diff --git a/compiler/dex/portable/mir_to_gbc.h b/compiler/dex/portable/mir_to_gbc.h
index 8aa0271761..278631466f 100644
--- a/compiler/dex/portable/mir_to_gbc.h
+++ b/compiler/dex/portable/mir_to_gbc.h
@@ -14,8 +14,8 @@
  * limitations under the License.
  */
 
-#ifndef ART_SRC_COMPILER_DEX_PORTABLE_MIRTOGBC_H_
-#define ART_SRC_COMPILER_DEX_PORTABLE_MIRTOGBC_H_
+#ifndef ART_COMPILER_DEX_PORTABLE_MIR_TO_GBC_H_
+#define ART_COMPILER_DEX_PORTABLE_MIR_TO_GBC_H_
 
 #include "invoke_type.h"
 #include "compiled_method.h"
@@ -192,4 +192,4 @@ class MirConverter : public Backend {
 
 }  // namespace art
 
-#endif // ART_SRC_COMPILER_DEX_PORTABLE_MIRTOGBC_H_
+#endif  // ART_COMPILER_DEX_PORTABLE_MIR_TO_GBC_H_
diff --git a/compiler/dex/quick/arm/arm_lir.h b/compiler/dex/quick/arm/arm_lir.h
index 9dd7dafcd6..fca17a1640 100644
--- a/compiler/dex/quick/arm/arm_lir.h
+++ b/compiler/dex/quick/arm/arm_lir.h
@@ -14,8 +14,8 @@
  * limitations under the License.
  */
 
-#ifndef ART_SRC_COMPILER_DEX_QUICK_ARM_ARMLIR_H_
-#define ART_SRC_COMPILER_DEX_QUICK_ARM_ARMLIR_H_
+#ifndef ART_COMPILER_DEX_QUICK_ARM_ARM_LIR_H_
+#define ART_COMPILER_DEX_QUICK_ARM_ARM_LIR_H_
 
 #include "dex/compiler_internals.h"
 
@@ -496,4 +496,4 @@ struct ArmEncodingMap {
 
 }  // namespace art
 
-#endif  // ART_SRC_COMPILER_DEX_QUICK_ARM_ARMLIR_H_
+#endif  // ART_COMPILER_DEX_QUICK_ARM_ARM_LIR_H_
diff --git a/compiler/dex/quick/arm/codegen_arm.h b/compiler/dex/quick/arm/codegen_arm.h
index a9199dfa7c..1599941ef6 100644
--- a/compiler/dex/quick/arm/codegen_arm.h
+++ b/compiler/dex/quick/arm/codegen_arm.h
@@ -14,8 +14,8 @@
  * limitations under the License.
  */
 
-#ifndef ART_SRC_COMPILER_DEX_QUICK_ARM_CODEGENARM_H_
-#define ART_SRC_COMPILER_DEX_QUICK_ARM_CODEGENARM_H_
+#ifndef ART_COMPILER_DEX_QUICK_ARM_CODEGEN_ARM_H_
+#define ART_COMPILER_DEX_QUICK_ARM_CODEGEN_ARM_H_
 
 #include "dex/compiler_internals.h"
 
@@ -192,4 +192,4 @@ class ArmMir2Lir : public Mir2Lir {
 
 }  // namespace art
 
-#endif  // ART_SRC_COMPILER_DEX_QUICK_ARM_CODEGENARM_H_
+#endif  // ART_COMPILER_DEX_QUICK_ARM_CODEGEN_ARM_H_
diff --git a/compiler/dex/quick/mips/codegen_mips.h b/compiler/dex/quick/mips/codegen_mips.h
index 9723b899a9..376ad7f10e 100644
--- a/compiler/dex/quick/mips/codegen_mips.h
+++ b/compiler/dex/quick/mips/codegen_mips.h
@@ -14,8 +14,8 @@
  * limitations under the License.
  */
 
-#ifndef ART_SRC_DEX_QUICK_CODEGEN_MIPS_CODEGENMIPS_H_
-#define ART_SRC_DEX_QUICK_CODEGEN_MIPS_CODEGENMIPS_H_
+#ifndef ART_COMPILER_DEX_QUICK_MIPS_CODEGEN_MIPS_H_
+#define ART_COMPILER_DEX_QUICK_MIPS_CODEGEN_MIPS_H_
 
 #include "dex/compiler_internals.h"
 #include "mips_lir.h"
@@ -180,4 +180,4 @@ class MipsMir2Lir : public Mir2Lir {
 
 }  // namespace art
 
-#endif  // ART_SRC_DEX_QUICK_CODEGEN_MIPS_CODEGENMIPS_H_
+#endif  // ART_COMPILER_DEX_QUICK_MIPS_CODEGEN_MIPS_H_
diff --git a/compiler/dex/quick/mips/mips_lir.h b/compiler/dex/quick/mips/mips_lir.h
index ceab9ab1e5..8a99e93f09 100644
--- a/compiler/dex/quick/mips/mips_lir.h
+++ b/compiler/dex/quick/mips/mips_lir.h
@@ -14,8 +14,8 @@
  * limitations under the License.
  */
 
-#ifndef ART_SRC_COMPILER_DEX_QUICK_MIPS_MIPSLIR_H_
-#define ART_SRC_COMPILER_DEX_QUICK_MIPS_MIPSLIR_H_
+#ifndef ART_COMPILER_DEX_QUICK_MIPS_MIPS_LIR_H_
+#define ART_COMPILER_DEX_QUICK_MIPS_MIPS_LIR_H_
 
 #include "dex/compiler_internals.h"
 
@@ -429,4 +429,4 @@ extern MipsEncodingMap EncodingMap[kMipsLast];
 
 }  // namespace art
 
-#endif  // ART_SRC_COMPILER_DEX_QUICK_MIPS_MIPSLIR_H_
+#endif  // ART_COMPILER_DEX_QUICK_MIPS_MIPS_LIR_H_
diff --git a/compiler/dex/quick/mir_to_lir-inl.h b/compiler/dex/quick/mir_to_lir-inl.h
index 4eef264a0f..d9aef5d968 100644
--- a/compiler/dex/quick/mir_to_lir-inl.h
+++ b/compiler/dex/quick/mir_to_lir-inl.h
@@ -14,8 +14,8 @@
  * limitations under the License.
  */
 
-#ifndef ART_SRC_COMPILER_DEX_QUICK_MIR_TO_LIR_INL_H_
-#define ART_SRC_COMPILER_DEX_QUICK_MIR_TO_LIR_INL_H_
+#ifndef ART_COMPILER_DEX_QUICK_MIR_TO_LIR_INL_H_
+#define ART_COMPILER_DEX_QUICK_MIR_TO_LIR_INL_H_
 
 #include "mir_to_lir.h"
 
@@ -198,4 +198,4 @@ inline void Mir2Lir::SetupResourceMasks(LIR* lir) {
 
 }  // namespace art
 
-#endif  // ART_SRC_COMPILER_DEX_QUICK_MIR_TO_LIR_INL_H_
+#endif  // ART_COMPILER_DEX_QUICK_MIR_TO_LIR_INL_H_
diff --git a/compiler/dex/quick/mir_to_lir.h b/compiler/dex/quick/mir_to_lir.h
index 47514f769f..bec86c181e 100644
--- a/compiler/dex/quick/mir_to_lir.h
+++ b/compiler/dex/quick/mir_to_lir.h
@@ -14,8 +14,8 @@
  * limitations under the License.
  */
 
-#ifndef ART_SRC_COMPILER_DEX_QUICK_MIR_TO_LIR_H_
-#define ART_SRC_COMPILER_DEX_QUICK_MIR_TO_LIR_H_
+#ifndef ART_COMPILER_DEX_QUICK_MIR_TO_LIR_H_
+#define ART_COMPILER_DEX_QUICK_MIR_TO_LIR_H_
 
 #include "invoke_type.h"
 #include "compiled_method.h"
@@ -776,4 +776,4 @@ class Mir2Lir : public Backend {
 
 }  // namespace art
 
-#endif  //ART_SRC_COMPILER_DEX_QUICK_MIR_TO_LIR_H_
+#endif  // ART_COMPILER_DEX_QUICK_MIR_TO_LIR_H_
diff --git a/compiler/dex/quick/x86/codegen_x86.h b/compiler/dex/quick/x86/codegen_x86.h
index 3e30141594..4fa9dfb4d9 100644
--- a/compiler/dex/quick/x86/codegen_x86.h
+++ b/compiler/dex/quick/x86/codegen_x86.h
@@ -14,8 +14,8 @@
  * limitations under the License.
  */
 
-#ifndef ART_SRC_COMPILER_DEX_QUICK_X86_CODEGENX86_H_
-#define ART_SRC_COMPILER_DEX_QUICK_X86_CODEGENX86_H_
+#ifndef ART_COMPILER_DEX_QUICK_X86_CODEGEN_X86_H_
+#define ART_COMPILER_DEX_QUICK_X86_CODEGEN_X86_H_
 
 #include "dex/compiler_internals.h"
 #include "x86_lir.h"
@@ -202,4 +202,4 @@ class X86Mir2Lir : public Mir2Lir {
 
 }  // namespace art
 
-#endif  // ART_SRC_COMPILER_DEX_QUICK_X86_CODEGENX86_H_
+#endif  // ART_COMPILER_DEX_QUICK_X86_CODEGEN_X86_H_
diff --git a/compiler/dex/quick/x86/x86_lir.h b/compiler/dex/quick/x86/x86_lir.h
index 600bd03026..a39231b75a 100644
--- a/compiler/dex/quick/x86/x86_lir.h
+++ b/compiler/dex/quick/x86/x86_lir.h
@@ -14,8 +14,8 @@
  * limitations under the License.
  */
 
-#ifndef ART_SRC_COMPILER_DEX_QUICK_X86_X86LIR_H_
-#define ART_SRC_COMPILER_DEX_QUICK_X86_X86LIR_H_
+#ifndef ART_COMPILER_DEX_QUICK_X86_X86_LIR_H_
+#define ART_COMPILER_DEX_QUICK_X86_X86_LIR_H_
 
 #include "dex/compiler_internals.h"
 
@@ -439,4 +439,4 @@ extern X86ConditionCode X86ConditionEncoding(ConditionCode cond);
 
 }  // namespace art
 
-#endif  // ART_SRC_COMPILER_DEX_QUICK_X86_X86LIR_H_
+#endif  // ART_COMPILER_DEX_QUICK_X86_X86_LIR_H_
diff --git a/compiler/driver/compiler_driver.h b/compiler/driver/compiler_driver.h
index 4d7f0cf7b6..80cc89b95f 100644
--- a/compiler/driver/compiler_driver.h
+++ b/compiler/driver/compiler_driver.h
@@ -14,8 +14,8 @@
  * limitations under the License.
  */
 
-#ifndef ART_SRC_COMPILER_DRIVER_COMPILER_DRIVER_H_
-#define ART_SRC_COMPILER_DRIVER_COMPILER_DRIVER_H_
+#ifndef ART_COMPILER_DRIVER_COMPILER_DRIVER_H_
+#define ART_COMPILER_DRIVER_COMPILER_DRIVER_H_
 
 #include <set>
 #include <string>
@@ -410,4 +410,4 @@ class CompilerDriver {
 
 }  // namespace art
 
-#endif  // ART_SRC_COMPILER_DRIVER_COMPILER_DRIVER_H_
+#endif  // ART_COMPILER_DRIVER_COMPILER_DRIVER_H_
diff --git a/compiler/driver/dex_compilation_unit.h b/compiler/driver/dex_compilation_unit.h
index 3c6129d642..53efd12ba7 100644
--- a/compiler/driver/dex_compilation_unit.h
+++ b/compiler/driver/dex_compilation_unit.h
@@ -14,8 +14,8 @@
  * limitations under the License.
  */
 
-#ifndef ART_SRC_COMPILER_DEX_DEX_COMPILATION_UNIT_H_
-#define ART_SRC_COMPILER_DEX_DEX_COMPILATION_UNIT_H_
+#ifndef ART_COMPILER_DRIVER_DEX_COMPILATION_UNIT_H_
+#define ART_COMPILER_DRIVER_DEX_COMPILATION_UNIT_H_
 
 #include <stdint.h>
 
@@ -113,4 +113,4 @@ class DexCompilationUnit {
 
 } // namespace art
 
-#endif  // ART_SRC_COMPILER_DEX_DEX_COMPILATION_UNIT_H_
+#endif  // ART_COMPILER_DRIVER_DEX_COMPILATION_UNIT_H_
diff --git a/compiler/elf_fixup.h b/compiler/elf_fixup.h
index 79c45c1874..1abf06b1c5 100644
--- a/compiler/elf_fixup.h
+++ b/compiler/elf_fixup.h
@@ -14,8 +14,8 @@
  * limitations under the License.
  */
 
-#ifndef ART_SRC_ELF_FIXUP_H_
-#define ART_SRC_ELF_FIXUP_H_
+#ifndef ART_COMPILER_ELF_FIXUP_H_
+#define ART_COMPILER_ELF_FIXUP_H_
 
 #include <stdint.h>
 
@@ -53,4 +53,4 @@ class ElfFixup {
 
 }  // namespace art
 
-#endif  // ART_SRC_ELF_FIXUP_H_
+#endif  // ART_COMPILER_ELF_FIXUP_H_
diff --git a/compiler/elf_stripper.h b/compiler/elf_stripper.h
index b202e6e1f0..6015b30cb2 100644
--- a/compiler/elf_stripper.h
+++ b/compiler/elf_stripper.h
@@ -14,8 +14,8 @@
  * limitations under the License.
  */
 
-#ifndef ART_SRC_ELF_STRIPPER_H_
-#define ART_SRC_ELF_STRIPPER_H_
+#ifndef ART_COMPILER_ELF_STRIPPER_H_
+#define ART_COMPILER_ELF_STRIPPER_H_
 
 #include "base/macros.h"
 #include "os.h"
@@ -34,4 +34,4 @@ class ElfStripper {
 
 }  // namespace art
 
-#endif  // ART_SRC_ELF_STRIPPER_H_
+#endif  // ART_COMPILER_ELF_STRIPPER_H_
diff --git a/compiler/elf_writer.h b/compiler/elf_writer.h
index 7392e67d7f..ab436e4fb3 100644
--- a/compiler/elf_writer.h
+++ b/compiler/elf_writer.h
@@ -14,8 +14,8 @@
  * limitations under the License.
  */
 
-#ifndef ART_SRC_ELF_WRITER_H_
-#define ART_SRC_ELF_WRITER_H_
+#ifndef ART_COMPILER_ELF_WRITER_H_
+#define ART_COMPILER_ELF_WRITER_H_
 
 #include <stdint.h>
 
@@ -62,4 +62,4 @@ class ElfWriter {
 
 }  // namespace art
 
-#endif  // ART_SRC_ELF_WRITER_H_
+#endif  // ART_COMPILER_ELF_WRITER_H_
diff --git a/compiler/elf_writer_mclinker.h b/compiler/elf_writer_mclinker.h
index 21f23e113d..468fa9a84f 100644
--- a/compiler/elf_writer_mclinker.h
+++ b/compiler/elf_writer_mclinker.h
@@ -14,8 +14,8 @@
  * limitations under the License.
  */
 
-#ifndef ART_SRC_ELF_WRITER_MCLINKER_H_
-#define ART_SRC_ELF_WRITER_MCLINKER_H_
+#ifndef ART_COMPILER_ELF_WRITER_MCLINKER_H_
+#define ART_COMPILER_ELF_WRITER_MCLINKER_H_
 
 #include "elf_writer.h"
 
@@ -96,4 +96,4 @@ class ElfWriterMclinker : public ElfWriter {
 
 }  // namespace art
 
-#endif  // ART_SRC_ELF_WRITER_MCLINKER_H_
+#endif  // ART_COMPILER_ELF_WRITER_MCLINKER_H_
diff --git a/compiler/elf_writer_quick.h b/compiler/elf_writer_quick.h
index a1a386b3d7..a15c239de9 100644
--- a/compiler/elf_writer_quick.h
+++ b/compiler/elf_writer_quick.h
@@ -14,8 +14,8 @@
  * limitations under the License.
  */
 
-#ifndef ART_SRC_ELF_WRITER_MCLINKER_H_
-#define ART_SRC_ELF_WRITER_MCLINKER_H_
+#ifndef ART_COMPILER_ELF_WRITER_QUICK_H_
+#define ART_COMPILER_ELF_WRITER_QUICK_H_
 
 #include "elf_writer.h"
 
@@ -48,4 +48,4 @@ class ElfWriterQuick : public ElfWriter {
 
 }  // namespace art
 
-#endif  // ART_SRC_ELF_WRITER_MCLINKER_H_
+#endif  // ART_COMPILER_ELF_WRITER_QUICK_H_
diff --git a/compiler/image_writer.h b/compiler/image_writer.h
index 9b0d671604..e43ec6338f 100644
--- a/compiler/image_writer.h
+++ b/compiler/image_writer.h
@@ -14,8 +14,8 @@
  * limitations under the License.
  */
 
-#ifndef ART_SRC_IMAGE_WRITER_H_
-#define ART_SRC_IMAGE_WRITER_H_
+#ifndef ART_COMPILER_IMAGE_WRITER_H_
+#define ART_COMPILER_IMAGE_WRITER_H_
 
 #include <stdint.h>
 
@@ -207,4 +207,4 @@ class ImageWriter {
 
 }  // namespace art
 
-#endif  // ART_SRC_IMAGE_WRITER_H_
+#endif  // ART_COMPILER_IMAGE_WRITER_H_
diff --git a/compiler/jni/portable/jni_compiler.h b/compiler/jni/portable/jni_compiler.h
index a04277c9e6..9bdf35ef10 100644
--- a/compiler/jni/portable/jni_compiler.h
+++ b/compiler/jni/portable/jni_compiler.h
@@ -14,8 +14,8 @@
  * limitations under the License.
  */
 
-#ifndef ART_SRC_COMPILER_JNI_PORTABLE_JNI_COMPILER_H_
-#define ART_SRC_COMPILER_JNI_PORTABLE_JNI_COMPILER_H_
+#ifndef ART_COMPILER_JNI_PORTABLE_JNI_COMPILER_H_
+#define ART_COMPILER_JNI_PORTABLE_JNI_COMPILER_H_
 
 #include <stdint.h>
 
@@ -84,4 +84,4 @@ class JniCompiler {
 }  // namespace art
 
 
-#endif  // ART_SRC_COMPILER_JNI_PORTABLE_JNI_COMPILER_H_
+#endif  // ART_COMPILER_JNI_PORTABLE_JNI_COMPILER_H_
diff --git a/compiler/jni/quick/arm/calling_convention_arm.h b/compiler/jni/quick/arm/calling_convention_arm.h
index 3787d45c6f..f188700746 100644
--- a/compiler/jni/quick/arm/calling_convention_arm.h
+++ b/compiler/jni/quick/arm/calling_convention_arm.h
@@ -14,8 +14,8 @@
  * limitations under the License.
  */
 
-#ifndef ART_SRC_OAT_JNI_ARM_CALLING_CONVENTION_ARM_H_
-#define ART_SRC_OAT_JNI_ARM_CALLING_CONVENTION_ARM_H_
+#ifndef ART_COMPILER_JNI_QUICK_ARM_CALLING_CONVENTION_ARM_H_
+#define ART_COMPILER_JNI_QUICK_ARM_CALLING_CONVENTION_ARM_H_
 
 #include "jni/quick/calling_convention.h"
 
@@ -85,4 +85,4 @@ class ArmJniCallingConvention : public JniCallingConvention {
 }  // namespace arm
 }  // namespace art
 
-#endif  // ART_SRC_OAT_JNI_ARM_CALLING_CONVENTION_ARM_H_
+#endif  // ART_COMPILER_JNI_QUICK_ARM_CALLING_CONVENTION_ARM_H_
diff --git a/compiler/jni/quick/calling_convention.h b/compiler/jni/quick/calling_convention.h
index 121d1f80ae..d492b42237 100644
--- a/compiler/jni/quick/calling_convention.h
+++ b/compiler/jni/quick/calling_convention.h
@@ -14,8 +14,8 @@
  * limitations under the License.
  */
 
-#ifndef ART_SRC_OAT_JNI_CALLING_CONVENTION_H_
-#define ART_SRC_OAT_JNI_CALLING_CONVENTION_H_
+#ifndef ART_COMPILER_JNI_QUICK_CALLING_CONVENTION_H_
+#define ART_COMPILER_JNI_QUICK_CALLING_CONVENTION_H_
 
 #include <vector>
 #include "oat/utils/managed_register.h"
@@ -286,4 +286,4 @@ class JniCallingConvention : public CallingConvention {
 
 }  // namespace art
 
-#endif  // ART_SRC_OAT_JNI_CALLING_CONVENTION_H_
+#endif  // ART_COMPILER_JNI_QUICK_CALLING_CONVENTION_H_
diff --git a/compiler/jni/quick/mips/calling_convention_mips.h b/compiler/jni/quick/mips/calling_convention_mips.h
index 90681362bc..8412898dd8 100644
--- a/compiler/jni/quick/mips/calling_convention_mips.h
+++ b/compiler/jni/quick/mips/calling_convention_mips.h
@@ -14,8 +14,8 @@
  * limitations under the License.
  */
 
-#ifndef ART_SRC_OAT_JNI_MIPS_CALLING_CONVENTION_MIPS_H_
-#define ART_SRC_OAT_JNI_MIPS_CALLING_CONVENTION_MIPS_H_
+#ifndef ART_COMPILER_JNI_QUICK_MIPS_CALLING_CONVENTION_MIPS_H_
+#define ART_COMPILER_JNI_QUICK_MIPS_CALLING_CONVENTION_MIPS_H_
 
 #include "jni/quick/calling_convention.h"
 
@@ -83,4 +83,4 @@ class MipsJniCallingConvention : public JniCallingConvention {
 }  // namespace mips
 }  // namespace art
 
-#endif  // ART_SRC_OAT_JNI_MIPS_CALLING_CONVENTION_MIPS_H_
+#endif  // ART_COMPILER_JNI_QUICK_MIPS_CALLING_CONVENTION_MIPS_H_
diff --git a/compiler/jni/quick/x86/calling_convention_x86.h b/compiler/jni/quick/x86/calling_convention_x86.h
index ea8a26e7d5..082c1c8eb1 100644
--- a/compiler/jni/quick/x86/calling_convention_x86.h
+++ b/compiler/jni/quick/x86/calling_convention_x86.h
@@ -14,8 +14,8 @@
  * limitations under the License.
  */
 
-#ifndef ART_SRC_OAT_JNI_X86_CALLING_CONVENTION_X86_H_
-#define ART_SRC_OAT_JNI_X86_CALLING_CONVENTION_X86_H_
+#ifndef ART_COMPILER_JNI_QUICK_X86_CALLING_CONVENTION_X86_H_
+#define ART_COMPILER_JNI_QUICK_X86_CALLING_CONVENTION_X86_H_
 
 #include "jni/quick/calling_convention.h"
 
@@ -80,4 +80,4 @@ class X86JniCallingConvention : public JniCallingConvention {
 }  // namespace x86
 }  // namespace art
 
-#endif  // ART_SRC_OAT_JNI_X86_CALLING_CONVENTION_X86_H_
+#endif  // ART_COMPILER_JNI_QUICK_X86_CALLING_CONVENTION_X86_H_
diff --git a/compiler/llvm/backend_options.h b/compiler/llvm/backend_options.h
index 924a34639c..2a08bda2f1 100644
--- a/compiler/llvm/backend_options.h
+++ b/compiler/llvm/backend_options.h
@@ -14,8 +14,8 @@
  * limitations under the License.
  */
 
-#ifndef ART_SRC_COMPILER_LLVM_BACKEND_OPTIONS_H_
-#define ART_SRC_COMPILER_LLVM_BACKEND_OPTIONS_H_
+#ifndef ART_COMPILER_LLVM_BACKEND_OPTIONS_H_
+#define ART_COMPILER_LLVM_BACKEND_OPTIONS_H_
 
 #include <llvm/Support/CommandLine.h>
 
@@ -47,4 +47,4 @@ inline void InitialBackendOptions() {
 }  // namespace llvm
 }  // namespace art
 
-#endif  // ART_SRC_COMPILER_LLVM_BACKEND_OPTIONS_H_
+#endif  // ART_COMPILER_LLVM_BACKEND_OPTIONS_H_
diff --git a/compiler/llvm/backend_types.h b/compiler/llvm/backend_types.h
index c89504a859..095040e5eb 100644
--- a/compiler/llvm/backend_types.h
+++ b/compiler/llvm/backend_types.h
@@ -14,8 +14,8 @@
  * limitations under the License.
  */
 
-#ifndef ART_SRC_COMPILER_LLVM_BACKEND_TYPES_H_
-#define ART_SRC_COMPILER_LLVM_BACKEND_TYPES_H_
+#ifndef ART_COMPILER_LLVM_BACKEND_TYPES_H_
+#define ART_COMPILER_LLVM_BACKEND_TYPES_H_
 
 #include "base/logging.h"
 
@@ -101,4 +101,4 @@ inline JType GetJTypeFromShorty(char shorty_jty) {
 } // namespace art
 
 
-#endif // ART_SRC_COMPILER_LLVM_BACKEND_TYPES_H_
+#endif  // ART_COMPILER_LLVM_BACKEND_TYPES_H_
diff --git a/compiler/llvm/compiler_llvm.h b/compiler/llvm/compiler_llvm.h
index b70ddc5e20..77841d8564 100644
--- a/compiler/llvm/compiler_llvm.h
+++ b/compiler/llvm/compiler_llvm.h
@@ -14,8 +14,8 @@
  * limitations under the License.
  */
 
-#ifndef ART_SRC_COMPILER_LLVM_COMPILER_LLVM_H_
-#define ART_SRC_COMPILER_LLVM_COMPILER_LLVM_H_
+#ifndef ART_COMPILER_LLVM_COMPILER_LLVM_H_
+#define ART_COMPILER_LLVM_COMPILER_LLVM_H_
 
 #include "base/macros.h"
 #include "dex_file.h"
@@ -100,4 +100,4 @@ class CompilerLLVM {
 } // namespace llvm
 } // namespace art
 
-#endif // ART_SRC_COMPILER_LLVM_COMPILER_LLVM_H_
+#endif  // ART_COMPILER_LLVM_COMPILER_LLVM_H_
diff --git a/compiler/llvm/intrinsic_helper.h b/compiler/llvm/intrinsic_helper.h
index 49b8a95230..bb123fd575 100644
--- a/compiler/llvm/intrinsic_helper.h
+++ b/compiler/llvm/intrinsic_helper.h
@@ -14,8 +14,8 @@
  * limitations under the License.
  */
 
-#ifndef ART_SRC_GREENLAND_INTRINSIC_HELPER_H_
-#define ART_SRC_GREENLAND_INTRINSIC_HELPER_H_
+#ifndef ART_COMPILER_LLVM_INTRINSIC_HELPER_H_
+#define ART_COMPILER_LLVM_INTRINSIC_HELPER_H_
 
 #include "base/logging.h"
 
@@ -154,4 +154,4 @@ class IntrinsicHelper {
 } // namespace llvm
 } // namespace art
 
-#endif // ART_SRC_GREENLAND_INTRINSIC_HELPER_H_
+#endif  // ART_COMPILER_LLVM_INTRINSIC_HELPER_H_
diff --git a/compiler/llvm/ir_builder.h b/compiler/llvm/ir_builder.h
index 734b22f791..65da005e9b 100644
--- a/compiler/llvm/ir_builder.h
+++ b/compiler/llvm/ir_builder.h
@@ -14,8 +14,8 @@
  * limitations under the License.
  */
 
-#ifndef ART_SRC_COMPILER_LLVM_IR_BUILDER_H_
-#define ART_SRC_COMPILER_LLVM_IR_BUILDER_H_
+#ifndef ART_COMPILER_LLVM_IR_BUILDER_H_
+#define ART_COMPILER_LLVM_IR_BUILDER_H_
 
 #include "backend_types.h"
 #include "dex/compiler_enums.h"
@@ -487,4 +487,4 @@ class IRBuilder : public LLVMIRBuilder {
 } // namespace llvm
 } // namespace art
 
-#endif // ART_SRC_COMPILER_LLVM_IR_BUILDER_H_
+#endif  // ART_COMPILER_LLVM_IR_BUILDER_H_
diff --git a/compiler/llvm/llvm_compilation_unit.h b/compiler/llvm/llvm_compilation_unit.h
index a4f0adbab8..9de132379b 100644
--- a/compiler/llvm/llvm_compilation_unit.h
+++ b/compiler/llvm/llvm_compilation_unit.h
@@ -14,8 +14,8 @@
  * limitations under the License.
  */
 
-#ifndef ART_SRC_COMPILER_LLVM_LLVM_COMPILATION_UNIT_H_
-#define ART_SRC_COMPILER_LLVM_LLVM_COMPILATION_UNIT_H_
+#ifndef ART_COMPILER_LLVM_LLVM_COMPILATION_UNIT_H_
+#define ART_COMPILER_LLVM_LLVM_COMPILATION_UNIT_H_
 
 #include "base/logging.h"
 #include "base/mutex.h"
@@ -135,4 +135,4 @@ class LlvmCompilationUnit {
 } // namespace llvm
 } // namespace art
 
-#endif // ART_SRC_COMPILER_LLVM_LLVM_COMPILATION_UNIT_H_
+#endif  // ART_COMPILER_LLVM_LLVM_COMPILATION_UNIT_H_
diff --git a/compiler/llvm/md_builder.h b/compiler/llvm/md_builder.h
index 79a7caa04c..cc169a3219 100644
--- a/compiler/llvm/md_builder.h
+++ b/compiler/llvm/md_builder.h
@@ -14,8 +14,8 @@
  * limitations under the License.
  */
 
-#ifndef ART_SRC_COMPILER_LLVM_MD_BUILDER_H_
-#define ART_SRC_COMPILER_LLVM_MD_BUILDER_H_
+#ifndef ART_COMPILER_LLVM_MD_BUILDER_H_
+#define ART_COMPILER_LLVM_MD_BUILDER_H_
 
 #include "backend_types.h"
 
@@ -68,4 +68,4 @@ class MDBuilder : public LLVMMDBuilder {
 } // namespace llvm
 } // namespace art
 
-#endif // ART_SRC_COMPILER_LLVM_MD_BUILDER_H_
+#endif  // ART_COMPILER_LLVM_MD_BUILDER_H_
diff --git a/compiler/llvm/runtime_support_builder.h b/compiler/llvm/runtime_support_builder.h
index 267b406232..c3c0856bd0 100644
--- a/compiler/llvm/runtime_support_builder.h
+++ b/compiler/llvm/runtime_support_builder.h
@@ -14,8 +14,8 @@
  * limitations under the License.
  */
 
-#ifndef ART_SRC_COMPILER_LLVM_RUNTIME_SUPPORT_BUILDER_H_
-#define ART_SRC_COMPILER_LLVM_RUNTIME_SUPPORT_BUILDER_H_
+#ifndef ART_COMPILER_LLVM_RUNTIME_SUPPORT_BUILDER_H_
+#define ART_COMPILER_LLVM_RUNTIME_SUPPORT_BUILDER_H_
 
 #include "backend_types.h"
 #include "base/logging.h"
@@ -95,4 +95,4 @@ class RuntimeSupportBuilder {
 } // namespace llvm
 } // namespace art
 
-#endif // ART_SRC_COMPILER_LLVM_RUNTIME_SUPPORT_BUILDER_H_
+#endif  // ART_COMPILER_LLVM_RUNTIME_SUPPORT_BUILDER_H_
diff --git a/compiler/llvm/runtime_support_builder_arm.h b/compiler/llvm/runtime_support_builder_arm.h
index 3c5972fc33..6aa23b2306 100644
--- a/compiler/llvm/runtime_support_builder_arm.h
+++ b/compiler/llvm/runtime_support_builder_arm.h
@@ -14,8 +14,8 @@
  * limitations under the License.
  */
 
-#ifndef ART_SRC_COMPILER_LLVM_RUNTIME_SUPPORT_BUILDER_ARM_H_
-#define ART_SRC_COMPILER_LLVM_RUNTIME_SUPPORT_BUILDER_ARM_H_
+#ifndef ART_COMPILER_LLVM_RUNTIME_SUPPORT_BUILDER_ARM_H_
+#define ART_COMPILER_LLVM_RUNTIME_SUPPORT_BUILDER_ARM_H_
 
 #include "runtime_support_builder.h"
 
@@ -43,4 +43,4 @@ class RuntimeSupportBuilderARM : public RuntimeSupportBuilder {
 } // namespace llvm
 } // namespace art
 
-#endif // ART_SRC_COMPILER_LLVM_RUNTIME_SUPPORT_BUILDER_ARM_H_
+#endif  // ART_COMPILER_LLVM_RUNTIME_SUPPORT_BUILDER_ARM_H_
diff --git a/compiler/llvm/runtime_support_builder_thumb2.h b/compiler/llvm/runtime_support_builder_thumb2.h
index 4762a269f9..941bd6b2bb 100644
--- a/compiler/llvm/runtime_support_builder_thumb2.h
+++ b/compiler/llvm/runtime_support_builder_thumb2.h
@@ -14,8 +14,8 @@
  * limitations under the License.
  */
 
-#ifndef ART_SRC_COMPILER_LLVM_RUNTIME_SUPPORT_BUILDER_THUMB2_H_
-#define ART_SRC_COMPILER_LLVM_RUNTIME_SUPPORT_BUILDER_THUMB2_H_
+#ifndef ART_COMPILER_LLVM_RUNTIME_SUPPORT_BUILDER_THUMB2_H_
+#define ART_COMPILER_LLVM_RUNTIME_SUPPORT_BUILDER_THUMB2_H_
 
 #include "runtime_support_builder_arm.h"
 
@@ -34,4 +34,4 @@ class RuntimeSupportBuilderThumb2 : public RuntimeSupportBuilderARM {
 } // namespace llvm
 } // namespace art
 
-#endif // ART_SRC_COMPILER_LLVM_RUNTIME_SUPPORT_BUILDER_THUMB2_H_
+#endif  // ART_COMPILER_LLVM_RUNTIME_SUPPORT_BUILDER_THUMB2_H_
diff --git a/compiler/llvm/runtime_support_builder_x86.h b/compiler/llvm/runtime_support_builder_x86.h
index e5fdbc2e26..831d022ce5 100644
--- a/compiler/llvm/runtime_support_builder_x86.h
+++ b/compiler/llvm/runtime_support_builder_x86.h
@@ -14,8 +14,8 @@
  * limitations under the License.
  */
 
-#ifndef ART_SRC_COMPILER_LLVM_RUNTIME_SUPPORT_BUILDER_X86_H_
-#define ART_SRC_COMPILER_LLVM_RUNTIME_SUPPORT_BUILDER_X86_H_
+#ifndef ART_COMPILER_LLVM_RUNTIME_SUPPORT_BUILDER_X86_H_
+#define ART_COMPILER_LLVM_RUNTIME_SUPPORT_BUILDER_X86_H_
 
 #include "runtime_support_builder.h"
 
@@ -39,4 +39,4 @@ class RuntimeSupportBuilderX86 : public RuntimeSupportBuilder {
 } // namespace llvm
 } // namespace art
 
-#endif // ART_SRC_COMPILER_LLVM_RUNTIME_SUPPORT_BUILDER_X86_H_
+#endif  // ART_COMPILER_LLVM_RUNTIME_SUPPORT_BUILDER_X86_H_
diff --git a/compiler/llvm/runtime_support_llvm_func.h b/compiler/llvm/runtime_support_llvm_func.h
index ac6f3b869f..c0e76addc6 100644
--- a/compiler/llvm/runtime_support_llvm_func.h
+++ b/compiler/llvm/runtime_support_llvm_func.h
@@ -14,8 +14,8 @@
  * limitations under the License.
  */
 
-#ifndef ART_SRC_COMPILER_LLVM_RUNTIME_SUPPORT_FUNC_H_
-#define ART_SRC_COMPILER_LLVM_RUNTIME_SUPPORT_FUNC_H_
+#ifndef ART_COMPILER_LLVM_RUNTIME_SUPPORT_LLVM_FUNC_H_
+#define ART_COMPILER_LLVM_RUNTIME_SUPPORT_LLVM_FUNC_H_
 
 namespace art {
 namespace llvm {
@@ -35,4 +35,4 @@ namespace runtime_support {
 } // namespace llvm
 } // namespace art
 
-#endif // ART_SRC_COMPILER_LLVM_RUNTIME_SUPPORT_FUNC_H_
+#endif  // ART_COMPILER_LLVM_RUNTIME_SUPPORT_LLVM_FUNC_H_
diff --git a/compiler/llvm/utils_llvm.h b/compiler/llvm/utils_llvm.h
index 2e273f4fe9..a606b91958 100644
--- a/compiler/llvm/utils_llvm.h
+++ b/compiler/llvm/utils_llvm.h
@@ -14,8 +14,8 @@
  * limitations under the License.
  */
 
-#ifndef ART_SRC_UTILS_LLVM_H_
-#define ART_SRC_UTILS_LLVM_H_
+#ifndef ART_COMPILER_LLVM_UTILS_LLVM_H_
+#define ART_COMPILER_LLVM_UTILS_LLVM_H_
 
 #include <llvm/Analysis/Verifier.h>
 
@@ -29,4 +29,4 @@ namespace art {
 
 }  // namespace art
 
-#endif  // ART_SRC_UTILS_LLVM_H_
+#endif  // ART_COMPILER_LLVM_UTILS_LLVM_H_
diff --git a/compiler/oat_writer.h b/compiler/oat_writer.h
index 1f97bf853c..ea7156ea49 100644
--- a/compiler/oat_writer.h
+++ b/compiler/oat_writer.h
@@ -14,8 +14,8 @@
  * limitations under the License.
  */
 
-#ifndef ART_SRC_OAT_WRITER_H_
-#define ART_SRC_OAT_WRITER_H_
+#ifndef ART_COMPILER_OAT_WRITER_H_
+#define ART_COMPILER_OAT_WRITER_H_
 
 #include <stdint.h>
 
@@ -224,4 +224,4 @@ class OatWriter {
 
 }  // namespace art
 
-#endif  // ART_SRC_OAT_WRITER_H_
+#endif  // ART_COMPILER_OAT_WRITER_H_
diff --git a/compiler/sea_ir/instruction_tools.h b/compiler/sea_ir/instruction_tools.h
index f68cdd0784..b0bbc272c8 100644
--- a/compiler/sea_ir/instruction_tools.h
+++ b/compiler/sea_ir/instruction_tools.h
@@ -17,8 +17,8 @@
 
 #include "dex_instruction.h"
 
-#ifndef INSTRUCTION_TOOLS_H_
-#define INSTRUCTION_TOOLS_H_
+#ifndef ART_COMPILER_SEA_IR_INSTRUCTION_TOOLS_H_
+#define ART_COMPILER_SEA_IR_INSTRUCTION_TOOLS_H_
 
 // Note: This file has content cannibalized for SEA_IR from the MIR implementation,
 //       to avoid having a dependence on MIR.
@@ -121,4 +121,4 @@ class InstructionTools {
   static const int instruction_attributes_[];
 };
 } // end namespace sea_ir
-#endif // INSTRUCTION_TOOLS_H_
+#endif  // ART_COMPILER_SEA_IR_INSTRUCTION_TOOLS_H_
diff --git a/compiler/sea_ir/sea.h b/compiler/sea_ir/sea.h
index a133678225..7491d21763 100644
--- a/compiler/sea_ir/sea.h
+++ b/compiler/sea_ir/sea.h
@@ -15,8 +15,8 @@
  */
 
 
-#ifndef SEA_IR_H_
-#define SEA_IR_H_
+#ifndef ART_COMPILER_SEA_IR_SEA_H_
+#define ART_COMPILER_SEA_IR_SEA_H_
 
 #include <set>
 #include <map>
@@ -333,4 +333,4 @@ class SeaGraph {
   std::vector<Region*> regions_;
 };
 } // end namespace sea_ir
-#endif
+#endif  // ART_COMPILER_SEA_IR_SEA_H_
diff --git a/compiler/stubs/stubs.h b/compiler/stubs/stubs.h
index ebe761df35..d85eae8e1e 100644
--- a/compiler/stubs/stubs.h
+++ b/compiler/stubs/stubs.h
@@ -14,8 +14,8 @@
  * limitations under the License.
  */
 
-#ifndef ART_SRC_COMPILER_STUBS_STUBS_H_
-#define ART_SRC_COMPILER_STUBS_STUBS_H_
+#ifndef ART_COMPILER_STUBS_STUBS_H_
+#define ART_COMPILER_STUBS_STUBS_H_
 
 #include "runtime.h"
 
@@ -56,4 +56,4 @@ const std::vector<uint8_t>* CreateInterpreterToQuickEntry()
 
 }  // namespace art
 
-#endif  // ART_SRC_COMPILER_STUBS_STUBS_H_
+#endif  // ART_COMPILER_STUBS_STUBS_H_