diff --git a/include/common.h b/include/common.h
index b6e2a75c4..7bdef11f7 100644
--- a/include/common.h
+++ b/include/common.h
@@ -48,6 +48,7 @@
 #include <sys/ioctl.h>
 #include <mach-o/dyld.h>
 #include <mach/mach.h>
+#include <limits.h>
 #endif
 
 typedef void *OCL_LIB;
diff --git a/src/hashcat.c b/src/hashcat.c
index a9d9bb364..bc2724ea0 100644
--- a/src/hashcat.c
+++ b/src/hashcat.c
@@ -15401,7 +15401,7 @@ int main (int argc, char **argv)
 
       snprintf (cpath, sizeof (cpath) - 1, "%s\\OpenCL\\", shared_dir);
 
-      char cpath_real[MAX_PATH] = { 0 };
+      char *cpath_real = mymalloc (MAX_PATH);
 
       if (GetFullPathName (cpath, MAX_PATH, cpath_real, NULL) == 0)
       {
@@ -15412,11 +15412,13 @@ int main (int argc, char **argv)
 
       snprintf (build_opts, sizeof (build_opts) - 1, "-I \"%s\"", cpath_real);
 
+      myfree (cpath_real);
+
       #else
 
       snprintf (cpath, sizeof (cpath) - 1, "%s/OpenCL/", shared_dir);
 
-      char cpath_real[PATH_MAX] = { 0 };
+      char *cpath_real = mymalloc (PATH_MAX);
 
       if (realpath (cpath, cpath_real) == NULL)
       {
@@ -15429,7 +15431,9 @@ int main (int argc, char **argv)
 
       naive_escape (cpath_real, cpath_escaped, sizeof (cpath_escaped));
 
-      snprintf (build_opts, sizeof (build_opts) - 1, "-I %s", cpath_real);
+      myfree (cpath_real);
+
+      snprintf (build_opts, sizeof (build_opts) - 1, "-I %s", cpath_escaped);
 
       #endif