#include <sched.h>
#include "native/jni.hpp"
-#include "native/native.h"
+#include "native/native.hpp"
#include "native/jvmti/cacaodbg.h"
#include "native/jvmti/jvmti.h"
#include "vm/jit/stacktrace.hpp"
#include "vm/global.h"
-#include "vm/loader.h"
+#include "vm/loader.hpp"
#include "vm/jit/builtin.hpp"
#include "vm/jit/asmpart.h"
-#include "vm/class.h"
-#include "vm/classcache.h"
+#include "vm/class.hpp"
+#include "vm/classcache.hpp"
#include "mm/gc.hpp"
#include "toolbox/logging.h"
#include "vm/options.h"
#include "mm/memory.h"
#include "threads/mutex.h"
#include "threads/thread.hpp"
-#include "threads/lock-common.h"
+#include "threads/lock.hpp"
#include "vm/exceptions.hpp"
#include "native/include/java_io_PrintStream.h"
#include "native/include/java_io_InputStream.h"
#include "native/include/java_lang_VMObject.h"
#include "native/include/java_lang_VMSystem.h"
#include "native/include/java_lang_VMClass.h"
-#include "vm/suck.h"
+#include "vm/suck.hpp"
#include "boehm-gc/include/gc.h"
#if defined(ENABLE_THREADS)