#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/loader.h"
+#include "vm/jit/builtin.hpp"
+#include "vm/loader.hpp"
#include "vm/options.h"
#include "vm/jit/methodheader.h"