diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index 6e6143ba21..53f8494d28 100644
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,3 +1,8 @@
+2014-08-07  Gary Benson  <gbenson@redhat.com>
+
+	* common/common-defs.h: Include pathmax.h.
+	* defs.h: Do not include pathmax.h.
+
 2014-08-07  Gary Benson  <gbenson@redhat.com>
 
 	* common/common-defs.h: Include libiberty.h.
diff --git a/gdb/common/common-defs.h b/gdb/common/common-defs.h
index eedc318cac..b31b3b8426 100644
--- a/gdb/common/common-defs.h
+++ b/gdb/common/common-defs.h
@@ -33,5 +33,6 @@
 #include <stddef.h>
 #include "ansidecl.h"
 #include "libiberty.h"
+#include "pathmax.h"
 
 #endif /* COMMON_DEFS_H */
diff --git a/gdb/defs.h b/gdb/defs.h
index d9775e3284..189de74c6a 100644
--- a/gdb/defs.h
+++ b/gdb/defs.h
@@ -48,9 +48,6 @@
 
 #include <unistd.h>
 
-/* For gnulib's PATH_MAX.  */
-#include "pathmax.h"
-
 #include <fcntl.h>
 
 #include "gdb_locale.h"
diff --git a/gdb/gdbserver/ChangeLog b/gdb/gdbserver/ChangeLog
index 487ada9890..5c97425063 100644
--- a/gdb/gdbserver/ChangeLog
+++ b/gdb/gdbserver/ChangeLog
@@ -1,3 +1,7 @@
+2014-08-07  Gary Benson  <gbenson@redhat.com>
+
+	* server.h: Do not include pathmax.h.
+
 2014-08-07  Gary Benson  <gbenson@redhat.com>
 
 	* server.h: Do not include libiberty.h.
diff --git a/gdb/gdbserver/server.h b/gdb/gdbserver/server.h
index 9ecd9e02c9..fc973c1c13 100644
--- a/gdb/gdbserver/server.h
+++ b/gdb/gdbserver/server.h
@@ -32,9 +32,6 @@
 #endif
 #include <setjmp.h>
 
-/* For gnulib's PATH_MAX.  */
-#include "pathmax.h"
-
 #include <string.h>
 
 #ifdef HAVE_ALLOCA_H