diff --git a/ChangeLog b/ChangeLog
index 8857a79c..5498fe34 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+Mon Sep 10 22:14:42 CEST 2001 Daniel Veillard <daniel@veillard.com>
+
+	* libxml.h include/libxml/xmlversion.h.in
+	  include/libxml/xmlwin32version.h include/libxml/xmlwin32version.h.in:
+	  Tried to close bug #60131
+
 Mon Sep 10 20:46:03 CEST 2001 Daniel Veillard <daniel@veillard.com>
 
 	* SAX.c: fixed a bug in the HTML parser introduced Sep  9
diff --git a/include/libxml/xmlversion.h.in b/include/libxml/xmlversion.h.in
index 266eacdc..58c4ca0e 100644
--- a/include/libxml/xmlversion.h.in
+++ b/include/libxml/xmlversion.h.in
@@ -50,13 +50,20 @@ extern void xmlCheckVersion(int version);
  */
 #define LIBXML_TEST_VERSION xmlCheckVersion(@LIBXML_VERSION_NUMBER@);
 
+#if @WITH_TRIO@
 /**
  * WITH_TRIO:
  *
- * Whether the trio support need to be configured in
+ * defined if the trio support need to be configured in
  */
-#if @WITH_TRIO@
 #define WITH_TRIO
+#else
+/**
+ * WITHOUT_TRIO:
+ *
+ * defined if the trio support should not be configured in
+ */
+#define WITHOUT_TRIO
 #endif
 
 /**
diff --git a/include/libxml/xmlwin32version.h b/include/libxml/xmlwin32version.h
index e5f21404..c120a0e6 100644
--- a/include/libxml/xmlwin32version.h
+++ b/include/libxml/xmlwin32version.h
@@ -51,13 +51,20 @@ extern void xmlCheckVersion(int version);
  */
 #define LIBXML_TEST_VERSION xmlCheckVersion(20403);
 
+#if 0
 /**
  * WITH_TRIO:
  *
- * Whether the trio support need to be configured in
+ * defined if the trio support need to be configured in
  */
-#if 0
 #define WITH_TRIO
+#else
+/**
+ * WITHOUT_TRIO:
+ *
+ * defined if the trio support should not be configured in
+ */
+#define WITHOUT_TRIO
 #endif
 
 /**
diff --git a/include/libxml/xmlwin32version.h.in b/include/libxml/xmlwin32version.h.in
index 52072858..d305851f 100644
--- a/include/libxml/xmlwin32version.h.in
+++ b/include/libxml/xmlwin32version.h.in
@@ -51,13 +51,20 @@ extern void xmlCheckVersion(int version);
  */
 #define LIBXML_TEST_VERSION xmlCheckVersion(@LIBXML_VERSION_NUMBER@);
 
+#if 0
 /**
  * WITH_TRIO:
  *
- * Whether the trio support need to be configured in
+ * defined if the trio support need to be configured in
  */
-#if 0
 #define WITH_TRIO
+#else
+/**
+ * WITHOUT_TRIO:
+ *
+ * defined if the trio support should not be configured in
+ */
+#define WITHOUT_TRIO
 #endif
 
 /**
diff --git a/libxml.h b/libxml.h
index c8f76763..aaebf3b3 100644
--- a/libxml.h
+++ b/libxml.h
@@ -16,7 +16,7 @@
 #include <libxml/xmlversion.h>
 #endif
 
-#ifdef WITHOUT_TRIO
+#ifndef WITH_TRIO
 #include <stdio.h>
 #else
 /**