#include "config.h"
#include "vm/types.h"
-#include "threads/thread.h"
+#include "threads/thread.hpp"
-#include "toolbox/list.h"
-#include "vm/jit/replace.h"
+#include "toolbox/list.hpp"
+#include "vm/jit/replace.hpp"
/* Configuration Switches *****************************************************/
#if !defined(NDEBUG) && defined(GC_DEBUGGING)
# include <assert.h>
-# include "vmcore/options.h"
+# include "vm/options.h"
# define GC_LOG(code) if (opt_verbosegc) { code; }
# define GC_ASSERT(assertion) assert(assertion)
#else