#include "threads/lock-common.h"
-#include "vm/exceptions.h"
+#include "vm/options.h"
+#include "vm/statistics.h"
#include "vm/jit/abi.h"
#include "vm/jit/asmpart.h"
#include "vm/jit/jit.h"
#include "vm/jit/patcher-common.h"
#include "vm/jit/replace.h"
-#include "vm/jit/trace.h"
+#include "vm/jit/trace.hpp"
#include "vm/jit/trap.h"
-#include "vmcore/options.h"
-#include "vmcore/statistics.h"
-
/* emit_load ******************************************************************