Merged trunk and subtype.
[cacao.git] / src / vm / access.h
index 9697d43a579207b551de068737aa873f661e10a0..0b1def4768f6d0bdea16729c653131b0d8031af4 100644 (file)
 extern "C" {
 #endif
 
+#include "vm/class.h"
+#include "vm/field.hpp"
 #include "vm/global.h"
-
-#include "vmcore/class.h"
-#include "vmcore/field.h"
-#include "vmcore/method.h"
+#include "vm/method.h"
 
 
 /* macros *********************************************************************/