Compiler: rearranging the deck chairs.

First of several steps to adopt the new source directory layout.  No
logic changes - just moved files around.

Change-Id: I087631f8aa23973e18da4dc7706249c490bee061

59 files changed, 168 insertions, 167 deletions

diff --git a/build/Android.common.mk b/build/Android.common.mk
index cd1d6dabc0..dd83136019 100644
--- a/build/Android.common.mk
+++ b/build/Android.common.mk
@@ -348,7 +348,7 @@ endif # HOST_ARCH != x86
 
 LIBART_ENUM_OPERATOR_OUT_HEADER_FILES := \
 	src/base/mutex.h \
-	src/compiler/compiler_enums.h \
+	src/compiler/dex/compiler_enums.h \
 	src/dex_file.h \
 	src/dex_instruction.h \
 	src/gc/gc_type.h \
diff --git a/build/Android.libart-compiler.mk b/build/Android.libart-compiler.mk
index 90d4cc75c5..7830f70005 100644
--- a/build/Android.libart-compiler.mk
+++ b/build/Android.libart-compiler.mk
@@ -15,39 +15,39 @@
 #
 
 LIBART_COMPILER_SRC_FILES := \
-	src/compiler/bb_opt.cc \
-	src/compiler/codegen/arm/assemble_arm.cc \
-	src/compiler/codegen/arm/call_arm.cc \
-	src/compiler/codegen/arm/fp_arm.cc \
-	src/compiler/codegen/arm/int_arm.cc \
-	src/compiler/codegen/arm/target_arm.cc \
-	src/compiler/codegen/arm/utility_arm.cc \
-	src/compiler/codegen/codegen_util.cc \
-	src/compiler/codegen/gen_common.cc \
-	src/compiler/codegen/gen_invoke.cc \
-	src/compiler/codegen/gen_loadstore.cc \
-	src/compiler/codegen/local_optimizations.cc \
-	src/compiler/codegen/mips/assemble_mips.cc \
-	src/compiler/codegen/mips/call_mips.cc \
-	src/compiler/codegen/mips/fp_mips.cc \
-	src/compiler/codegen/mips/int_mips.cc \
-	src/compiler/codegen/mips/target_mips.cc \
-	src/compiler/codegen/mips/utility_mips.cc \
-	src/compiler/codegen/mir_to_gbc.cc \
-	src/compiler/codegen/mir_to_lir.cc \
-	src/compiler/codegen/ralloc_util.cc \
-	src/compiler/codegen/x86/assemble_x86.cc \
-	src/compiler/codegen/x86/call_x86.cc \
-	src/compiler/codegen/x86/fp_x86.cc \
-	src/compiler/codegen/x86/int_x86.cc \
-	src/compiler/codegen/x86/target_x86.cc \
-	src/compiler/codegen/x86/utility_x86.cc \
-	src/compiler/compiler_utility.cc \
-	src/compiler/dataflow.cc \
-	src/compiler/frontend.cc \
-	src/compiler/ralloc.cc \
-	src/compiler/ssa_transformation.cc \
-	src/compiler/write_elf.cc \
+	src/compiler/dex/bb_opt.cc \
+	src/compiler/dex/quick/arm/assemble_arm.cc \
+	src/compiler/dex/quick/arm/call_arm.cc \
+	src/compiler/dex/quick/arm/fp_arm.cc \
+	src/compiler/dex/quick/arm/int_arm.cc \
+	src/compiler/dex/quick/arm/target_arm.cc \
+	src/compiler/dex/quick/arm/utility_arm.cc \
+	src/compiler/dex/quick/codegen_util.cc \
+	src/compiler/dex/quick/gen_common.cc \
+	src/compiler/dex/quick/gen_invoke.cc \
+	src/compiler/dex/quick/gen_loadstore.cc \
+	src/compiler/dex/quick/local_optimizations.cc \
+	src/compiler/dex/quick/mips/assemble_mips.cc \
+	src/compiler/dex/quick/mips/call_mips.cc \
+	src/compiler/dex/quick/mips/fp_mips.cc \
+	src/compiler/dex/quick/mips/int_mips.cc \
+	src/compiler/dex/quick/mips/target_mips.cc \
+	src/compiler/dex/quick/mips/utility_mips.cc \
+	src/compiler/dex/quick/mir_to_lir.cc \
+	src/compiler/dex/quick/ralloc_util.cc \
+	src/compiler/dex/quick/x86/assemble_x86.cc \
+	src/compiler/dex/quick/x86/call_x86.cc \
+	src/compiler/dex/quick/x86/fp_x86.cc \
+	src/compiler/dex/quick/x86/int_x86.cc \
+	src/compiler/dex/quick/x86/target_x86.cc \
+	src/compiler/dex/quick/x86/utility_x86.cc \
+	src/compiler/dex/portable/mir_to_gbc.cc \
+	src/compiler/dex/compiler_utility.cc \
+	src/compiler/dex/dataflow.cc \
+	src/compiler/dex/frontend.cc \
+	src/compiler/dex/ralloc.cc \
+	src/compiler/dex/ssa_transformation.cc \
+	src/compiler/dex/write_elf.cc \
 	src/elf_writer.cc \
 	src/greenland/intrinsic_helper.cc \
 	src/greenland/ir_builder.cc \
diff --git a/src/compiler/bb_opt.cc b/src/compiler/dex/bb_opt.cc
index 3ad58213ae..3ad58213ae 100644
--- a/src/compiler/bb_opt.cc
+++ b/src/compiler/dex/bb_opt.cc
diff --git a/src/compiler/bb_opt.h b/src/compiler/dex/bb_opt.h
index 9eba06fbdc..aedbc10496 100644
--- a/src/compiler/bb_opt.h
+++ b/src/compiler/dex/bb_opt.h
@@ -14,8 +14,8 @@
  * limitations under the License.
  */
 
-#ifndef ART_SRC_COMPILER_BBOPT_H_
-#define ART_SRC_COMPILER_BBOPT_H_
+#ifndef ART_SRC_COMPILER_DEX_BBOPT_H_
+#define ART_SRC_COMPILER_DEX_BBOPT_H_
 
 #include "compiler_internals.h"
 
@@ -149,4 +149,4 @@ class BBOpt {
 
 } // namespace art
 
-#endif   // ART_SRC_COMPILER_BBOPT_H_
+#endif   // ART_SRC_COMPILER_DEX_BBOPT_H_
diff --git a/src/compiler/compiler_enums.h b/src/compiler/dex/compiler_enums.h
index 24930edde6..3eb862fe37 100644
--- a/src/compiler/compiler_enums.h
+++ b/src/compiler/dex/compiler_enums.h
@@ -14,8 +14,8 @@
  * limitations under the License.
  */
 
-#ifndef ART_SRC_COMPILER_COMPILERENUMS_H_
-#define ART_SRC_COMPILER_COMPILERENUMS_H_
+#ifndef ART_SRC_COMPILER_DEX_COMPILERENUMS_H_
+#define ART_SRC_COMPILER_DEX_COMPILERENUMS_H_
 
 #include "dex_instruction.h"
 
@@ -403,4 +403,4 @@ std::ostream& operator<<(std::ostream& os, const OpFeatureFlags& flag);
 
 }  // namespace art
 
-#endif // ART_SRC_COMPILER_COMPILERENUMS_H_
+#endif // ART_SRC_COMPILER_DEX_COMPILERENUMS_H_
diff --git a/src/compiler/compiler_internals.h b/src/compiler/dex/compiler_internals.h
index 746999d43c..c85700af1a 100644
--- a/src/compiler/compiler_internals.h
+++ b/src/compiler/dex/compiler_internals.h
@@ -14,8 +14,8 @@
  * limitations under the License.
  */
 
-#ifndef ART_SRC_COMPILER_COMPILER_INTERNAL_H_
-#define ART_SRC_COMPILER_COMPILER_INTERNAL_H_
+#ifndef ART_SRC_COMPILER_DEX_COMPILER_INTERNAL_H_
+#define ART_SRC_COMPILER_DEX_COMPILER_INTERNAL_H_
 
 #include <assert.h>
 #include <stdbool.h>
@@ -24,7 +24,7 @@
 
 #include "base/logging.h"
 #include "class_linker.h"
-#include "codegen/codegen.h"
+#include "quick/codegen.h"
 #include "compiler.h"
 #include "compiler_ir.h"
 #include "compiler_utility.h"
@@ -36,4 +36,4 @@
 #include "thread.h"
 #include "utils.h"
 
-#endif  // ART_SRC_COMPILER_COMPILER_INTERNAL_H_
+#endif  // ART_SRC_COMPILER_DEX_COMPILER_INTERNAL_H_
diff --git a/src/compiler/compiler_ir.h b/src/compiler/dex/compiler_ir.h
index 50cdc02346..246d200d16 100644
--- a/src/compiler/compiler_ir.h
+++ b/src/compiler/dex/compiler_ir.h
@@ -14,8 +14,8 @@
  * limitations under the License.
  */
 
-#ifndef ART_SRC_COMPILER_COMPILER_IR_H_
-#define ART_SRC_COMPILER_COMPILER_IR_H_
+#ifndef ART_SRC_COMPILER_DEX_COMPILER_IR_H_
+#define ART_SRC_COMPILER_DEX_COMPILER_IR_H_
 
 #include <vector>
 #include "dex_instruction.h"
@@ -624,4 +624,4 @@ static inline bool MustFlushConstant(const CompilationUnit* cu, RegLocation loc)
 
 }  // namespace art
 
-#endif // ART_SRC_COMPILER_COMPILER_IR_H_
+#endif // ART_SRC_COMPILER_DEX_COMPILER_IR_H_
diff --git a/src/compiler/compiler_utility.cc b/src/compiler/dex/compiler_utility.cc
index b5185b00e6..b5185b00e6 100644
--- a/src/compiler/compiler_utility.cc
+++ b/src/compiler/dex/compiler_utility.cc
diff --git a/src/compiler/compiler_utility.h b/src/compiler/dex/compiler_utility.h
index 87ace78fc4..582d32dd4a 100644
--- a/src/compiler/compiler_utility.h
+++ b/src/compiler/dex/compiler_utility.h
@@ -14,8 +14,8 @@
  * limitations under the License.
  */
 
-#ifndef ART_SRC_COMPILER_COMPILER_UTILITY_H_
-#define ART_SRC_COMPILER_COMPILER_UTILITY_H_
+#ifndef ART_SRC_COMPILER_DEX_COMPILER_UTILITY_H_
+#define ART_SRC_COMPILER_DEX_COMPILER_UTILITY_H_
 
 #include <stdint.h>
 #include <stddef.h>
@@ -194,4 +194,4 @@ void InsertLIRAfter(LIR* current_lir, LIR* new_lir);
 
 }  // namespace art
 
-#endif  // ART_SRC_COMPILER_COMPILER_UTILITY_H_
+#endif  // ART_SRC_COMPILER_DEX_COMPILER_UTILITY_H_
diff --git a/src/compiler/dataflow.cc b/src/compiler/dex/dataflow.cc
index 2ce16a4aa0..2ce16a4aa0 100644
--- a/src/compiler/dataflow.cc
+++ b/src/compiler/dex/dataflow.cc
diff --git a/src/compiler/dataflow.h b/src/compiler/dex/dataflow.h
index 22ea33e1f8..5bf97ec303 100644
--- a/src/compiler/dataflow.h
+++ b/src/compiler/dex/dataflow.h
@@ -14,8 +14,8 @@
  * limitations under the License.
  */
 
-#ifndef ART_SRC_COMPILER_DATAFLOW_H_
-#define ART_SRC_COMPILER_DATAFLOW_H_
+#ifndef ART_SRC_COMPILER_DEX_DATAFLOW_H_
+#define ART_SRC_COMPILER_DEX_DATAFLOW_H_
 
 #include "compiler_internals.h"
 
@@ -179,4 +179,4 @@ void MethodUseCount(CompilationUnit *cu);
 
 }  // namespace art
 
-#endif  // ART_SRC_COMPILER_DATAFLOW_H_
+#endif  // ART_SRC_COMPILER_DEX_DATAFLOW_H_
diff --git a/src/compiler/frontend.cc b/src/compiler/dex/frontend.cc
index c0f3316720..498600f4b2 100644
--- a/src/compiler/frontend.cc
+++ b/src/compiler/dex/frontend.cc
@@ -21,9 +21,9 @@
 #include "leb128.h"
 #include "mirror/object.h"
 #include "runtime.h"
-#include "codegen/codegen_util.h"
-#include "codegen/mir_to_gbc.h"
-#include "codegen/mir_to_lir.h"
+#include "quick/codegen_util.h"
+#include "portable/mir_to_gbc.h"
+#include "quick/mir_to_lir.h"
 
 #include <llvm/Support/Threading.h>
 
diff --git a/src/compiler/frontend.h b/src/compiler/dex/frontend.h
index 9cf3080ef0..b261c65a1c 100644
--- a/src/compiler/frontend.h
+++ b/src/compiler/dex/frontend.h
@@ -14,8 +14,8 @@
  * limitations under the License.
  */
 
-#ifndef ART_SRC_COMPILER_COMPILER_H_
-#define ART_SRC_COMPILER_COMPILER_H_
+#ifndef ART_SRC_COMPILER_DEX_COMPILER_H_
+#define ART_SRC_COMPILER_DEX_COMPILER_H_
 
 #include "dex_file.h"
 #include "dex_instruction.h"
@@ -150,4 +150,4 @@ extern "C" art::CompiledMethod* ArtCompileMethod(art::Compiler& compiler,
                                                  jobject class_loader,
                                                  const art::DexFile& dex_file);
 
-#endif // ART_SRC_COMPILER_COMPILER_H_
+#endif // ART_SRC_COMPILER_DEX_COMPILER_H_
diff --git a/src/compiler/codegen/mir_to_gbc.cc b/src/compiler/dex/portable/mir_to_gbc.cc
index a2c2bbcca6..31fa96a41d 100644
--- a/src/compiler/codegen/mir_to_gbc.cc
+++ b/src/compiler/dex/portable/mir_to_gbc.cc
@@ -27,10 +27,12 @@
 #include <llvm/Support/Casting.h>
 #include <llvm/Support/InstIterator.h>
 
-#include "codegen_util.h"
-#include "compiler/compiler_internals.h"
-#include "local_optimizations.h"
-#include "ralloc_util.h"
+#include "compiler/dex/compiler_internals.h"
+
+//TODO: move gbc_to_lir code into quick directory (if necessary).
+#include "compiler/dex/quick/codegen_util.h"
+#include "compiler/dex/quick/local_optimizations.h"
+#include "compiler/dex/quick/ralloc_util.h"
 
 static const char* kLabelFormat = "%c0x%x_%d";
 static const char kInvalidBlock = 0xff;
diff --git a/src/compiler/codegen/mir_to_gbc.h b/src/compiler/dex/portable/mir_to_gbc.h
index a9660de098..a3b5b310c3 100644
--- a/src/compiler/codegen/mir_to_gbc.h
+++ b/src/compiler/dex/portable/mir_to_gbc.h
@@ -14,8 +14,8 @@
  * limitations under the License.
  */
 
-#ifndef ART_SRC_COMPILER_CODEGEN_MIRTOGBC_H_
-#define ART_SRC_COMPILER_CODEGEN_MIRTOGBC_H_
+#ifndef ART_SRC_COMPILER_DEX_PORTABLE_MIRTOGBC_H_
+#define ART_SRC_COMPILER_DEX_PORTABLE_MIRTOGBC_H_
 
 namespace art {
 
@@ -24,4 +24,4 @@ void MethodBitcode2LIR(CompilationUnit* cu);
 
 }  // namespace art
 
-#endif // ART_SRC_COMPILER_CODEGEN_MIRTOGBC_H_
+#endif // ART_SRC_COMPILER_DEX_PORTABLE_MIRTOGBC_H_
diff --git a/src/compiler/codegen/arm/arm_lir.h b/src/compiler/dex/quick/arm/arm_lir.h
index c41f53bf9a..abcaacc214 100644
--- a/src/compiler/codegen/arm/arm_lir.h
+++ b/src/compiler/dex/quick/arm/arm_lir.h
@@ -14,10 +14,10 @@
  * limitations under the License.
  */
 
-#ifndef ART_SRC_COMPILER_CODEGEN_ARM_ARMLIR_H_
-#define ART_SRC_COMPILER_CODEGEN_ARM_ARMLIR_H_
+#ifndef ART_SRC_COMPILER_DEX_QUICK_ARM_ARMLIR_H_
+#define ART_SRC_COMPILER_DEX_QUICK_ARM_ARMLIR_H_
 
-#include "compiler/compiler_internals.h"
+#include "compiler/dex/compiler_internals.h"
 
 namespace art {
 
@@ -496,4 +496,4 @@ struct ArmEncodingMap {
 
 }  // namespace art
 
-#endif  // ART_SRC_COMPILER_CODEGEN_ARM_ARMLIR_H_
+#endif  // ART_SRC_COMPILER_DEX_QUICK_ARM_ARMLIR_H_
diff --git a/src/compiler/codegen/arm/assemble_arm.cc b/src/compiler/dex/quick/arm/assemble_arm.cc
index 455ea67577..32bb5df9f1 100644
--- a/src/compiler/codegen/arm/assemble_arm.cc
+++ b/src/compiler/dex/quick/arm/assemble_arm.cc
@@ -16,7 +16,7 @@
 
 #include "arm_lir.h"
 #include "codegen_arm.h"
-#include "compiler/codegen/codegen_util.h"
+#include "compiler/dex/quick/codegen_util.h"
 
 namespace art {
 
diff --git a/src/compiler/codegen/arm/call_arm.cc b/src/compiler/dex/quick/arm/call_arm.cc
index e8dc10b0b1..09e8f3f5a8 100644
--- a/src/compiler/codegen/arm/call_arm.cc
+++ b/src/compiler/dex/quick/arm/call_arm.cc
@@ -18,8 +18,8 @@
 
 #include "arm_lir.h"
 #include "codegen_arm.h"
-#include "compiler/codegen/codegen_util.h"
-#include "compiler/codegen/ralloc_util.h"
+#include "compiler/dex/quick/codegen_util.h"
+#include "compiler/dex/quick/ralloc_util.h"
 #include "oat/runtime/oat_support_entrypoints.h"
 #include "oat_compilation_unit.h"
 
diff --git a/src/compiler/codegen/arm/codegen_arm.h b/src/compiler/dex/quick/arm/codegen_arm.h
index 17b8357056..e77394ce14 100644
--- a/src/compiler/codegen/arm/codegen_arm.h
+++ b/src/compiler/dex/quick/arm/codegen_arm.h
@@ -14,10 +14,10 @@
  * limitations under the License.
  */
 
-#ifndef ART_SRC_COMPILER_CODEGEN_ARM_CODEGENARM_H_
-#define ART_SRC_COMPILER_CODEGEN_ARM_CODEGENARM_H_
+#ifndef ART_SRC_COMPILER_DEX_QUICK_ARM_CODEGENARM_H_
+#define ART_SRC_COMPILER_DEX_QUICK_ARM_CODEGENARM_H_
 
-#include "compiler/compiler_internals.h"
+#include "compiler/dex/compiler_internals.h"
 
 namespace art {
 
@@ -215,4 +215,4 @@ class ArmCodegen : public Codegen {
 
 }  // namespace art
 
-#endif  // ART_SRC_COMPILER_CODEGEN_ARM_CODEGENARM_H_
+#endif  // ART_SRC_COMPILER_DEX_QUICK_ARM_CODEGENARM_H_
diff --git a/src/compiler/codegen/arm/fp_arm.cc b/src/compiler/dex/quick/arm/fp_arm.cc
index 14d766f27a..cc65217b03 100644
--- a/src/compiler/codegen/arm/fp_arm.cc
+++ b/src/compiler/dex/quick/arm/fp_arm.cc
@@ -16,8 +16,8 @@
 
 #include "arm_lir.h"
 #include "codegen_arm.h"
-#include "compiler/codegen/codegen_util.h"
-#include "compiler/codegen/ralloc_util.h"
+#include "compiler/dex/quick/codegen_util.h"
+#include "compiler/dex/quick/ralloc_util.h"
 
 namespace art {
 
diff --git a/src/compiler/codegen/arm/int_arm.cc b/src/compiler/dex/quick/arm/int_arm.cc
index e927b13181..0018d44aec 100644
--- a/src/compiler/codegen/arm/int_arm.cc
+++ b/src/compiler/dex/quick/arm/int_arm.cc
@@ -18,8 +18,8 @@
 
 #include "arm_lir.h"
 #include "codegen_arm.h"
-#include "compiler/codegen/codegen_util.h"
-#include "compiler/codegen/ralloc_util.h"
+#include "compiler/dex/quick/codegen_util.h"
+#include "compiler/dex/quick/ralloc_util.h"
 #include "oat/runtime/oat_support_entrypoints.h"
 #include "oat_compilation_unit.h"
 
diff --git a/src/compiler/codegen/arm/target_arm.cc b/src/compiler/dex/quick/arm/target_arm.cc
index f871f3da7a..f03e07c0ab 100644
--- a/src/compiler/codegen/arm/target_arm.cc
+++ b/src/compiler/dex/quick/arm/target_arm.cc
@@ -18,9 +18,9 @@
 
 #include "arm_lir.h"
 #include "codegen_arm.h"
-#include "compiler/codegen/codegen_util.h"
-#include "compiler/compiler_internals.h"
-#include "compiler/codegen/ralloc_util.h"
+#include "compiler/dex/quick/codegen_util.h"
+#include "compiler/dex/compiler_internals.h"
+#include "compiler/dex/quick/ralloc_util.h"
 
 namespace art {
 
diff --git a/src/compiler/codegen/arm/utility_arm.cc b/src/compiler/dex/quick/arm/utility_arm.cc
index d6ef6e5d04..ba543ac988 100644
--- a/src/compiler/codegen/arm/utility_arm.cc
+++ b/src/compiler/dex/quick/arm/utility_arm.cc
@@ -16,8 +16,8 @@
 
 #include "arm_lir.h"
 #include "codegen_arm.h"
-#include "compiler/codegen/codegen_util.h"
-#include "compiler/codegen/ralloc_util.h"
+#include "compiler/dex/quick/codegen_util.h"
+#include "compiler/dex/quick/ralloc_util.h"
 
 namespace art {
 
diff --git a/src/compiler/codegen/codegen.h b/src/compiler/dex/quick/codegen.h
index 4085a41e39..63c8460b2b 100644
--- a/src/compiler/codegen/codegen.h
+++ b/src/compiler/dex/quick/codegen.h
@@ -14,10 +14,10 @@
  * limitations under the License.
  */
 
-#ifndef ART_SRC_COMPILER_CODEGEN_CODEGEN_H_
-#define ART_SRC_COMPILER_CODEGEN_CODEGEN_H_
+#ifndef ART_SRC_COMPILER_DEX_QUICK_CODEGEN_H_
+#define ART_SRC_COMPILER_DEX_QUICK_CODEGEN_H_
 
-#include "compiler/compiler_ir.h"
+#include "compiler/dex/compiler_ir.h"
 
 namespace art {
 
@@ -403,4 +403,4 @@ class Codegen {
 
 }  // namespace art
 
-#endif // ART_SRC_COMPILER_CODEGEN_CODEGEN_H_
+#endif // ART_SRC_COMPILER_DEX_QUICK_CODEGEN_H_
diff --git a/src/compiler/codegen/codegen_util.cc b/src/compiler/dex/quick/codegen_util.cc
index 57d932f6e3..06221f8a4b 100644
--- a/src/compiler/codegen/codegen_util.cc
+++ b/src/compiler/dex/quick/codegen_util.cc
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-#include "compiler/compiler_internals.h"
+#include "compiler/dex/compiler_internals.h"
 #include "gc_map.h"
 #include "verifier/dex_gc_map.h"
 #include "verifier/method_verifier.h"
diff --git a/src/compiler/codegen/codegen_util.h b/src/compiler/dex/quick/codegen_util.h
index 9b9bece585..7fd26f337a 100644
--- a/src/compiler/codegen/codegen_util.h
+++ b/src/compiler/dex/quick/codegen_util.h
@@ -14,13 +14,13 @@
  * limitations under the License.
  */
 
-#ifndef ART_SRC_COMPILER_CODEGEN_CODEGENUTIL_H_
-#define ART_SRC_COMPILER_CODEGEN_CODEGENUTIL_H_
+#ifndef ART_SRC_COMPILER_DEX_QUICK_CODEGENUTIL_H_
+#define ART_SRC_COMPILER_DEX_QUICK_CODEGENUTIL_H_
 
 #include <stdint.h>
 
-#include "compiler/compiler_enums.h"
-#include "compiler/compiler_ir.h"
+#include "compiler/dex/compiler_enums.h"
+#include "compiler/dex/compiler_ir.h"
 
 namespace art {
 
@@ -65,4 +65,4 @@ ConditionCode FlipComparisonOrder(ConditionCode before);
 
 }  // namespace art
 
-#endif // ART_SRC_COMPILER_CODEGEN_CODEGENUTIL_H_
+#endif // ART_SRC_COMPILER_DEX_QUICK_CODEGENUTIL_H_
diff --git a/src/compiler/codegen/gen_common.cc b/src/compiler/dex/quick/gen_common.cc
index 2eaa6b0343..bc022fc84e 100644
--- a/src/compiler/codegen/gen_common.cc
+++ b/src/compiler/dex/quick/gen_common.cc
@@ -15,7 +15,7 @@
  */
 
 #include "codegen_util.h"
-#include "compiler/compiler_ir.h"
+#include "compiler/dex/compiler_ir.h"
 #include "oat/runtime/oat_support_entrypoints.h"
 #include "ralloc_util.h"
 
diff --git a/src/compiler/codegen/gen_invoke.cc b/src/compiler/dex/quick/gen_invoke.cc
index c47b9ebce7..9a1fa5c4bf 100644
--- a/src/compiler/codegen/gen_invoke.cc
+++ b/src/compiler/dex/quick/gen_invoke.cc
@@ -15,7 +15,7 @@
  */
 
 #include "codegen_util.h"
-#include "compiler/compiler_ir.h"
+#include "compiler/dex/compiler_ir.h"
 #include "oat/runtime/oat_support_entrypoints.h"
 #include "ralloc_util.h"
 #include "x86/codegen_x86.h"
diff --git a/src/compiler/codegen/gen_loadstore.cc b/src/compiler/dex/quick/gen_loadstore.cc
index c8f9c51ffd..b945e3173f 100644
--- a/src/compiler/codegen/gen_loadstore.cc
+++ b/src/compiler/dex/quick/gen_loadstore.cc
@@ -15,7 +15,7 @@
  */
 
 #include "codegen_util.h"
-#include "compiler/compiler_ir.h"
+#include "compiler/dex/compiler_ir.h"
 #include "ralloc_util.h"
 
 namespace art {
diff --git a/src/compiler/codegen/local_optimizations.cc b/src/compiler/dex/quick/local_optimizations.cc
index 2b86421bc4..3c58937300 100644
--- a/src/compiler/codegen/local_optimizations.cc
+++ b/src/compiler/dex/quick/local_optimizations.cc
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-#include "compiler/compiler_internals.h"
+#include "compiler/dex/compiler_internals.h"
 
 namespace art {
 
diff --git a/src/compiler/codegen/local_optimizations.h b/src/compiler/dex/quick/local_optimizations.h
index 74bae15162..3a376fe3cf 100644
--- a/src/compiler/codegen/local_optimizations.h
+++ b/src/compiler/dex/quick/local_optimizations.h
@@ -14,8 +14,8 @@
  * limitations under the License.
  */
 
-#ifndef ART_SRC_COMPILER_CODEGEN_LOCALOPTIMIZATIONS_H_
-#define ART_SRC_COMPILER_CODEGEN_LOCALOPTIMIZATIONS_H_
+#ifndef ART_SRC_COMPILER_DEX_QUICK_LOCALOPTIMIZATIONS_H_
+#define ART_SRC_COMPILER_DEX_QUICK_LOCALOPTIMIZATIONS_H_
 
 namespace art {
 
@@ -24,4 +24,4 @@ void RemoveRedundantBranches(CompilationUnit* cu);
 
 }  // namespace art
 
-#endif // ART_SRC_COMPILER_CODEGEN_LOCALOPTIMIZATIONS_H_
+#endif // ART_SRC_COMPILER_DEX_QUICK_LOCALOPTIMIZATIONS_H_
diff --git a/src/compiler/codegen/mips/README.mips b/src/compiler/dex/quick/mips/README.mips
index 061c157256..061c157256 100644
--- a/src/compiler/codegen/mips/README.mips
+++ b/src/compiler/dex/quick/mips/README.mips
diff --git a/src/compiler/codegen/mips/assemble_mips.cc b/src/compiler/dex/quick/mips/assemble_mips.cc
index 34a91b08e2..c5cd401e48 100644
--- a/src/compiler/codegen/mips/assemble_mips.cc
+++ b/src/compiler/dex/quick/mips/assemble_mips.cc
@@ -15,7 +15,7 @@
  */
 
 #include "codegen_mips.h"
-#include "compiler/codegen/codegen_util.h"
+#include "compiler/dex/quick/codegen_util.h"
 #include "mips_lir.h"
 
 namespace art {
diff --git a/src/compiler/codegen/mips/call_mips.cc b/src/compiler/dex/quick/mips/call_mips.cc
index 39fdc0335a..4fbb16b00f 100644
--- a/src/compiler/codegen/mips/call_mips.cc
+++ b/src/compiler/dex/quick/mips/call_mips.cc
@@ -17,8 +17,8 @@
 /* This file contains codegen for the Mips ISA */
 
 #include "codegen_mips.h"
-#include "compiler/codegen/codegen_util.h"
-#include "compiler/codegen/ralloc_util.h"
+#include "compiler/dex/quick/codegen_util.h"
+#include "compiler/dex/quick/ralloc_util.h"
 #include "mips_lir.h"
 #include "oat/runtime/oat_support_entrypoints.h"
 
diff --git a/src/compiler/codegen/mips/codegen_mips.h b/src/compiler/dex/quick/mips/codegen_mips.h
index 10a3f77377..f889ece9bb 100644
--- a/src/compiler/codegen/mips/codegen_mips.h
+++ b/src/compiler/dex/quick/mips/codegen_mips.h
@@ -14,10 +14,10 @@
  * limitations under the License.
  */
 
-#ifndef ART_SRC_COMPILER_CODEGEN_MIPS_CODEGENMIPS_H_
-#define ART_SRC_COMPILER_CODEGEN_MIPS_CODEGENMIPS_H_
+#ifndef ART_SRC_DEX_QUICK_CODEGEN_MIPS_CODEGENMIPS_H_
+#define ART_SRC_DEX_QUICK_CODEGEN_MIPS_CODEGENMIPS_H_
 
-#include "compiler/compiler_internals.h"
+#include "compiler/dex/compiler_internals.h"
 #include "mips_lir.h"
 
 namespace art {
@@ -205,4 +205,4 @@ class MipsCodegen : public Codegen {
 
 }  // namespace art
 
-#endif  // ART_SRC_COMPILER_CODEGEN_MIPS_CODEGENMIPS_H_
+#endif  // ART_SRC_DEX_QUICK_CODEGEN_MIPS_CODEGENMIPS_H_
diff --git a/src/compiler/codegen/mips/fp_mips.cc b/src/compiler/dex/quick/mips/fp_mips.cc
index 0c4653d826..96007d8c6e 100644
--- a/src/compiler/codegen/mips/fp_mips.cc
+++ b/src/compiler/dex/quick/mips/fp_mips.cc
@@ -15,8 +15,8 @@
  */
 
 #include "codegen_mips.h"
-#include "compiler/codegen/codegen_util.h"
-#include "compiler/codegen/ralloc_util.h"
+#include "compiler/dex/quick/codegen_util.h"
+#include "compiler/dex/quick/ralloc_util.h"
 #include "mips_lir.h"
 #include "oat/runtime/oat_support_entrypoints.h"
 
diff --git a/src/compiler/codegen/mips/int_mips.cc b/src/compiler/dex/quick/mips/int_mips.cc
index 8e71ca6110..d648c447cb 100644
--- a/src/compiler/codegen/mips/int_mips.cc
+++ b/src/compiler/dex/quick/mips/int_mips.cc
@@ -17,8 +17,8 @@
 /* This file contains codegen for the Mips ISA */
 
 #include "codegen_mips.h"
-#include "compiler/codegen/codegen_util.h"
-#include "compiler/codegen/ralloc_util.h"
+#include "compiler/dex/quick/codegen_util.h"
+#include "compiler/dex/quick/ralloc_util.h"
 #include "mips_lir.h"
 #include "oat/runtime/oat_support_entrypoints.h"
 
diff --git a/src/compiler/codegen/mips/mips_lir.h b/src/compiler/dex/quick/mips/mips_lir.h
index 41e598fa39..9771ea9364 100644
--- a/src/compiler/codegen/mips/mips_lir.h
+++ b/src/compiler/dex/quick/mips/mips_lir.h
@@ -14,10 +14,10 @@
  * limitations under the License.
  */
 
-#ifndef ART_COMPILER_COMPILER_CODEGEN_MIPS_MIPSLIR_H_
-#define ART_COMPILER_COMPILER_CODEGEN_MIPS_MIPSLIR_H_
+#ifndef ART_SRC_COMPILER_DEX_QUICK_MIPS_MIPSLIR_H_
+#define ART_SRC_COMPILER_DEX_QUICK_MIPS_MIPSLIR_H_
 
-#include "compiler/compiler_internals.h"
+#include "compiler/dex/compiler_internals.h"
 
 namespace art {
 
@@ -429,4 +429,4 @@ extern MipsEncodingMap EncodingMap[kMipsLast];
 
 }  // namespace art
 
-#endif  // ART_COMPILER_COMPILER_CODEGEN_MIPS_MIPSLIR_H_
+#endif  // ART_SRC_COMPILER_DEX_QUICK_MIPS_MIPSLIR_H_
diff --git a/src/compiler/codegen/mips/target_mips.cc b/src/compiler/dex/quick/mips/target_mips.cc
index de19ac08a9..ab6517c6c9 100644
--- a/src/compiler/codegen/mips/target_mips.cc
+++ b/src/compiler/dex/quick/mips/target_mips.cc
@@ -15,9 +15,9 @@
  */
 
 #include "codegen_mips.h"
-#include "compiler/codegen/codegen_util.h"
-#include "compiler/compiler_internals.h"
-#include "compiler/codegen/ralloc_util.h"
+#include "compiler/dex/quick/codegen_util.h"
+#include "compiler/dex/compiler_internals.h"
+#include "compiler/dex/quick/ralloc_util.h"
 #include "mips_lir.h"
 
 #include <string>
diff --git a/src/compiler/codegen/mips/utility_mips.cc b/src/compiler/dex/quick/mips/utility_mips.cc
index 12d054cf3c..168eb6883a 100644
--- a/src/compiler/codegen/mips/utility_mips.cc
+++ b/src/compiler/dex/quick/mips/utility_mips.cc
@@ -15,8 +15,8 @@
  */
 
 #include "codegen_mips.h"
-#include "compiler/codegen/codegen_util.h"
-#include "compiler/codegen/ralloc_util.h"
+#include "compiler/dex/quick/codegen_util.h"
+#include "compiler/dex/quick/ralloc_util.h"
 #include "mips_lir.h"
 
 namespace art {
diff --git a/src/compiler/codegen/mir_to_lir.cc b/src/compiler/dex/quick/mir_to_lir.cc
index 1e777d96b4..267f61e2b5 100644
--- a/src/compiler/codegen/mir_to_lir.cc
+++ b/src/compiler/dex/quick/mir_to_lir.cc
@@ -16,7 +16,7 @@
 
 #include "object_utils.h"
 
-#include "compiler/compiler_internals.h"
+#include "compiler/dex/compiler_internals.h"
 #include "local_optimizations.h"
 #include "codegen_util.h"
 #include "ralloc_util.h"
diff --git a/src/compiler/codegen/mir_to_lir.h b/src/compiler/dex/quick/mir_to_lir.h
index 084498ae6c..b2767ba622 100644
--- a/src/compiler/codegen/mir_to_lir.h
+++ b/src/compiler/dex/quick/mir_to_lir.h
@@ -14,8 +14,8 @@
  * limitations under the License.
  */
 
-#ifndef ART_SRC_COMPILER_CODEGEN_MIRTOLIR_H_
-#define ART_SRC_COMPILER_CODEGEN_MIRTOLIR_H_
+#ifndef ART_SRC_COMPILER_DEX_QUICK_MIRTOLIR_H_
+#define ART_SRC_COMPILER_DEX_QUICK_MIRTOLIR_H_
 
 namespace art {
 void SpecialMIR2LIR(CompilationUnit* cu, SpecialCaseHandler special_case);
@@ -24,4 +24,4 @@ void MethodMIR2LIR(CompilationUnit* cu);
 
 }  // namespace art
 
-#endif // ART_SRC_COMPILER_CODEGEN_MIRTOLIR_H_
+#endif // ART_SRC_COMPILER_DEX_QUICK_MIRTOLIR_H_
diff --git a/src/compiler/codegen/ralloc_util.cc b/src/compiler/dex/quick/ralloc_util.cc
index 3a3aeba332..a782264ecd 100644
--- a/src/compiler/codegen/ralloc_util.cc
+++ b/src/compiler/dex/quick/ralloc_util.cc
@@ -17,9 +17,9 @@
 /* This file contains register alloction support. */
 
 #include "codegen_util.h"
-#include "compiler/compiler_ir.h"
-#include "compiler/compiler_utility.h"
-#include "compiler/dataflow.h"
+#include "compiler/dex/compiler_ir.h"
+#include "compiler/dex/compiler_utility.h"
+#include "compiler/dex/dataflow.h"
 #include "ralloc_util.h"
 
 namespace art {
diff --git a/src/compiler/codegen/ralloc_util.h b/src/compiler/dex/quick/ralloc_util.h
index 67c22b56e2..32870473ac 100644
--- a/src/compiler/codegen/ralloc_util.h
+++ b/src/compiler/dex/quick/ralloc_util.h
@@ -14,16 +14,16 @@
  * limitations under the License.
  */
 
-#ifndef ART_SRC_COMPILER_CODEGEN_RALLOCUTIL_H_
-#define ART_SRC_COMPILER_CODEGEN_RALLOCUTIL_H_
+#ifndef ART_SRC_COMPILER_DEX_QUICK_RALLOCUTIL_H_
+#define ART_SRC_COMPILER_DEX_QUICK_RALLOCUTIL_H_
 
 /*
  * This file contains target independent register alloction support.
  */
 
-#include "compiler/compiler_ir.h"
-#include "compiler/compiler_utility.h"
-#include "compiler/dataflow.h"
+#include "compiler/dex/compiler_ir.h"
+#include "compiler/dex/compiler_utility.h"
+#include "compiler/dex/dataflow.h"
 
 namespace art {
 
@@ -161,4 +161,4 @@ void DumpRegPool(RegisterInfo* p, int num_regs);
 
 }  // namespace art
 
-#endif // ART_SRC_COMPILER_CODEGEN_RALLOCUTIL_H_
+#endif // ART_SRC_COMPILER_DEX_QUICK_RALLOCUTIL_H_
diff --git a/src/compiler/codegen/x86/assemble_x86.cc b/src/compiler/dex/quick/x86/assemble_x86.cc
index f6ce0d1330..9ee0cb5b99 100644
--- a/src/compiler/codegen/x86/assemble_x86.cc
+++ b/src/compiler/dex/quick/x86/assemble_x86.cc
@@ -15,7 +15,7 @@
  */
 
 #include "codegen_x86.h"
-#include "compiler/codegen/codegen_util.h"
+#include "compiler/dex/quick/codegen_util.h"
 #include "x86_lir.h"
 
 namespace art {
diff --git a/src/compiler/codegen/x86/call_x86.cc b/src/compiler/dex/quick/x86/call_x86.cc
index 4209375b9d..7b1a7fb809 100644
--- a/src/compiler/codegen/x86/call_x86.cc
+++ b/src/compiler/dex/quick/x86/call_x86.cc
@@ -17,8 +17,8 @@
 /* This file contains codegen for the X86 ISA */
 
 #include "codegen_x86.h"
-#include "compiler/codegen/codegen_util.h"
-#include "compiler/codegen/ralloc_util.h"
+#include "compiler/dex/quick/codegen_util.h"
+#include "compiler/dex/quick/ralloc_util.h"
 #include "x86_lir.h"
 
 namespace art {
diff --git a/src/compiler/codegen/x86/codegen_x86.h b/src/compiler/dex/quick/x86/codegen_x86.h
index a004232196..c1e8fb3211 100644
--- a/src/compiler/codegen/x86/codegen_x86.h
+++ b/src/compiler/dex/quick/x86/codegen_x86.h
@@ -14,10 +14,10 @@
  * limitations under the License.
  */
 
-#ifndef ART_SRC_COMPILER_CODEGEN_X86_CODEGENX86_H_
-#define ART_SRC_COMPILER_CODEGEN_X86_CODEGENX86_H_
+#ifndef ART_SRC_COMPILER_DEX_QUICK_X86_CODEGENX86_H_
+#define ART_SRC_COMPILER_DEX_QUICK_X86_CODEGENX86_H_
 
-#include "compiler/compiler_internals.h"
+#include "compiler/dex/compiler_internals.h"
 #include "x86_lir.h"
 
 namespace art {
@@ -202,4 +202,4 @@ class X86Codegen : public Codegen {
 
 }  // namespace art
 
-#endif  // ART_SRC_COMPILER_CODEGEN_X86_CODEGENX86_H_
+#endif  // ART_SRC_COMPILER_DEX_QUICK_X86_CODEGENX86_H_
diff --git a/src/compiler/codegen/x86/fp_x86.cc b/src/compiler/dex/quick/x86/fp_x86.cc
index 04325873b5..888a4a6c84 100644
--- a/src/compiler/codegen/x86/fp_x86.cc
+++ b/src/compiler/dex/quick/x86/fp_x86.cc
@@ -15,8 +15,8 @@
  */
 
 #include "codegen_x86.h"
-#include "compiler/codegen/codegen_util.h"
-#include "compiler/codegen/ralloc_util.h"
+#include "compiler/dex/quick/codegen_util.h"
+#include "compiler/dex/quick/ralloc_util.h"
 #include "x86_lir.h"
 
 namespace art {
diff --git a/src/compiler/codegen/x86/int_x86.cc b/src/compiler/dex/quick/x86/int_x86.cc
index 09e5eb3816..81b1d72aa9 100644
--- a/src/compiler/codegen/x86/int_x86.cc
+++ b/src/compiler/dex/quick/x86/int_x86.cc
@@ -17,8 +17,8 @@
 /* This file contains codegen for the X86 ISA */
 
 #include "codegen_x86.h"
-#include "compiler/codegen/codegen_util.h"
-#include "compiler/codegen/ralloc_util.h"
+#include "compiler/dex/quick/codegen_util.h"
+#include "compiler/dex/quick/ralloc_util.h"
 #include "x86_lir.h"
 
 namespace art {
diff --git a/src/compiler/codegen/x86/target_x86.cc b/src/compiler/dex/quick/x86/target_x86.cc
index 6cb420ce79..cb41fde93d 100644
--- a/src/compiler/codegen/x86/target_x86.cc
+++ b/src/compiler/dex/quick/x86/target_x86.cc
@@ -15,9 +15,9 @@
  */
 
 #include "codegen_x86.h"
-#include "compiler/codegen/codegen_util.h"
-#include "compiler/compiler_internals.h"
-#include "compiler/codegen/ralloc_util.h"
+#include "compiler/dex/quick/codegen_util.h"
+#include "compiler/dex/compiler_internals.h"
+#include "compiler/dex/quick/ralloc_util.h"
 #include "x86_lir.h"
 
 #include <string>
diff --git a/src/compiler/codegen/x86/utility_x86.cc b/src/compiler/dex/quick/x86/utility_x86.cc
index 4cc2c182cb..fa40635db8 100644
--- a/src/compiler/codegen/x86/utility_x86.cc
+++ b/src/compiler/dex/quick/x86/utility_x86.cc
@@ -15,8 +15,8 @@
  */
 
 #include "codegen_x86.h"
-#include "compiler/codegen/codegen_util.h"
-#include "compiler/codegen/ralloc_util.h"
+#include "compiler/dex/quick/codegen_util.h"
+#include "compiler/dex/quick/ralloc_util.h"
 #include "x86_lir.h"
 
 namespace art {
diff --git a/src/compiler/codegen/x86/x86_lir.h b/src/compiler/dex/quick/x86/x86_lir.h
index c2722869c3..7e9e56e14a 100644
--- a/src/compiler/codegen/x86/x86_lir.h
+++ b/src/compiler/dex/quick/x86/x86_lir.h
@@ -14,10 +14,10 @@
  * limitations under the License.
  */
 
-#ifndef ART_COMPILER_COMPILER_CODEGEN_X86_X86LIR_H_
-#define ART_COMPILER_COMPILER_CODEGEN_X86_X86LIR_H_
+#ifndef ART_SRC_COMPILER_DEX_QUICK_X86_X86LIR_H_
+#define ART_SRC_COMPILER_DEX_QUICK_X86_X86LIR_H_
 
-#include "compiler/compiler_internals.h"
+#include "compiler/dex/compiler_internals.h"
 
 namespace art {
 
@@ -439,4 +439,4 @@ extern X86ConditionCode X86ConditionEncoding(ConditionCode cond);
 
 }  // namespace art
 
-#endif  // ART_COMPILER_COMPILER_CODEGEN_X86_X86LIR_H_
+#endif  // ART_SRC_COMPILER_DEX_QUICK_X86_X86LIR_H_
diff --git a/src/compiler/ralloc.cc b/src/compiler/dex/ralloc.cc
index 35142008d2..9163cd90f4 100644
--- a/src/compiler/ralloc.cc
+++ b/src/compiler/dex/ralloc.cc
@@ -16,7 +16,7 @@
 
 #include "compiler_internals.h"
 #include "dataflow.h"
-#include "codegen/ralloc_util.h"
+#include "quick/ralloc_util.h"
 
 namespace art {
 
diff --git a/src/compiler/ralloc.h b/src/compiler/dex/ralloc.h
index b46bfb1466..cd25b1c271 100644
--- a/src/compiler/ralloc.h
+++ b/src/compiler/dex/ralloc.h
@@ -14,8 +14,8 @@
  * limitations under the License.
  */
 
-#ifndef ART_SRC_COMPILER_RALLOC_H_
-#define ART_SRC_COMPILER_RALLOC_H_
+#ifndef ART_SRC_COMPILER_DEX_RALLOC_H_
+#define ART_SRC_COMPILER_DEX_RALLOC_H_
 
 #include "compiler_internals.h"
 
@@ -25,4 +25,4 @@ void SimpleRegAlloc(CompilationUnit* cu);
 
 }  // namespace art
 
-#endif  // ART_SRC_COMPILER_RALLOC_H_
+#endif  // ART_SRC_COMPILER_DEX_RALLOC_H_
diff --git a/src/compiler/ssa_transformation.cc b/src/compiler/dex/ssa_transformation.cc
index 5d787c46a0..5d787c46a0 100644
--- a/src/compiler/ssa_transformation.cc
+++ b/src/compiler/dex/ssa_transformation.cc
diff --git a/src/compiler/ssa_transformation.h b/src/compiler/dex/ssa_transformation.h
index 7f0d7f871d..92f7c0ec23 100644
--- a/src/compiler/ssa_transformation.h
+++ b/src/compiler/dex/ssa_transformation.h
@@ -14,8 +14,8 @@
  * limitations under the License.
  */
 
-#ifndef ART_SRC_COMPILER_SSATRANSFORMATION_H_
-#define ART_SRC_COMPILER_SSATRANSFORMATION_H_
+#ifndef ART_SRC_COMPILER_DEX_SSATRANSFORMATION_H_
+#define ART_SRC_COMPILER_DEX_SSATRANSFORMATION_H_
 
 #include "compiler_internals.h"
 
@@ -25,4 +25,4 @@ void SSATransformation(CompilationUnit* cu);
 
 }  // namespace art
 
-#endif  // ART_SRC_COMPILER_DATAFLOW_H_
+#endif  // ART_SRC_COMPILER_DEX_DATAFLOW_H_
diff --git a/src/compiler/write_elf.cc b/src/compiler/dex/write_elf.cc
index 1fd8a94926..1fd8a94926 100644
--- a/src/compiler/write_elf.cc
+++ b/src/compiler/dex/write_elf.cc
diff --git a/src/compiler_llvm/gbc_expander.cc b/src/compiler_llvm/gbc_expander.cc
index f5d6e8c186..3ed8cba35f 100644
--- a/src/compiler_llvm/gbc_expander.cc
+++ b/src/compiler_llvm/gbc_expander.cc
@@ -25,8 +25,8 @@
 #include "thread.h"
 #include "verifier/method_verifier.h"
 
-#include "compiler/compiler_ir.h"
-#include "compiler/codegen/codegen.h"
+#include "compiler/dex/compiler_ir.h"
+#include "compiler/dex/quick/codegen.h"
 using art::kMIRIgnoreNullCheck;
 using art::kMIRIgnoreRangeCheck;
 
diff --git a/src/compiler_llvm/llvm_compilation_unit.h b/src/compiler_llvm/llvm_compilation_unit.h
index 8cc3db7d1a..5951061ae3 100644
--- a/src/compiler_llvm/llvm_compilation_unit.h
+++ b/src/compiler_llvm/llvm_compilation_unit.h
@@ -19,7 +19,7 @@
 
 #include "base/logging.h"
 #include "base/mutex.h"
-#include "compiler/compiler_internals.h"
+#include "compiler/dex/compiler_internals.h"
 #include "compiler.h"
 #include "globals.h"
 #include "instruction_set.h"
@@ -28,7 +28,6 @@
 #include "runtime_support_func.h"
 #include "safe_map.h"
 
-
 #include <UniquePtr.h>
 #include <string>
 #include <vector>