#include "config.h"
#include "vm/types.h"
-#include "threads/lock-common.h"
+#include "threads/lock.hpp"
#include "gc.h"
#include "final.h"
#include "heap.h"
#include "mark.h"
#include "region.h"
-#include "mm/memory.h"
+#include "mm/memory.hpp"
#include "native/include/java_lang_String.h"
#include "native/llni.h"
-#include "toolbox/logging.h"
+#include "toolbox/logging.hpp"
#include "vm/global.h"
#include "vm/options.h"