diff --git a/ChangeLog b/ChangeLog
index d3b68a03..485d2218 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,6 +1,11 @@
+Thu Sep 20 15:54:29 CEST 2001 Daniel Veillard <daniel@veillard.com>
+
+	* catalog.c xmlcatalog.c: removed a couple of warning
+	* xpath.c: try to solve the linking problem on platforms
+	  needing trio to compile
+
 Wed Sep 19 10:01:37 CEST 2001 Daniel Veillard <daniel@veillard.com>
 
-        PISSED !!! DO NOT COMMIT DIRECTLY IF NOT ALLOWED PERSONALLY
 	* Makefile.am libxml.spec.in: backing up non-documented changes
 	  commited without review or aproval by Jens Finke <jens@gnome.org>
 	* HACKING: made 100% clear that no commit should be done directly
diff --git a/catalog.c b/catalog.c
index 8aa17e65..2d537061 100644
--- a/catalog.c
+++ b/catalog.c
@@ -27,6 +27,9 @@
 #ifdef HAVE_FCNTL_H
 #include <fcntl.h>
 #endif
+#ifdef HAVE_STDLIB_H
+#include <stdlib.h>
+#endif
 #include <string.h>
 #include <libxml/xmlmemory.h>
 #include <libxml/hash.h>
diff --git a/xmlcatalog.c b/xmlcatalog.c
index c2cd52fb..b293ec35 100644
--- a/xmlcatalog.c
+++ b/xmlcatalog.c
@@ -12,6 +12,10 @@
 #include <stdio.h>
 #include <stdarg.h>
 
+#ifdef HAVE_STDLIB_H
+#include <stdlib.h>
+#endif
+
 #ifdef HAVE_LIBREADLINE
 #include <readline/readline.h>
 #ifdef HAVE_LIBHISTORY
diff --git a/xpath.c b/xpath.c
index 062e6c62..fd44e1ad 100644
--- a/xpath.c
+++ b/xpath.c
@@ -68,7 +68,9 @@ double xmlXPathDivideBy(double f, double fzero);
  * 									*
  ************************************************************************/
 
+#ifndef TRIO_REPLACE_STDIO
 #define TRIO_PUBLIC static
+#endif
 #include "trionan.c"
 
 /*