diff --git a/src/include/86box/plat.h b/src/include/86box/plat.h
index 34cf87365..1552b032f 100644
--- a/src/include/86box/plat.h
+++ b/src/include/86box/plat.h
@@ -55,15 +55,6 @@ extern int strnicmp(const char *s1, const char *s2, size_t n);
 #    define off64_t  off_t
 #endif
 
-#if __has_attribute(fallthrough)
-# define fallthrough __attribute__((fallthrough))
-#else
-# if __has_attribute(__fallthrough__)
-#  define fallthrough __attribute__((__fallthrough__))
-# endif
-# define fallthrough do {} while (0) /* fallthrough */
-#endif
-
 #ifdef _MSC_VER
 #    define UNUSED(arg) arg
 #else
@@ -89,6 +80,19 @@ extern "C" {
 #    define ssize_t intptr_t
 #endif
 
+#ifdef _MSC_VER
+# define fallthrough do {} while (0) /* fallthrough */
+#else
+# if __has_attribute(fallthrough)
+#  define fallthrough __attribute__((fallthrough))
+# else
+#  if __has_attribute(__fallthrough__)
+#   define fallthrough __attribute__((__fallthrough__))
+#  endif
+#  define fallthrough do {} while (0) /* fallthrough */
+# endif
+#endif
+
 /* Global variables residing in the platform module. */
 extern int          dopause;       /* system is paused */
 extern int          mouse_capture; /* mouse is captured in app */
diff --git a/src/include/86box/plat_fallthrough.h b/src/include/86box/plat_fallthrough.h
index 8d3f4581b..aadd4e14d 100644
--- a/src/include/86box/plat_fallthrough.h
+++ b/src/include/86box/plat_fallthrough.h
@@ -18,13 +18,17 @@
 #ifndef EMU_PLAT_FALLTHROUGH_H
 #define EMU_PLAT_FALLTHROUGH_H
 
-#if __has_attribute(__fallthrough__)
-# define fallthrough __attribute__((__fallthrough__))
+#ifdef _MSC_VER
+# define fallthrough do {} while (0) /* fallthrough */
 #else
 # if __has_attribute(fallthrough)
 #  define fallthrough __attribute__((fallthrough))
+# else
+#  if __has_attribute(__fallthrough__)
+#   define fallthrough __attribute__((__fallthrough__))
+#  endif
+#  define fallthrough do {} while (0) /* fallthrough */
 # endif
-# define fallthrough do {} while (0) /* fallthrough */
 #endif
 
 #endif /*EMU_PLAT_FALLTHROUGH_H*/