* merged with tip (040f180a056b)

[cacao.git] / src / vm / jit / arm / patcher.c

diff --git a/src/vm/jit/arm/patcher.c b/src/vm/jit/arm/patcher.c
index 4c3ad2805bcf1472709253dd17f5d51a5637579a..8e5540343cf71ca05ef2355be2f9d7951dc2ceb8 100644 (file)
--- a/src/vm/jit/arm/patcher.c
+++ b/src/vm/jit/arm/patcher.c
@@ -37,17 +37,16 @@
 #include "native/native.h"
 
 #include "vm/builtin.h"
-#include "vm/exceptions.h"
+#include "vm/class.h"
+#include "vm/field.h"
 #include "vm/initialize.h"
+#include "vm/options.h"
+#include "vm/references.h"
+#include "vm/resolve.h"
 
 #include "vm/jit/asmpart.h"
 #include "vm/jit/patcher-common.h"
 
-#include "vmcore/field.h"
-#include "vmcore/options.h"
-#include "vmcore/references.h"
-#include "vm/resolve.h"
-
 
 #define PATCH_BACK_ORIGINAL_MCODE \
     *((u4 *) pr->mpc) = (u4) pr->mcode; \