diff --git a/src/util/memstream.c b/src/util/memstream.c
index b4da4402d0e..faf70d3a379 100644
--- a/src/util/memstream.c
+++ b/src/util/memstream.c
@@ -27,6 +27,10 @@
 
 #include <stdlib.h>
 
+#ifdef _WIN32
+#include <windows.h>
+#endif
+
 bool
 u_memstream_open(struct u_memstream *mem, char **bufp, size_t *sizep)
 {
diff --git a/src/util/memstream.h b/src/util/memstream.h
index 2d4be8257c1..4dcb4a04d20 100644
--- a/src/util/memstream.h
+++ b/src/util/memstream.h
@@ -30,8 +30,13 @@
 
 #include <stdbool.h>
 #include <stdio.h>
-#ifdef _WIN32
-#include <windows.h>
+#include <limits.h> /* PATH_MAX */
+
+#ifdef _MSC_VER
+#include <stdlib.h>
+#ifndef PATH_MAX
+#define PATH_MAX _MAX_PATH /* Equivalent to MAX_PATH from minwindef.h */
+#endif
 #endif
 
 #ifdef __cplusplus
@@ -44,7 +49,7 @@ struct u_memstream
 #ifdef _WIN32
    char **bufp;
    size_t *sizep;
-   char temp[MAX_PATH];
+   char temp[PATH_MAX];
 #endif
 };