diff --git a/libretro-common/dynamic/dylib.c b/libretro-common/dynamic/dylib.c
index 7c85337cb0..5bb6ec9c4c 100644
--- a/libretro-common/dynamic/dylib.c
+++ b/libretro-common/dynamic/dylib.c
@@ -21,6 +21,7 @@
  */
 
 #include <string.h>
+#include <stdio.h>
 #include <dynamic/dylib.h>
 
 #ifdef NEED_DYNAMIC
diff --git a/libretro-common/file/retro_dirent.c b/libretro-common/file/retro_dirent.c
index fdafe9b6c6..ac5773fed3 100644
--- a/libretro-common/file/retro_dirent.c
+++ b/libretro-common/file/retro_dirent.c
@@ -1,6 +1,7 @@
 #include <retro_dirent.h>
 
 #include <stdlib.h>
+#include <stdio.h>
 
 #if defined(_WIN32)
 #  include <compat/posix_string.h>
diff --git a/libretro-common/include/compat/posix_string.h b/libretro-common/include/compat/posix_string.h
index f3157aeece..35c8efce66 100644
--- a/libretro-common/include/compat/posix_string.h
+++ b/libretro-common/include/compat/posix_string.h
@@ -23,7 +23,7 @@
 #ifndef __LIBRETRO_SDK_COMPAT_POSIX_STRING_H
 #define __LIBRETRO_SDK_COMPAT_POSIX_STRING_H
 
-#ifdef _WIN32
+#ifdef _MSC_VER
 
 #include <compat/msvc.h>
 
@@ -31,8 +31,18 @@
 extern "C" {
 #endif
 
-#include <stdio.h>
-#define snprintf _snprintf
+#undef strcasecmp
+#undef strdup
+#undef isblank
+#undef strtok_r
+#define strcasecmp(a, b) rarch_strcasecmp__(a, b)
+#define strdup(orig) rarch_strdup__(orig)
+#define isblank(c) rarch_isblank__(c)
+#define strtok_r(str, delim, saveptr) rarch_strtok_r__(str, delim, saveptr)
+int strcasecmp(const char *a, const char *b);
+char *strdup(const char *orig);
+int isblank(int c);
+char *strtok_r(char *str, const char *delim, char **saveptr);
 
 #ifdef __cplusplus
 }