Index: mxml-2.12/mxmldoc.c
===================================================================
--- mxml-2.12.orig/mxmldoc.c
+++ mxml-2.12/mxmldoc.c
@@ -31,7 +31,15 @@
 #  include "zipc.h"
 #endif /* HAVE_ZLIB_H */
 
+#  ifndef HAVE_STRLCPY
+extern size_t	_mxml_strlcpy(char *, const char *, size_t);
+#    define strlcpy _mxml_strlcpy
+#  endif /* !HAVE_STRLCPY */
 
+#ifndef HAVE_STRLCAT
+extern size_t  _mxml_strlcat( char *, const char *, size_t);
+#define strlcat _mxml_strlcat
+#endif
 /*
  * This program scans source and header files and produces public API
  * documentation for code that conforms to the CUPS Configuration
Index: mxml-2.12/mxml.h
===================================================================
--- mxml-2.12.orig/mxml.h
+++ mxml-2.12/mxml.h
@@ -28,7 +28,7 @@
 #  include <string.h>
 #  include <ctype.h>
 #  include <errno.h>
-
+#  include <stdarg.h>
 
 /*
  * Constants...