* Updated to jitcache-arm-x86 branch d4f6023b26c5+d1b5b1c106ac

[cacao.git] / src / vm / class.h

diff --git a/src/vm/class.h b/src/vm/class.h
index a1434be849b3a4cf698d44c9d83478d375f61030..f257dd8b3b9e5108b64dd757eac6ca10235724a5 100644 (file)
--- a/src/vm/class.h
+++ b/src/vm/class.h
@@ -26,10 +26,6 @@
 #ifndef _CLASS_H
 #define _CLASS_H
 
-#ifdef __cplusplus
-extern "C" {
-#endif
-
 /* forward typedefs ***********************************************************/
 
 typedef struct classinfo      classinfo; 
@@ -43,16 +39,14 @@ typedef struct extra_classref extra_classref;
 
 #include "vm/types.h"
 
-#include "toolbox/list.h"
-
 #if defined(ENABLE_JAVASE)
 # include "vm/annotation.h"
 #endif
 
-#include "vm/field.h"
+#include "vm/field.hpp"
 #include "vm/global.h"
 #include "vm/linker.h"
-#include "vm/loader.h"
+#include "vm/loader.hpp"
 #include "vm/method.h"
 #include "vm/references.h"
 #include "vm/string.hpp"
@@ -197,6 +191,10 @@ struct extra_classref {
 
 /* inline functions ***********************************************************/
 
+#ifdef __cplusplus
+extern "C" {
+#endif
+
 /**
  * Returns the classname of the class, where slashes ('/') are
  * replaced by dots ('.').