diff --git a/SMP/gnulib/lib/stdio.h b/SMP/gnulib/lib/stdio.h
index 0143cf66d0..d9ba2b08dc 100644
--- a/SMP/gnulib/lib/stdio.h
+++ b/SMP/gnulib/lib/stdio.h
@@ -111,10 +111,14 @@ extern int rpl_snprintf(char *str, size_t size, const char *format, ...);
 extern int rpl_sprintf(char *str, const char *format, ...);
 #define sprintf rpl_sprintf
 #endif
-extern ssize_t getdelim(char **lineptr, size_t *n, int delimiter, FILE *fp);
-extern ssize_t getline(char **lineptr, size_t *n, FILE *stream);
-extern int vasprintf(char **resultp, const char *format, va_list args);
-extern char *vasnprintf(char *resultbuf, size_t *lengthp, const char *format, va_list args);
+extern ssize_t rpl_getdelim(char **lineptr, size_t *n, int delimiter, FILE *fp);
+#define getdelim rpl_getdelim
+extern ssize_t rpl_getline(char **lineptr, size_t *n, FILE *stream);
+#define getline rpl_getline
+extern int rpl_vasprintf(char **resultp, const char *format, va_list args);
+#define vasprintf rpl_vasprintf
+extern char *rpl_vasnprintf(char *resultbuf, size_t *lengthp, const char *format, va_list args);
+#define vasnprintf rpl_vasnprintf
 
 // Prevent undefined functions from being used
 #define dprintf(...) error
diff --git a/SMP/gnulib/lib/string.h b/SMP/gnulib/lib/string.h
index 5eaa4712f5..85c7704d6c 100644
--- a/SMP/gnulib/lib/string.h
+++ b/SMP/gnulib/lib/string.h
@@ -50,9 +50,12 @@
 #define strcasecmp _stricmp
 #define strncasecmp _strnicmp
 
-extern void *memmem(const void *haystack, size_t haystack_len, const void *needle, size_t needle_len);
-extern int strverscmp(const char *s1, const char *s2);
-extern void explicit_bzero(void *s, size_t len);
+extern void *rpl_memmem(const void *haystack, size_t haystack_len, const void *needle, size_t needle_len);
+#define memmem rpl_memmem
+extern int rpl_strverscmp(const char *s1, const char *s2);
+#define strverscmp rpl_strverscmp
+extern void rpl_explicit_bzero(void *s, size_t len);
+#define explicit_bzero rpl_explicit_bzero
 
 #endif /* _MSC_VER */