--- libcext/cext.h.orig	Sat Jun 17 13:44:30 2006
+++ libcext/cext.h	Sat Jun 17 19:39:01 2006
@@ -5,6 +5,9 @@
 
 #include <sys/types.h>
 
+#include <string.h>
+#include <stdlib.h>
+
 #ifndef nil
 #define nil (void *)0
 #endif
@@ -12,15 +15,18 @@
 /* emallocz.c */
 void *cext_emallocz(unsigned int size);
 
-/* strlcat.c */
-unsigned int cext_strlcat(char *dst, const char *src, unsigned int siz);
+/* strlcat.c
+unsigned int cext_strlcat(char *dst, const char *src, unsigned int siz); */
+#define cext_strlcat strlcat
 
-/* strlcpy.c */
-unsigned int cext_strlcpy(char *dst, const char *src, unsigned int siz);
+/* strlcpy.c
+unsigned int cext_strlcpy(char *dst, const char *src, unsigned int siz); */
+#define cext_strlcpy strlcpy
 
-/* strtonum.c */
+/* strtonum.c 
 long long cext_strtonum(const char *numstr, long long minval,
-		long long maxval, const char **errstrp);
+		long long maxval, const char **errstrp); */
+#define cext_strtonum strtonum
 
 /* tokenize.c */
 unsigned int cext_tokenize(char **result, unsigned int reslen, char *str, char delim);