Merged.

[cacao.git] / src / native / vm / reflection.cpp

diff --git a/src/native/vm/reflection.cpp b/src/native/vm/reflection.cpp
index 831f258124237ed71a7c52b95d8c45e777a141b3..73a8545b8afef1b164d7e7987378f5782e0b7db4 100644 (file)
--- a/src/native/vm/reflection.cpp
+++ b/src/native/vm/reflection.cpp
@@ -27,9 +27,8 @@
 
 #include <stdint.h>
 
-#include "native/jni.h"
 #include "native/llni.h"
-#include "native/native.h"
+#include "native/native.hpp"
 
 #if defined(ENABLE_ANNOTATIONS) && defined(WITH_JAVA_RUNTIME_LIBRARY_GNU_CLASSPATH)
 # include "vm/vm.hpp"
@@ -37,17 +36,16 @@
 
 #include "native/vm/reflection.hpp"
 
-#include "vm/access.h"
-#include "vm/builtin.h"
+#include "vm/access.hpp"
+#include "vm/jit/builtin.hpp"
 #include "vm/exceptions.hpp"
 #include "vm/global.h"
-#include "vm/initialize.h"
+#include "vm/globals.hpp"
+#include "vm/initialize.hpp"
+#include "vm/javaobjects.hpp"
+#include "vm/method.hpp"
 #include "vm/string.hpp"
 
-#include "vmcore/globals.hpp"
-#include "vmcore/javaobjects.hpp"
-#include "vmcore/method.h"
-
 
 /**
  * Invoke a method on the given object with the given arguments.