diff --git a/gdbsupport/ChangeLog b/gdbsupport/ChangeLog
index 1d83cbb505e..2e5b3fa8004 100644
--- a/gdbsupport/ChangeLog
+++ b/gdbsupport/ChangeLog
@@ -1,3 +1,9 @@
+2020-11-10  Tom Tromey  <tromey@adacore.com>
+
+	PR build/26848:
+	* pathstuff.h: Move include block here...
+	* pathstuff.cc: ... from here.
+
 2020-11-02  Tom Tromey  <tom@tromey.com>
 
 	* pathstuff.h (get_standard_config_dir): Declare.
diff --git a/gdbsupport/pathstuff.cc b/gdbsupport/pathstuff.cc
index a52e53b8671..311456720e4 100644
--- a/gdbsupport/pathstuff.cc
+++ b/gdbsupport/pathstuff.cc
@@ -23,10 +23,6 @@
 #include "filenames.h"
 #include "gdb_tilde_expand.h"
 
-#include <sys/types.h>
-#include <sys/stat.h>
-#include <unistd.h>
-
 #ifdef USE_WIN32API
 #include <windows.h>
 #endif
diff --git a/gdbsupport/pathstuff.h b/gdbsupport/pathstuff.h
index 996c8f2bbf6..7e35f62c78c 100644
--- a/gdbsupport/pathstuff.h
+++ b/gdbsupport/pathstuff.h
@@ -22,6 +22,10 @@
 
 #include "gdbsupport/byte-vector.h"
 
+#include <sys/types.h>
+#include <sys/stat.h>
+#include <unistd.h>
+
 /* Path utilities.  */
 
 /* Return the real path of FILENAME, expanding all the symbolic links.