-#include "native.h"
-#include "loader.h"
-#include "tables.h"
-#include "threads/thread.h"
-#include "toolbox/loging.h"
-#include "java_lang_ThreadGroup.h"
-#include "java_lang_Object.h" /* needed for java_lang_Thread.h */
-#include "java_lang_Throwable.h" /* needed for java_lang_Thread.h */
-#include "java_lang_Thread.h"
+#include "native/jni.h"
+#include "native/native.h"
+#include "native/include/java_lang_ThreadGroup.h"
+#include "native/include/java_lang_Object.h" /* java_lang_Thread.h */
+#include "native/include/java_lang_Throwable.h" /* java_lang_Thread.h */
+#include "native/include/java_lang_VMThread.h"
+#include "native/include/java_lang_Thread.h"
+
+#if defined(USE_THREADS)
+# if defined(NATIVE_THREADS)
+# include "threads/native/threads.h"
+# else
+# include "threads/green/threads.h"
+# endif
+#endif
+
+#include "toolbox/logging.h"
+#include "vm/builtin.h"
+#include "vm/exceptions.h"
+#include "vm/options.h"
+#include "vm/tables.h"