diff --git a/include/util.h b/include/util.h
index d964be6..6b5b875 100644
--- a/include/util.h
+++ b/include/util.h
@@ -9,8 +9,6 @@
 
 #ifdef _POSIX_C_SOURCE
 #include <limits.h>
-#else
-#define PATH_MAX 4096
 #endif
 
 /* Write/Read end for pipes */
diff --git a/src/db.c b/src/db.c
index a4f868e..540f45d 100644
--- a/src/db.c
+++ b/src/db.c
@@ -2,7 +2,9 @@
 #include "db/postgres.h"
 #include "log.h"
 
+#if !defined(__APPLE__) || !defined(__MACH__)
 #include <bits/pthreadtypes.h>
+#endif
 #include <stdlib.h>
 #include <sys/errno.h>
 #include <pthread.h>
diff --git a/src/log.c b/src/log.c
index bd6fc6a..a7fb1b2 100644
--- a/src/log.c
+++ b/src/log.c
@@ -8,6 +8,9 @@
 #include <unistd.h>
 #include <string.h>
 #include <stdlib.h>
+#if defined(__APPLE__) && defined(__MACH__)
+#include <sys/syslimits.h> /* Needed for NAME_MAX, PATH_MAX. */
+#endif
 
 #include "util.h"
 #include "config.h"
diff --git a/src/postgres.c b/src/postgres.c
index 8fcc4aa..bf364ae 100644
--- a/src/postgres.c
+++ b/src/postgres.c
@@ -3,6 +3,7 @@
 
 #if defined(__APPLE__) && defined(__MACH__)
 #include <mach/error.h>
+#include <sys/syslimits.h> /* Needed for NAME_MAX, PATH_MAX */
 #else
 #include <error.h>
 #endif
diff --git a/src/util.c b/src/util.c
index d516f0e..22d5b0c 100644
--- a/src/util.c
+++ b/src/util.c
@@ -4,6 +4,9 @@
 #include <unistd.h>
 #include <sys/wait.h>
 #include <sys/stat.h>
+#if defined(__APPLE__) && defined(__MACH__)
+#include <sys/syslimits.h> /* Needed for NAME_MAX. */
+#endif
 
 #include "util.h"
 #include "log.h"