Merged trunk and subtype.

[cacao.git] / src / vm / jit / intrp / engine.c

diff --git a/src/vm/jit/intrp/engine.c b/src/vm/jit/intrp/engine.c
index 8e277cbeb83aaa88daaed0d2f9addb78eefe18d2..a09239243c2e1b46069a6a370a0cfcefe7d92e5e 100644 (file)
--- a/src/vm/jit/intrp/engine.c
+++ b/src/vm/jit/intrp/engine.c
@@ -41,15 +41,14 @@
 
 #include "threads/thread.hpp"
 
-#include "vm/builtin.h"
+#include "vm/jit/builtin.hpp"
+#include "vm/loader.hpp"
+#include "vm/options.h"
 
 #include "vm/jit/methodheader.h"
 #include "vm/jit/patcher.h"
 #include "vm/jit/stacktrace.hpp"
 
-#include "vmcore/loader.h"
-#include "vmcore/options.h"
-
 
 #if defined(ENABLE_THREADS)
 # include "threads/atomic.hpp"