--- old/src/os/bsd/vm/os_bsd.cpp	2012-10-04 10:42:05.478530900 +0200
+++ new/src/os/bsd/vm/os_bsd.cpp	2012-10-04 10:42:05.062507100 +0200
@@ -82,12 +82,6 @@
 # include "assembler_ppc.inline.hpp"
 # include "nativeInst_ppc.hpp"
 #endif
-#ifdef COMPILER1
-#include "c1/c1_Runtime1.hpp"
-#endif
-#ifdef COMPILER2
-#include "opto/runtime.hpp"
-#endif
 
 // put OS-includes here
 # include <sys/types.h>
--- old/src/os/linux/vm/os_linux.cpp	2012-10-04 10:42:08.275690900 +0200
+++ new/src/os/linux/vm/os_linux.cpp	2012-10-04 10:42:07.870667700 +0200
@@ -82,12 +82,6 @@
 # include "assembler_ppc.inline.hpp"
 # include "nativeInst_ppc.hpp"
 #endif
-#ifdef COMPILER1
-#include "c1/c1_Runtime1.hpp"
-#endif
-#ifdef COMPILER2
-#include "opto/runtime.hpp"
-#endif
 
 // put OS-includes here
 # include <sys/types.h>
--- old/src/os/solaris/vm/os_solaris.cpp	2012-10-04 10:42:10.945843600 +0200
+++ new/src/os/solaris/vm/os_solaris.cpp	2012-10-04 10:42:10.481817100 +0200
@@ -70,12 +70,6 @@
 # include "assembler_sparc.inline.hpp"
 # include "nativeInst_sparc.hpp"
 #endif
-#ifdef COMPILER1
-#include "c1/c1_Runtime1.hpp"
-#endif
-#ifdef COMPILER2
-#include "opto/runtime.hpp"
-#endif
 
 // put OS-includes here
 # include <dlfcn.h>
--- old/src/os/windows/vm/os_windows.cpp	2012-10-04 10:42:13.677999900 +0200
+++ new/src/os/windows/vm/os_windows.cpp	2012-10-04 10:42:13.299978300 +0200
@@ -69,12 +69,6 @@
 # include "assembler_x86.inline.hpp"
 # include "nativeInst_x86.hpp"
 #endif
-#ifdef COMPILER1
-#include "c1/c1_Runtime1.hpp"
-#endif
-#ifdef COMPILER2
-#include "opto/runtime.hpp"
-#endif
 
 #ifdef _DEBUG
 #include <crtdbg.h>
--- old/src/os_cpu/bsd_x86/vm/os_bsd_x86.cpp	2012-10-04 10:42:16.285149000 +0200
+++ new/src/os_cpu/bsd_x86/vm/os_bsd_x86.cpp	2012-10-04 10:42:15.862124800 +0200
@@ -52,12 +52,6 @@
 #include "thread_bsd.inline.hpp"
 #include "utilities/events.hpp"
 #include "utilities/vmError.hpp"
-#ifdef COMPILER1
-#include "c1/c1_Runtime1.hpp"
-#endif
-#ifdef COMPILER2
-#include "opto/runtime.hpp"
-#endif
 
 // put OS-includes here
 # include <sys/types.h>
--- old/src/os_cpu/bsd_zero/vm/os_bsd_zero.cpp	2012-10-04 10:42:18.551278600 +0200
+++ new/src/os_cpu/bsd_zero/vm/os_bsd_zero.cpp	2012-10-04 10:42:18.163256400 +0200
@@ -58,12 +58,6 @@
 #include "thread_bsd.inline.hpp"
 #include "utilities/events.hpp"
 #include "utilities/vmError.hpp"
-#ifdef COMPILER1
-#include "c1/c1_Runtime1.hpp"
-#endif
-#ifdef COMPILER2
-#include "opto/runtime.hpp"
-#endif
 
 address os::current_stack_pointer() {
   address dummy = (address) &dummy;
--- old/src/os_cpu/linux_sparc/vm/os_linux_sparc.cpp	2012-10-04 10:42:20.780406100 +0200
+++ new/src/os_cpu/linux_sparc/vm/os_linux_sparc.cpp	2012-10-04 10:42:20.378383100 +0200
@@ -52,13 +52,6 @@
 #include "thread_linux.inline.hpp"
 #include "utilities/events.hpp"
 #include "utilities/vmError.hpp"
-#ifdef COMPILER1
-#include "c1/c1_Runtime1.hpp"
-#endif
-#ifdef COMPILER2
-#include "opto/runtime.hpp"
-#endif
-
 
 // Linux/Sparc has rather obscure naming of registers in sigcontext
 // different between 32 and 64 bits
--- old/src/os_cpu/linux_x86/vm/os_linux_x86.cpp	2012-10-04 10:42:23.013533800 +0200
+++ new/src/os_cpu/linux_x86/vm/os_linux_x86.cpp	2012-10-04 10:42:22.638512400 +0200
@@ -52,12 +52,6 @@
 #include "thread_linux.inline.hpp"
 #include "utilities/events.hpp"
 #include "utilities/vmError.hpp"
-#ifdef COMPILER1
-#include "c1/c1_Runtime1.hpp"
-#endif
-#ifdef COMPILER2
-#include "opto/runtime.hpp"
-#endif
 
 // put OS-includes here
 # include <sys/types.h>
--- old/src/os_cpu/linux_zero/vm/os_linux_zero.cpp	2012-10-04 10:42:25.393670000 +0200
+++ new/src/os_cpu/linux_zero/vm/os_linux_zero.cpp	2012-10-04 10:42:24.959645200 +0200
@@ -53,12 +53,6 @@
 #include "thread_linux.inline.hpp"
 #include "utilities/events.hpp"
 #include "utilities/vmError.hpp"
-#ifdef COMPILER1
-#include "c1/c1_Runtime1.hpp"
-#endif
-#ifdef COMPILER2
-#include "opto/runtime.hpp"
-#endif
 
 address os::current_stack_pointer() {
   address dummy = (address) &dummy;
--- old/src/os_cpu/solaris_sparc/vm/os_solaris_sparc.cpp	2012-10-04 10:42:27.627797800 +0200
+++ new/src/os_cpu/solaris_sparc/vm/os_solaris_sparc.cpp	2012-10-04 10:42:27.233775200 +0200
@@ -52,13 +52,6 @@
 #include "thread_solaris.inline.hpp"
 #include "utilities/events.hpp"
 #include "utilities/vmError.hpp"
-#ifdef COMPILER1
-#include "c1/c1_Runtime1.hpp"
-#endif
-#ifdef COMPILER2
-#include "opto/runtime.hpp"
-#endif
-
 
 # include <signal.h>        // needed first to avoid name collision for "std" with SC 5.0
 
--- old/src/os_cpu/solaris_x86/vm/os_solaris_x86.cpp	2012-10-04 10:42:29.905928100 +0200
+++ new/src/os_cpu/solaris_x86/vm/os_solaris_x86.cpp	2012-10-04 10:42:29.503905100 +0200
@@ -52,12 +52,6 @@
 #include "thread_solaris.inline.hpp"
 #include "utilities/events.hpp"
 #include "utilities/vmError.hpp"
-#ifdef COMPILER1
-#include "c1/c1_Runtime1.hpp"
-#endif
-#ifdef COMPILER2
-#include "opto/runtime.hpp"
-#endif
 
 // put OS-includes here
 # include <sys/types.h>
--- old/src/os_cpu/windows_x86/vm/os_windows_x86.cpp	2012-10-04 10:42:32.188058600 +0200
+++ new/src/os_cpu/windows_x86/vm/os_windows_x86.cpp	2012-10-04 10:42:31.791035900 +0200
@@ -52,12 +52,6 @@
 #include "thread_windows.inline.hpp"
 #include "utilities/events.hpp"
 #include "utilities/vmError.hpp"
-#ifdef COMPILER1
-#include "c1/c1_Runtime1.hpp"
-#endif
-#ifdef COMPILER2
-#include "opto/runtime.hpp"
-#endif
 
 # include "unwind_windows_x86.hpp"
 #undef REG_SP