#include "vm/jit/m68k/emit.h"
#include "mm/memory.h"
-#include "native/jni.h"
+
#include "native/localref.h"
#include "native/native.h"
#include "threads/lock-common.h"
#include "vm/builtin.h"
-#include "vm/exceptions.h"
+#include "vm/exceptions.hpp"
#include "vm/global.h"
-#include "vm/stringlocal.h"
+#include "vm/loader.h"
+#include "vm/options.h"
+#include "vm/utf8.h"
#include "vm/vm.hpp"
#include "vm/jit/asmpart.h"
#include "vm/jit/dseg.h"
#include "vm/jit/linenumbertable.h"
#include "vm/jit/emit-common.h"
-#include "vm/jit/jit.h"
+#include "vm/jit/jit.hpp"
#include "vm/jit/abi.h"
#include "vm/jit/parse.h"
#include "vm/jit/reg.h"
#include "vm/jit/stacktrace.hpp"
#include "vm/jit/trap.h"
-#include "vmcore/loader.h"
-#include "vmcore/options.h"
-#include "vmcore/utf8.h"
-
bool codegen_emit(jitdata *jd)
{