diff --git a/lib/roken/fnmatch.c b/lib/roken/fnmatch.c
index d3620cac0..70defc049 100644
--- a/lib/roken/fnmatch.c
+++ b/lib/roken/fnmatch.c
@@ -53,7 +53,7 @@ static char rcsid[] = "$NetBSD: fnmatch.c,v 1.11 1995/02/27 03:43:06 cgd Exp $";
 static const char *rangematch (const char *, int, int);
 
 int ROKEN_LIB_FUNCTION
-fnmatch(const char *pattern, const char *string, int flags)
+rk_fnmatch(const char *pattern, const char *string, int flags)
 {
 	const char *stringstart;
 	char c, test;
diff --git a/lib/roken/fnmatch.hin b/lib/roken/fnmatch.hin
index 7675f4bd5..d5d54a562 100644
--- a/lib/roken/fnmatch.hin
+++ b/lib/roken/fnmatch.hin
@@ -46,8 +46,6 @@
 extern "C" {
 #endif
 
-#define fnmatch rk_fnmatch
-
 #define	FNM_NOMATCH	1	/* Match failed. */
 
 #define	FNM_NOESCAPE	0x01	/* Disable backslash escaping. */
@@ -55,7 +53,9 @@ extern "C" {
 #define	FNM_PERIOD	0x04	/* Period must be matched by period. */
 
 int ROKEN_LIB_FUNCTION
-fnmatch (const char *, const char *, int);
+rk_fnmatch (const char *, const char *, int);
+
+#define fnmatch(a,b,c) rk_fnmatch(a,b,c)
 
 #ifdef __cplusplus
 }
diff --git a/lib/roken/ifaddrs.hin b/lib/roken/ifaddrs.hin
index 084dfc7b3..3287b13b8 100644
--- a/lib/roken/ifaddrs.hin
+++ b/lib/roken/ifaddrs.hin
@@ -66,9 +66,12 @@ struct ifaddrs {
 #endif
 
 int ROKEN_LIB_FUNCTION
-getifaddrs(struct ifaddrs**);
+rk_getifaddrs(struct ifaddrs**);
 
 void ROKEN_LIB_FUNCTION
-freeifaddrs(struct ifaddrs*);
+rk_freeifaddrs(struct ifaddrs*);
+
+#define getifaddrs(a) rk_getifaddrs(a)
+#define freeifaddrs(a) rk_freeifaddrs(a)
 
 #endif /* __ifaddrs_h__ */
diff --git a/lib/roken/vis.hin b/lib/roken/vis.hin
index edc3bf131..d258ccf50 100644
--- a/lib/roken/vis.hin
+++ b/lib/roken/vis.hin
@@ -79,20 +79,35 @@
 #define	UNVIS_END	1	/* no more characters */
 
 char ROKEN_LIB_FUNCTION
-	*vis (char *, int, int, int);
+	*rk_vis (char *, int, int, int);
 char ROKEN_LIB_FUNCTION
-	*svis (char *, int, int, int, const char *);
+	*rk_svis (char *, int, int, int, const char *);
 int ROKEN_LIB_FUNCTION
-	strvis (char *, const char *, int);
+	rk_strvis (char *, const char *, int);
 int ROKEN_LIB_FUNCTION
-	strsvis (char *, const char *, int, const char *);
+	rk_strsvis (char *, const char *, int, const char *);
 int ROKEN_LIB_FUNCTION
-	strvisx (char *, const char *, size_t, int);
+	rk_strvisx (char *, const char *, size_t, int);
 int ROKEN_LIB_FUNCTION
-	strsvisx (char *, const char *, size_t, int, const char *);
+	rk_strsvisx (char *, const char *, size_t, int, const char *);
 int ROKEN_LIB_FUNCTION
-	strunvis (char *, const char *);
+	rk_strunvis (char *, const char *);
 int ROKEN_LIB_FUNCTION
-	unvis (char *, int, int *, int);
+	rk_unvis (char *, int, int *, int);
+
+#undef vis
+#define vis(a,b,c,d) rk_vis(a,b,c,d)
+#undef svis
+#define svis(a,b,c,d,e) rk_svis(a,b,c,d,e)
+#undef strvis
+#define strvis(a,b,c) rk_strvis(a,b,c)
+#undef strvisx
+#define strvisx(a,b,c,d) rk_strvisx(a,b,c,d)
+#undef strsvisx
+#define strsvisx(a,b,c,d,e) rk_strsvisx(a,b,c,d,e)
+#undef strunvis
+#define strunvis(a,b,c,d,e) rk_strunvis(a,b,c,d,e)
+#undef unvis
+#define unvis(a,b,c,d,e) rk_unvis(a,b,c,d,e)
 
 #endif /* !_VIS_H_ */