diff --git a/build/Android.gtest.mk b/build/Android.gtest.mk
index 498f7ef..a150f06 100644
--- a/build/Android.gtest.mk
+++ b/build/Android.gtest.mk
@@ -19,7 +19,10 @@
 TEST_COMMON_SRC_FILES := \
 	compiler/driver/compiler_driver_test.cc \
 	compiler/elf_writer_test.cc \
+	compiler/image_test.cc \
 	compiler/jni/jni_compiler_test.cc \
+	compiler/oat_test.cc \
+	compiler/output_stream_test.cc \
 	compiler/utils/arm/managed_register_arm_test.cc \
 	compiler/utils/x86/managed_register_x86_test.cc \
 	runtime/barrier_test.cc \
@@ -41,7 +44,6 @@
 	runtime/gc/heap_test.cc \
 	runtime/gc/space/space_test.cc \
 	runtime/gtest_test.cc \
-	runtime/image_test.cc \
 	runtime/indenter_test.cc \
 	runtime/indirect_reference_table_test.cc \
 	runtime/intern_table_test.cc \
@@ -49,8 +51,6 @@
 	runtime/mem_map_test.cc \
 	runtime/mirror/dex_cache_test.cc \
 	runtime/mirror/object_test.cc \
-	runtime/oat_test.cc \
-	runtime/output_stream_test.cc \
 	runtime/reference_table_test.cc \
 	runtime/runtime_test.cc \
 	runtime/thread_pool_test.cc \
diff --git a/compiler/Android.mk b/compiler/Android.mk
index 5caf688..3791946 100644
--- a/compiler/Android.mk
+++ b/compiler/Android.mk
@@ -87,6 +87,7 @@
 	elf_stripper.cc \
 	elf_writer.cc \
 	elf_writer_quick.cc \
+	file_output_stream.cc \
 	image_writer.cc \
 	oat_writer.cc \
 	vector_output_stream.cc
diff --git a/runtime/file_output_stream.cc b/compiler/file_output_stream.cc
similarity index 100%
rename from runtime/file_output_stream.cc
rename to compiler/file_output_stream.cc
diff --git a/runtime/file_output_stream.h b/compiler/file_output_stream.h
similarity index 86%
rename from runtime/file_output_stream.h
rename to compiler/file_output_stream.h
index 23a57f5..bde9e68 100644
--- a/runtime/file_output_stream.h
+++ b/compiler/file_output_stream.h
@@ -14,8 +14,8 @@
  * limitations under the License.
  */
 
-#ifndef ART_RUNTIME_FILE_OUTPUT_STREAM_H_
-#define ART_RUNTIME_FILE_OUTPUT_STREAM_H_
+#ifndef ART_COMPILER_FILE_OUTPUT_STREAM_H_
+#define ART_COMPILER_FILE_OUTPUT_STREAM_H_
 
 #include "output_stream.h"
 
@@ -34,11 +34,11 @@
   virtual off_t Seek(off_t offset, Whence whence);
 
  private:
-  File* file_;
+  File* const file_;
 
   DISALLOW_COPY_AND_ASSIGN(FileOutputStream);
 };
 
 }  // namespace art
 
-#endif  // ART_RUNTIME_FILE_OUTPUT_STREAM_H_
+#endif  // ART_COMPILER_FILE_OUTPUT_STREAM_H_
diff --git a/runtime/image_test.cc b/compiler/image_test.cc
similarity index 100%
rename from runtime/image_test.cc
rename to compiler/image_test.cc
diff --git a/runtime/oat_test.cc b/compiler/oat_test.cc
similarity index 100%
rename from runtime/oat_test.cc
rename to compiler/oat_test.cc
diff --git a/runtime/output_stream.h b/compiler/output_stream.h
similarity index 90%
rename from runtime/output_stream.h
rename to compiler/output_stream.h
index e7f8006..112dcfc 100644
--- a/runtime/output_stream.h
+++ b/compiler/output_stream.h
@@ -14,8 +14,8 @@
  * limitations under the License.
  */
 
-#ifndef ART_RUNTIME_OUTPUT_STREAM_H_
-#define ART_RUNTIME_OUTPUT_STREAM_H_
+#ifndef ART_COMPILER_OUTPUT_STREAM_H_
+#define ART_COMPILER_OUTPUT_STREAM_H_
 
 #include <stdint.h>
 
@@ -53,4 +53,4 @@
 
 }  // namespace art
 
-#endif  // ART_RUNTIME_OUTPUT_STREAM_H_
+#endif  // ART_COMPILER_OUTPUT_STREAM_H_
diff --git a/runtime/output_stream_test.cc b/compiler/output_stream_test.cc
similarity index 100%
rename from runtime/output_stream_test.cc
rename to compiler/output_stream_test.cc
diff --git a/runtime/Android.mk b/runtime/Android.mk
index b34abe4..1ce7a30 100644
--- a/runtime/Android.mk
+++ b/runtime/Android.mk
@@ -44,7 +44,6 @@
 	disassembler_mips.cc \
 	disassembler_x86.cc \
 	elf_file.cc \
-	file_output_stream.cc \
 	gc/allocator/dlmalloc.cc \
 	gc/accounting/card_table.cc \
 	gc/accounting/gc_allocator.cc \