diff --git a/ChangeLog b/ChangeLog
index 1db7a044..db9e1db3 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2001-07-27  Darin Adler  <darin@bentspoon.com>
+
+	* encoding.c: (xmlIconvWrapper): Add cast to fix warning.
+	* testCatalog.c: Add include of <libxml/parser.h>.
+
 2001-07-27  Darin Adler  <darin@bentspoon.com>
 
 	* include/libxml/.cvsignore:
diff --git a/encoding.c b/encoding.c
index f7c020c6..2a767918 100644
--- a/encoding.c
+++ b/encoding.c
@@ -1899,7 +1899,7 @@ xmlIconvWrapper(iconv_t cd,
     char *icv_out = (char *) out;
     int ret;
 
-    ret = iconv(cd, &icv_in, &icv_inlen, &icv_out, &icv_outlen);
+    ret = iconv(cd, (char **) &icv_in, &icv_inlen, &icv_out, &icv_outlen);
     if (in != NULL) {
         *inlen -= icv_inlen;
         *outlen -= icv_outlen;
diff --git a/testCatalog.c b/testCatalog.c
index 0bc3ccfb..d7bc4c72 100644
--- a/testCatalog.c
+++ b/testCatalog.c
@@ -15,6 +15,7 @@
 #include <libxml/xmlmemory.h>
 #include <libxml/uri.h>
 #include <libxml/catalog.h>
+#include <libxml/parser.h>
 
 int main(int argc, char **argv) {
 #ifdef LIBXML_CATALOG_ENABLED