diff --git a/source/app/gpr_tools/main_c.c b/source/app/gpr_tools/main_c.c
index b8a331a..3dc77ce 100755
--- a/source/app/gpr_tools/main_c.c
+++ b/source/app/gpr_tools/main_c.c
@@ -17,7 +17,9 @@
  */
 
 #include <stdio.h>
+#ifndef _WIN32
 #include <strings.h>
+#endif
 #include <string.h>
 #include <stdbool.h>
 
@@ -25,6 +27,8 @@
 
 #if defined __GNUC__
 #define stricmp strcasecmp
+#elif defined _WIN32
+#define stricmp _stricmp
 #else
 #endif // if defined __GNUC__
 
diff --git a/source/lib/expat_lib/xmltok.c b/source/lib/expat_lib/xmltok.c
index c2e5e8c..040e626 100644
--- a/source/lib/expat_lib/xmltok.c
+++ b/source/lib/expat_lib/xmltok.c
@@ -568,7 +568,7 @@ E ## toUtf8(const ENCODING *enc, \
         *(*toP)++ = lo; \
         break; \
       } \
-      __attribute((fallthrough)); \
+      FALL_THROUGH; \
       /* fall through */ \
     case 0x1: case 0x2: case 0x3: \
     case 0x4: case 0x5: case 0x6: case 0x7: \
@@ -1540,7 +1540,7 @@ initScan(const ENCODING * const *encodingTable,
       if (INIT_ENC_INDEX(enc) == ISO_8859_1_ENC
           && state == XML_CONTENT_STATE)
         break;
-      __attribute((fallthrough));
+      FALL_THROUGH;
       /* fall through */
     case 0x00:
     case 0x3C:
diff --git a/source/lib/expat_lib/xmltok_impl.c b/source/lib/expat_lib/xmltok_impl.c
index 41679ea..5689246 100644
--- a/source/lib/expat_lib/xmltok_impl.c
+++ b/source/lib/expat_lib/xmltok_impl.c
@@ -47,7 +47,7 @@
       *nextTokPtr = ptr; \
       return XML_TOK_INVALID; \
     } \
-    __attribute((fallthrough)); \
+    FALL_THROUGH; \
   case BT_NMSTRT: \
   case BT_HEX: \
   case BT_DIGIT: \
@@ -76,7 +76,7 @@
       *nextTokPtr = ptr; \
       return XML_TOK_INVALID; \
     } \
-    __attribute((fallthrough)); \
+    FALL_THROUGH; \
   case BT_NMSTRT: \
   case BT_HEX: \
     ptr += MINBPC(enc); \