Merged trunk and subtype.

[cacao.git] / src / vm / initialize.c

diff --git a/src/vm/initialize.c b/src/vm/initialize.c
index 6e0c10838155bac944f8427877302f4069f1a282..a9e0b9b0ee52d3cf1acfef37303964afb7d1f688 100644 (file)
--- a/src/vm/initialize.c
+++ b/src/vm/initialize.c
@@ -31,23 +31,22 @@
 
 #include "threads/lock-common.h"
 
+#include "vm/jit/builtin.hpp"
+#include "vm/class.h"
+#include "vm/exceptions.hpp"
 #include "vm/global.h"
+#include "vm/globals.hpp"
 #include "vm/initialize.h"
-#include "vm/builtin.h"
-#include "vm/exceptions.h"
-#include "vm/stringlocal.h"
-#include "vm/vm.h"
-
-#include "vm/jit/asmpart.h"
-
-#include "vmcore/class.h"
-#include "vmcore/loader.h"
-#include "vmcore/options.h"
+#include "vm/loader.hpp"
+#include "vm/options.h"
+#include "vm/vm.hpp"
 
 #if defined(ENABLE_STATISTICS)
-# include "vmcore/statistics.h"
+# include "vm/statistics.h"
 #endif
 
+#include "vm/jit/asmpart.h"
+
 
 /* private functions **********************************************************/