diff --git a/mesh/net.h b/mesh/net.h
index 150240f..a3dec2b 100644
--- a/mesh/net.h
+++ b/mesh/net.h
@@ -21,6 +21,8 @@
 #define __packed __attribute__((packed))
 #endif
 
+#include <sys/time.h> /* for timeval */
+
 struct mesh_io;
 struct mesh_node;
 
diff --git a/mesh/node.c b/mesh/node.c
index b6824f5..ef7ede1 100644
--- a/mesh/node.c
+++ b/mesh/node.c
@@ -24,6 +24,7 @@
 #define _GNU_SOURCE
 #include <dirent.h>
 #include <stdio.h>
+#include <limits.h> /* for PATH_MAX */
 #include <sys/time.h>
 
 #include <ell/ell.h>

diff --git a/mesh/util.c b/mesh/util.c
index 1455bde..c426fc3 100644
--- a/mesh/util.c
+++ b/mesh/util.c
@@ -25,6 +25,7 @@
 #include <dirent.h>
 #include <ftw.h>
 #include <stdio.h>
+#include <limits.h> /* For PATH_MAX */
 #include <time.h>
 #include <sys/time.h>
 

diff --git a/mesh/keyring.c b/mesh/keyring.c
index 3a7f92f..accd2f1 100644
--- a/mesh/keyring.c
+++ b/mesh/keyring.c
@@ -25,6 +25,7 @@
 #include <fcntl.h>
 #include <dirent.h>
 #include <stdio.h>
+#include <limits.h> /* For PATH_MAX */
 #include <unistd.h>
 #include <dirent.h>
 

diff --git a/mesh/mesh-config-json.c b/mesh/mesh-config-json.c
index cafa2fd..b4d3efb 100644
--- a/mesh/mesh-config-json.c
+++ b/mesh/mesh-config-json.c
@@ -29,6 +29,7 @@
 #include <libgen.h>
 #include <stdio.h>
 #include <string.h>
+#include <limits.h> /* For PATH_MAX */
 #include <unistd.h>
 
 #include <sys/time.h>