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 29c190590db356a768e26150cf0e58fb111b280e..a09239243c2e1b46069a6a370a0cfcefe7d92e5e 100644 (file)
--- a/src/vm/jit/intrp/engine.c
+++ b/src/vm/jit/intrp/engine.c
@@ -39,25 +39,19 @@
 
 #include "mm/memory.h"
 
-#include "threads/threads-common.h"
+#include "threads/thread.hpp"
 
-#include "vm/builtin.h"
-#include "vm/exceptions.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.h"
-
-#include "vmcore/loader.h"
-#include "vmcore/options.h"
+#include "vm/jit/stacktrace.hpp"
 
 
 #if defined(ENABLE_THREADS)
-# ifndef USE_FAKE_ATOMIC_INSTRUCTIONS
-#  include "machine-instr.h"
-# else
-#  include "threads/posix/generic-primitives.h"
-# endif
+# include "threads/atomic.hpp"
 #endif
 
 #if !defined(STORE_ORDER_BARRIER) && !defined(ENABLE_THREADS)