diff --git a/tools/map/port.h b/tools/map/port.h
index 4562dd3ca..2a739f53c 100755
--- a/tools/map/port.h
+++ b/tools/map/port.h
@@ -14,7 +14,7 @@
 
 #define countof(a)	   ( sizeof(a)/sizeof(*a) )
 
-#ifdef __WIN32__
+#if defined(__WIN32__) || defined(WIN32) || defined(_WIN32)
 #	define HAVE_STRICMP
 #	define HAVE_STRUPR
 #endif
diff --git a/tools/map/scriptlib.c b/tools/map/scriptlib.c
index d878f0943..384690694 100755
--- a/tools/map/scriptlib.c
+++ b/tools/map/scriptlib.c
@@ -19,6 +19,7 @@
 #include <stdlib.h>
 #include <string.h>
 #include <ctype.h>
+#include "port.h"
 #include "scriptlib.h"
 #include "alist.h"
 #include "stringbank.h"