diff --git a/historic/jam/src/pwd.c b/historic/jam/src/pwd.c
index 5e68664e8..4fb67aabf 100644
--- a/historic/jam/src/pwd.c
+++ b/historic/jam/src/pwd.c
@@ -3,14 +3,17 @@
 #include "newstr.h"
 #include "pathsys.h"
 
-#ifdef NT
+#include <limits.h>
+
+// MinGW on windows declares PATH_MAX in limits.h
+#if defined(NT) && ! defined(__GNUC__)
 #include <direct.h>
 #define PATH_MAX _MAX_PATH
 #else
 #include <unistd.h>
 #endif
 
-#include <limits.h>
+
 
 LIST*
 pwd(void)
diff --git a/jam_src/pwd.c b/jam_src/pwd.c
index 5e68664e8..4fb67aabf 100644
--- a/jam_src/pwd.c
+++ b/jam_src/pwd.c
@@ -3,14 +3,17 @@
 #include "newstr.h"
 #include "pathsys.h"
 
-#ifdef NT
+#include <limits.h>
+
+// MinGW on windows declares PATH_MAX in limits.h
+#if defined(NT) && ! defined(__GNUC__)
 #include <direct.h>
 #define PATH_MAX _MAX_PATH
 #else
 #include <unistd.h>
 #endif
 
-#include <limits.h>
+
 
 LIST*
 pwd(void)