#include <stdint.h>
#include <stdlib.h>
-#include <sys/mman.h> /* REMOVEME */
#include "threads/mutex.hpp"
#include "threads/thread.hpp"
#include "mm/codememory.h"
-#include "mm/memory.h"
+#include "mm/memory.hpp"
#include "vm/global.h"
#include "vm/options.h"