Merged trunk and subtype.
[cacao.git] / src / native / jvmti / cacaodbg.c
index 8362c44e4a7af943a370ff2e60d265534cd6ea5e..eb29c6f7b5313c27252ea99087e8647816281fd3 100644 (file)
 #include "native/jvmti/cacaodbg.h"
 #include "native/jvmti/dbg.h"
 #include "vm/vm.hpp"
-#include "vm/loader.h"
-#include "vm/exceptions.h"
-#include "vm/builtin.h"
+#include "vm/loader.hpp"
+#include "vm/exceptions.hpp"
+#include "vm/jit/builtin.hpp"
 #include "vm/jit/asmpart.h"
-#include "vm/stringlocal.h"
+#include "vm/string.hpp"
 #include "toolbox/logging.h"
 #include "threads/mutex.h"
 #include "threads/thread.hpp"