diff --git a/mpw/environment.rl b/mpw/environment.rl
index 41a3c1f..b0144ca 100644
--- a/mpw/environment.rl
+++ b/mpw/environment.rl
@@ -27,6 +27,7 @@
 #include <string>
 #include <unordered_map>
 #include <cstdio>
+#include <cstring>
 #include <vector>
 
 #include <sys/types.h>
diff --git a/mpw/mpw.cpp b/mpw/mpw.cpp
index dc265fb..ac8920f 100644
--- a/mpw/mpw.cpp
+++ b/mpw/mpw.cpp
@@ -46,7 +46,7 @@
 
 #include <cpu/defs.h>
 #include <cpu/fmem.h>
-#include <cpu/cpuModule.h>
+#include <cpu/CpuModule.h>
 
 #include <toolbox/toolbox.h>
 #include <toolbox/mm.h>
diff --git a/mpw/mpw_access.cpp b/mpw/mpw_access.cpp
index 5e1b2e2..cacf0cd 100644
--- a/mpw/mpw_access.cpp
+++ b/mpw/mpw_access.cpp
@@ -40,11 +40,10 @@
 #include <unistd.h>
 #include <fcntl.h>
 #include <stdlib.h>
-#include <sys/paths.h>
 
 #include <cpu/defs.h>
 #include <cpu/fmem.h>
-#include <cpu/cpuModule.h>
+#include <cpu/CpuModule.h>
 
 #include <toolbox/toolbox.h>
 #include <toolbox/os.h>
diff --git a/mpw/mpw_close.cpp b/mpw/mpw_close.cpp
index 1d8ac87..c7a3efe 100644
--- a/mpw/mpw_close.cpp
+++ b/mpw/mpw_close.cpp
@@ -36,7 +36,7 @@
 
 #include <cpu/defs.h>
 #include <cpu/fmem.h>
-#include <cpu/cpuModule.h>
+#include <cpu/CpuModule.h>
 
 #include <macos/errors.h>
 
diff --git a/mpw/mpw_io.cpp b/mpw/mpw_io.cpp
index 80d9412..2f15619 100644
--- a/mpw/mpw_io.cpp
+++ b/mpw/mpw_io.cpp
@@ -38,7 +38,7 @@
 
 #include <cpu/defs.h>
 #include <cpu/fmem.h>
-#include <cpu/cpuModule.h>
+#include <cpu/CpuModule.h>
 
 #include <macos/errors.h>
 
diff --git a/mpw/mpw_ioctl.cpp b/mpw/mpw_ioctl.cpp
index beeb8ab..dac56e4 100644
--- a/mpw/mpw_ioctl.cpp
+++ b/mpw/mpw_ioctl.cpp
@@ -40,11 +40,10 @@
 #include <stdlib.h>
 #include <unistd.h>
 #include <fcntl.h>
-#include <sys/paths.h>
 
 #include <cpu/defs.h>
 #include <cpu/fmem.h>
-#include <cpu/cpuModule.h>
+#include <cpu/CpuModule.h>
 
 
 #include <macos/errors.h>
diff --git a/toolbox/realpath.c b/toolbox/realpath.c
index 42e6bae..9d06d1b 100644
--- a/toolbox/realpath.c
+++ b/toolbox/realpath.c
@@ -29,8 +29,8 @@
 #if defined(LIBC_SCCS) && !defined(lint)
 static char sccsid[] = "@(#)realpath.c	8.1 (Berkeley) 2/16/94";
 #endif /* LIBC_SCCS and not lint */
-#include <sys/cdefs.h>
-
+//#include <sys/cdefs.h>
+#include <limits.h>
 //#include "namespace.h"
 #include <sys/param.h>
 #include <sys/stat.h>
@@ -42,6 +42,9 @@ static char sccsid[] = "@(#)realpath.c	8.1 (Berkeley) 2/16/94";
 //#include "un-namespace.h"
 
 #define FS_SPEC
+#ifndef PATH_MAX
+#define PATH_MAX 1024
+#endif
 
 /*
  * Find the real name of path, by removing all ".", ".." and symlink