Merged branch subtype-trunk into default.

[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..118883f720c09c21215ae8d55979395389073968 100644 (file)
--- a/src/vm/jit/intrp/engine.c
+++ b/src/vm/jit/intrp/engine.c
@@ -37,19 +37,18 @@
 
 #include "md-abi.h"                           /* required for TRACE_ARGS_NUM */
 
-#include "mm/memory.h"
+#include "mm/memory.hpp"
 
 #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"