--- lib/strlcat.c.orig	2010-04-05 10:58:00.000000000 +1000
+++ lib/strlcat.c	2014-06-23 17:08:42.000000000 +1000
@@ -23,6 +23,10 @@ static char *rcsid = "$OpenBSD: strlcat.
 #include <sys/types.h>
 #include <string.h>
 
+#ifdef strlcat
+#undef strlcat
+#endif
+
 /*
  * Appends src to string dst of size siz (unlike strncat, siz is the
  * full size of dst, not space left).  At most siz-1 characters
--- lib/strlcpy.c.orig	2010-04-05 10:58:00.000000000 +1000
+++ lib/strlcpy.c	2014-06-23 17:09:18.000000000 +1000
@@ -23,6 +23,10 @@ static char *rcsid = "$OpenBSD: strlcpy.
 #include <sys/types.h>
 #include <string.h>
 
+#ifdef strlcpy
+#undef strlcpy
+#endif
+
 /*
  * Copy src to string dst of size siz.  At most siz-1 characters
  * will be copied.  Always NUL terminates (unless siz == 0).
--- lib/strlcpy.h.orig	2010-04-05 10:58:00.000000000 +1000
+++ lib/strlcpy.h	2014-06-23 17:15:16.000000000 +1000
@@ -3,10 +3,14 @@
 
 #include <sys/types.h>
 
+#ifndef strlcpy
 size_t
 strlcpy(char *dst, const char *src, size_t size);
+#endif
 
+#ifndef strlcat
 size_t
 strlcat(char *dst, const char *src, size_t size);
+#endif
 
 #endif