diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index 5bfbe9bb67..8d3b633f93 100644
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,3 +1,8 @@
+2018-03-01  Sergio Durigan Junior  <sergiodj@redhat.com>
+
+	PR gdb/22907
+	* common/pathstuff.c: Conditionally include "<windows.h>".
+
 2018-03-01  Georg Sauthoff  <mail@georg.so>
 
 	PR gdb/22888
diff --git a/gdb/common/pathstuff.c b/gdb/common/pathstuff.c
index fc574dc32e..8c4093fc38 100644
--- a/gdb/common/pathstuff.c
+++ b/gdb/common/pathstuff.c
@@ -23,6 +23,10 @@
 #include "filenames.h"
 #include "gdb_tilde_expand.h"
 
+#ifdef USE_WIN32API
+#include <windows.h>
+#endif
+
 /* See common/pathstuff.h.  */
 
 gdb::unique_xmalloc_ptr<char>