Kill constants.h and fix some copyright headers.

Change-Id: I51c04d731d6de035328781d8ac134ad6fcf49897

44 files changed, 185 insertions, 66 deletions

diff --git a/src/check_jni.cc b/src/check_jni.cc
index cc149354ad..67b1c3e329 100644
--- a/src/check_jni.cc
+++ b/src/check_jni.cc
@@ -567,10 +567,10 @@ class ScopedCheck {
 
   enum InstanceKind {
     kClass,
-        kDirectByteBuffer,
-        kObject,
-        kString,
-        kThrowable,
+    kDirectByteBuffer,
+    kObject,
+    kString,
+    kThrowable,
   };
 
   /*
diff --git a/src/common_test.h b/src/common_test.h
index e05a6d5685..74056c9f53 100644
--- a/src/common_test.h
+++ b/src/common_test.h
@@ -20,15 +20,14 @@
 #include <sys/stat.h>
 #include <sys/types.h>
 
-#include "UniquePtr.h"
 #include "class_linker.h"
 #include "class_loader.h"
 #include "compiler.h"
-#include "constants.h"
 #include "dex_file.h"
 #include "file.h"
 #include "gtest/gtest.h"
 #include "heap.h"
+#include "instruction_set.h"
 #include "macros.h"
 #include "oat_file.h"
 #include "object_utils.h"
@@ -39,6 +38,7 @@
 #include "thread.h"
 #include "unicode/uclean.h"
 #include "unicode/uvernum.h"
+#include "UniquePtr.h"
 
 namespace art {
 
diff --git a/src/compiled_method.h b/src/compiled_method.h
index d2c28a7be2..b98df39271 100644
--- a/src/compiled_method.h
+++ b/src/compiled_method.h
@@ -19,7 +19,7 @@
 
 #include <vector>
 
-#include "constants.h"
+#include "instruction_set.h"
 #include "utils.h"
 
 namespace llvm {
diff --git a/src/compiler.h b/src/compiler.h
index fcb9f7f695..cb6023b53d 100644
--- a/src/compiler.h
+++ b/src/compiler.h
@@ -24,10 +24,11 @@
 
 #include "compiled_class.h"
 #include "compiled_method.h"
-#include "constants.h"
 #include "dex_cache.h"
 #include "dex_file.h"
 #include "elf_image.h"
+#include "instruction_set.h"
+#include "invoke_type.h"
 #include "oat_file.h"
 #include "object.h"
 #include "runtime.h"
diff --git a/src/compiler/Frontend.cc b/src/compiler/Frontend.cc
index 651087ff1c..74c13d41e4 100644
--- a/src/compiler/Frontend.cc
+++ b/src/compiler/Frontend.cc
@@ -17,7 +17,6 @@
 #include "Dalvik.h"
 #include "CompilerInternals.h"
 #include "Dataflow.h"
-#include "constants.h"
 #include "leb128.h"
 #include "object.h"
 #include "runtime.h"
diff --git a/src/compiler_llvm/compilation_unit.cc b/src/compiler_llvm/compilation_unit.cc
index ae87395000..c5952f0195 100644
--- a/src/compiler_llvm/compilation_unit.cc
+++ b/src/compiler_llvm/compilation_unit.cc
@@ -16,7 +16,7 @@
 
 #include "compilation_unit.h"
 
-#include "constants.h"
+#include "instruction_set.h"
 #include "ir_builder.h"
 #include "logging.h"
 
diff --git a/src/compiler_llvm/compilation_unit.h b/src/compiler_llvm/compilation_unit.h
index 57d559bfee..eb92ce445a 100644
--- a/src/compiler_llvm/compilation_unit.h
+++ b/src/compiler_llvm/compilation_unit.h
@@ -17,9 +17,9 @@
 #ifndef ART_SRC_COMPILER_LLVM_COMPILATION_UNIT_H_
 #define ART_SRC_COMPILER_LLVM_COMPILATION_UNIT_H_
 
-#include "constants.h"
 #include "elf_image.h"
 #include "globals.h"
+#include "instruction_set.h"
 #include "logging.h"
 
 #include <UniquePtr.h>
diff --git a/src/compiler_llvm/compiler_llvm.h b/src/compiler_llvm/compiler_llvm.h
index 2c37ac090c..b9f8d0057b 100644
--- a/src/compiler_llvm/compiler_llvm.h
+++ b/src/compiler_llvm/compiler_llvm.h
@@ -18,9 +18,9 @@
 #define ART_SRC_COMPILER_LLVM_COMPILER_LLVM_H_
 
 #include "compiler.h"
-#include "constants.h"
 #include "dex_file.h"
 #include "elf_image.h"
+#include "instruction_set.h"
 #include "macros.h"
 #include "object.h"
 
diff --git a/src/compiler_llvm/jni_compiler.h b/src/compiler_llvm/jni_compiler.h
index 392c14d29a..c15dae5ca4 100644
--- a/src/compiler_llvm/jni_compiler.h
+++ b/src/compiler_llvm/jni_compiler.h
@@ -17,8 +17,6 @@
 #ifndef ART_SRC_COMPILER_LLVM_JNI_COMPILER_H_
 #define ART_SRC_COMPILER_LLVM_JNI_COMPILER_H_
 
-#include "constants.h"
-
 #include <stdint.h>
 
 namespace art {
diff --git a/src/compiler_llvm/method_compiler.h b/src/compiler_llvm/method_compiler.h
index 782b9340ef..31274474ef 100644
--- a/src/compiler_llvm/method_compiler.h
+++ b/src/compiler_llvm/method_compiler.h
@@ -18,10 +18,10 @@
 #define ART_SRC_COMPILER_LLVM_METHOD_COMPILER_H_
 
 #include "backend_types.h"
-#include "constants.h"
 #include "dalvik_reg.h"
 #include "dex_file.h"
 #include "dex_instruction.h"
+#include "invoke_type.h"
 #include "object_utils.h"
 
 #include <llvm/Support/IRBuilder.h>
diff --git a/src/compiler_llvm/runtime_support_llvm.cc b/src/compiler_llvm/runtime_support_llvm.cc
index 02a201a500..d929d3d691 100644
--- a/src/compiler_llvm/runtime_support_llvm.cc
+++ b/src/compiler_llvm/runtime_support_llvm.cc
@@ -1,4 +1,18 @@
-// Copyright 2012 Google Inc. All Rights Reserved.
+/*
+ * Copyright (C) 2012 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 
 #include "class_linker.h"
 #include "dex_verifier.h"
diff --git a/src/compiler_llvm/runtime_support_llvm.h b/src/compiler_llvm/runtime_support_llvm.h
index b93138ab99..fb951ba24b 100644
--- a/src/compiler_llvm/runtime_support_llvm.h
+++ b/src/compiler_llvm/runtime_support_llvm.h
@@ -1,4 +1,18 @@
-// Copyright 2012 Google Inc. All Rights Reserved.
+/*
+ * Copyright (C) 2012 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 
 #ifndef ART_SRC_COMPILER_LLVM_RUNTIME_SUPPORT_LLVM_H_
 #define ART_SRC_COMPILER_LLVM_RUNTIME_SUPPORT_LLVM_H_
diff --git a/src/compiler_llvm/upcall_compiler.h b/src/compiler_llvm/upcall_compiler.h
index c1e0afc891..73d00a16a7 100644
--- a/src/compiler_llvm/upcall_compiler.h
+++ b/src/compiler_llvm/upcall_compiler.h
@@ -17,8 +17,6 @@
 #ifndef ART_SRC_COMPILER_LLVM_UPCALL_COMPILER_H_
 #define ART_SRC_COMPILER_LLVM_UPCALL_COMPILER_H_
 
-#include "constants.h"
-
 #include <stdint.h>
 
 namespace art {
diff --git a/src/constants.cc b/src/constants.cc
index 65af2fb571..12632eb2de 100644
--- a/src/constants.cc
+++ b/src/constants.cc
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012 Google Inc. All Rights Reserved.
+ * Copyright (C) 2012 The Android Open Source Project
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,7 +14,12 @@
  * limitations under the License.
  */
 
-#include "constants.h"
+// TODO: automatically generate operator<<s for enum types.
+
+#include <iostream>
+
+#include "instruction_set.h"
+#include "invoke_type.h"
 
 namespace art {
 
diff --git a/src/disassembler.h b/src/disassembler.h
index de9c8d1bfa..bd745a81c3 100644
--- a/src/disassembler.h
+++ b/src/disassembler.h
@@ -17,7 +17,11 @@
 #ifndef ART_SRC_DISASSEMBLER_H_
 #define ART_SRC_DISASSEMBLER_H_
 
-#include "constants.h"
+#include <stdint.h>
+
+#include <iosfwd>
+
+#include "instruction_set.h"
 
 namespace art {
 
diff --git a/src/disassembler_arm.cc b/src/disassembler_arm.cc
index aa7a39b957..5211146480 100644
--- a/src/disassembler_arm.cc
+++ b/src/disassembler_arm.cc
@@ -16,10 +16,11 @@
 
 #include "disassembler_arm.h"
 
-#include "stringprintf.h"
-
 #include <iostream>
 
+#include "logging.h"
+#include "stringprintf.h"
+
 namespace art {
 namespace arm {
 
diff --git a/src/disassembler_x86.cc b/src/disassembler_x86.cc
index 08025ea8af..4c8c09ac4c 100644
--- a/src/disassembler_x86.cc
+++ b/src/disassembler_x86.cc
@@ -16,11 +16,11 @@
 
 #include "disassembler_x86.h"
 
-#include "stringprintf.h"
-
-#include <stdint.h>
 #include <iostream>
 
+#include "logging.h"
+#include "stringprintf.h"
+
 namespace art {
 namespace x86 {
 
diff --git a/src/instruction_set.h b/src/instruction_set.h
new file mode 100644
index 0000000000..c4dae4dcb6
--- /dev/null
+++ b/src/instruction_set.h
@@ -0,0 +1,36 @@
+/*
+ * Copyright (C) 2011 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#ifndef ART_SRC_INSTRUCTION_SET_H_
+#define ART_SRC_INSTRUCTION_SET_H_
+
+#include <iosfwd>
+
+namespace art {
+
+enum InstructionSet {
+  kNone,
+  kArm,
+  kThumb2,
+  kX86,
+  kMips
+};
+
+std::ostream& operator<<(std::ostream& os, const InstructionSet& rhs);
+
+}  // namespace art
+
+#endif  // ART_SRC_INSTRUCTION_SET_H_
diff --git a/src/constants.h b/src/invoke_type.h
index 832d6f7b2c..f37f1b4146 100644
--- a/src/constants.h
+++ b/src/invoke_type.h
@@ -14,23 +14,13 @@
  * limitations under the License.
  */
 
-#ifndef ART_SRC_CONSTANTS_H_
-#define ART_SRC_CONSTANTS_H_
+#ifndef ART_SRC_INVOKE_TYPE_H_
+#define ART_SRC_INVOKE_TYPE_H_
 
 #include <iosfwd>
 
 namespace art {
 
-enum InstructionSet {
-  kNone,
-  kArm,
-  kThumb2,
-  kX86,
-  kMips
-};
-
-std::ostream& operator<<(std::ostream& os, const InstructionSet& rhs);
-
 enum InvokeType {
   kStatic, kDirect, kVirtual, kSuper, kInterface,
   kMaxInvokeType = kInterface
@@ -40,7 +30,4 @@ std::ostream& operator<<(std::ostream& os, const InvokeType& rhs);
 
 }  // namespace art
 
-#include "constants_x86.h"
-#include "constants_arm.h"
-
-#endif  // ART_SRC_CONSTANTS_H_
+#endif  // ART_SRC_INVOKE_TYPE_H_
diff --git a/src/oat.h b/src/oat.h
index a71a75b6b2..960d92b0d6 100644
--- a/src/oat.h
+++ b/src/oat.h
@@ -19,8 +19,8 @@
 
 #include <vector>
 
-#include "constants.h"
 #include "dex_file.h"
+#include "instruction_set.h"
 #include "macros.h"
 
 namespace art {
diff --git a/src/oat/jni/jni_compiler.cc b/src/oat/jni/jni_compiler.cc
index 30341c2d09..4a186aa92c 100644
--- a/src/oat/jni/jni_compiler.cc
+++ b/src/oat/jni/jni_compiler.cc
@@ -21,7 +21,6 @@
 #include "class_linker.h"
 #include "compiled_method.h"
 #include "compiler.h"
-#include "constants.h"
 #include "jni_internal.h"
 #include "logging.h"
 #include "macros.h"
diff --git a/src/oat/runtime/arm/runtime_support_arm.S b/src/oat/runtime/arm/runtime_support_arm.S
index 54469195f5..045feac17b 100644
--- a/src/oat/runtime/arm/runtime_support_arm.S
+++ b/src/oat/runtime/arm/runtime_support_arm.S
@@ -1,3 +1,19 @@
+/*
+ * Copyright (C) 2012 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
 #include "asm_support.h"
 
     /* Deliver the given exception */
diff --git a/src/oat/runtime/callee_save_frame.h b/src/oat/runtime/callee_save_frame.h
index 96811ce2cd..15095535e0 100644
--- a/src/oat/runtime/callee_save_frame.h
+++ b/src/oat/runtime/callee_save_frame.h
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012 Google Inc. All Rights Reserved.
+ * Copyright (C) 2012 The Android Open Source Project
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/oat/runtime/mips/runtime_support_mips.S b/src/oat/runtime/mips/runtime_support_mips.S
index 65431e359a..12cebfd011 100644
--- a/src/oat/runtime/mips/runtime_support_mips.S
+++ b/src/oat/runtime/mips/runtime_support_mips.S
@@ -1,3 +1,19 @@
+/*
+ * Copyright (C) 2012 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
 #include "asm_support.h"
 
     .balign 4
diff --git a/src/oat/runtime/support_jni.cc b/src/oat/runtime/support_jni.cc
index d74f78fb1f..7324cf4693 100644
--- a/src/oat/runtime/support_jni.cc
+++ b/src/oat/runtime/support_jni.cc
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012 Google Inc. All Rights Reserved.
+ * Copyright (C) 2012 The Android Open Source Project
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/oat/runtime/support_math.cc b/src/oat/runtime/support_math.cc
index cb5f7058e2..adef64a7fd 100644
--- a/src/oat/runtime/support_math.cc
+++ b/src/oat/runtime/support_math.cc
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012 Google Inc. All Rights Reserved.
+ * Copyright (C) 2012 The Android Open Source Project
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/oat/runtime/support_proxy.cc b/src/oat/runtime/support_proxy.cc
index a9c7ebe64f..dd92fb19f5 100644
--- a/src/oat/runtime/support_proxy.cc
+++ b/src/oat/runtime/support_proxy.cc
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012 Google Inc. All Rights Reserved.
+ * Copyright (C) 2012 The Android Open Source Project
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/oat/runtime/support_stubs.cc b/src/oat/runtime/support_stubs.cc
index cb224e8db9..8727a5da2f 100644
--- a/src/oat/runtime/support_stubs.cc
+++ b/src/oat/runtime/support_stubs.cc
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012 Google Inc. All Rights Reserved.
+ * Copyright (C) 2012 The Android Open Source Project
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/oat/runtime/support_thread.cc b/src/oat/runtime/support_thread.cc
index ed04673d11..6cd595bffb 100644
--- a/src/oat/runtime/support_thread.cc
+++ b/src/oat/runtime/support_thread.cc
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012 Google Inc. All Rights Reserved.
+ * Copyright (C) 2012 The Android Open Source Project
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/oat/runtime/support_throw.cc b/src/oat/runtime/support_throw.cc
index 9f46b2b69d..e2e5c946a3 100644
--- a/src/oat/runtime/support_throw.cc
+++ b/src/oat/runtime/support_throw.cc
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012 Google Inc. All Rights Reserved.
+ * Copyright (C) 2012 The Android Open Source Project
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/oat/runtime/support_trace.cc b/src/oat/runtime/support_trace.cc
index 5c6a46e0cd..c6fbfefd60 100644
--- a/src/oat/runtime/support_trace.cc
+++ b/src/oat/runtime/support_trace.cc
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012 Google Inc. All Rights Reserved.
+ * Copyright (C) 2012 The Android Open Source Project
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/oat/runtime/x86/runtime_support_x86.S b/src/oat/runtime/x86/runtime_support_x86.S
index 8f7177c2ae..33334694e8 100644
--- a/src/oat/runtime/x86/runtime_support_x86.S
+++ b/src/oat/runtime/x86/runtime_support_x86.S
@@ -1,3 +1,19 @@
+/*
+ * Copyright (C) 2012 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
 #include "asm_support.h"
 
 #if defined(__APPLE__)
diff --git a/src/oat/utils/arm/assembler_arm.h b/src/oat/utils/arm/assembler_arm.h
index d26fc1f134..e4ccfd8b08 100644
--- a/src/oat/utils/arm/assembler_arm.h
+++ b/src/oat/utils/arm/assembler_arm.h
@@ -17,7 +17,7 @@
 #ifndef ART_SRC_OAT_UTILS_ARM_ASSEMBLER_ARM_H_
 #define ART_SRC_OAT_UTILS_ARM_ASSEMBLER_ARM_H_
 
-#include "constants.h"
+#include "constants_arm.h"
 #include "logging.h"
 #include "oat/utils/arm/managed_register_arm.h"
 #include "oat/utils/assembler.h"
diff --git a/src/oat/utils/arm/managed_register_arm.h b/src/oat/utils/arm/managed_register_arm.h
index 8808d2b597..e29af92128 100644
--- a/src/oat/utils/arm/managed_register_arm.h
+++ b/src/oat/utils/arm/managed_register_arm.h
@@ -17,7 +17,7 @@
 #ifndef ART_SRC_OAT_UTILS_ARM_MANAGED_REGISTER_ARM_H_
 #define ART_SRC_OAT_UTILS_ARM_MANAGED_REGISTER_ARM_H_
 
-#include "constants.h"
+#include "constants_arm.h"
 #include "logging.h"
 #include "oat/utils/managed_register.h"
 
diff --git a/src/oat/utils/assembler.h b/src/oat/utils/assembler.h
index 6fd150d10e..47f1ead7f6 100644
--- a/src/oat/utils/assembler.h
+++ b/src/oat/utils/assembler.h
@@ -19,7 +19,9 @@
 
 #include <vector>
 
-#include "constants.h"
+#include "constants_arm.h"
+#include "constants_x86.h"
+#include "instruction_set.h"
 #include "logging.h"
 #include "macros.h"
 #include "managed_register.h"
diff --git a/src/oat/utils/x86/assembler_x86.h b/src/oat/utils/x86/assembler_x86.h
index f7d26ff9b8..886e173c4f 100644
--- a/src/oat/utils/x86/assembler_x86.h
+++ b/src/oat/utils/x86/assembler_x86.h
@@ -18,7 +18,7 @@
 #define ART_SRC_OAT_UTILS_X86_ASSEMBLER_X86_H_
 
 #include <vector>
-#include "constants.h"
+#include "constants_x86.h"
 #include "globals.h"
 #include "managed_register_x86.h"
 #include "macros.h"
diff --git a/src/oat_file.h b/src/oat_file.h
index 8ef830827f..281ef78ec2 100644
--- a/src/oat_file.h
+++ b/src/oat_file.h
@@ -19,7 +19,6 @@
 
 #include <vector>
 
-#include "constants.h"
 #include "dex_file.h"
 #include "mem_map.h"
 #include "oat.h"
diff --git a/src/object.h b/src/object.h
index 426a48c8a7..4d054b9aa4 100644
--- a/src/object.h
+++ b/src/object.h
@@ -23,7 +23,6 @@
 #include "UniquePtr.h"
 #include "atomic.h"
 #include "casts.h"
-#include "constants.h"
 #include "globals.h"
 #include "heap.h"
 #include "logging.h"
diff --git a/src/runtime.cc b/src/runtime.cc
index 7e0eab5936..3aa7e6e14a 100644
--- a/src/runtime.cc
+++ b/src/runtime.cc
@@ -25,6 +25,8 @@
 
 #include "class_linker.h"
 #include "class_loader.h"
+#include "constants_arm.h"
+#include "constants_x86.h"
 #include "debugger.h"
 #include "dex_verifier.h"
 #include "heap.h"
diff --git a/src/runtime.h b/src/runtime.h
index 36dd5c6b4a..b8fe35ad38 100644
--- a/src/runtime.h
+++ b/src/runtime.h
@@ -27,8 +27,8 @@
 
 #include <jni.h>
 
-#include "constants.h"
 #include "heap.h"
+#include "instruction_set.h"
 #include "globals.h"
 #include "macros.h"
 #include "runtime_stats.h"
diff --git a/src/runtime_support.cc b/src/runtime_support.cc
index 9072d58712..0ee9990aec 100644
--- a/src/runtime_support.cc
+++ b/src/runtime_support.cc
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012 Google Inc. All Rights Reserved.
+ * Copyright (C) 2012 The Android Open Source Project
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/runtime_support.h b/src/runtime_support.h
index 909fb41e59..2f5ba5beee 100644
--- a/src/runtime_support.h
+++ b/src/runtime_support.h
@@ -1,4 +1,18 @@
-// Copyright 2012 Google Inc. All Rights Reserved.
+/*
+ * Copyright (C) 2012 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 
 #ifndef ART_SRC_RUNTIME_SUPPORT_H_
 #define ART_SRC_RUNTIME_SUPPORT_H_
@@ -6,6 +20,7 @@
 #include "class_linker.h"
 #include "dex_file.h"
 #include "dex_verifier.h"
+#include "invoke_type.h"
 #include "object.h"
 #include "object_utils.h"
 #include "thread.h"
diff --git a/src/stack_indirect_reference_table.h b/src/stack_indirect_reference_table.h
index 5f372947e2..681405f081 100644
--- a/src/stack_indirect_reference_table.h
+++ b/src/stack_indirect_reference_table.h
@@ -17,6 +17,7 @@
 #ifndef ART_SRC_STACK_INDIRECT_REFERENCE_TABLE_H_
 #define ART_SRC_STACK_INDIRECT_REFERENCE_TABLE_H_
 
+#include "casts.h"
 #include "logging.h"
 #include "macros.h"
 #include "thread.h"
diff --git a/test/044-proxy/src/ReturnsAndArgPassing.java b/test/044-proxy/src/ReturnsAndArgPassing.java
index 6a706cbf6c..50eff77066 100644
--- a/test/044-proxy/src/ReturnsAndArgPassing.java
+++ b/test/044-proxy/src/ReturnsAndArgPassing.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011 Google Inc. All Rights Reserved.
+ * Copyright (C) 2011 The Android Open Source Project
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -15,9 +15,6 @@
  */
 import java.lang.reflect.*;
 
-/**
- * @author irogers@google.com (Ian Rogers)
- */
 public class ReturnsAndArgPassing {
 
   public static final String testName = "ReturnsAndArgPassing";