diff -upr libxml-1.8.9-old/HTMLparser.c libxml-1.8.9/HTMLparser.c
--- libxml-1.8.9-old/HTMLparser.c	Sun Jul  9 01:46:32 2000
+++ libxml-1.8.9/HTMLparser.c	Sat May 26 20:53:27 2001
@@ -6,11 +6,7 @@
  * Daniel.Veillard@w3.org
  */
 
-#ifdef WIN32
-#include "win32config.h"
-#else
 #include "config.h"
-#endif
 
 #include <stdio.h>
 #include <string.h> /* for memset() only */
diff -upr libxml-1.8.9-old/HTMLtree.c libxml-1.8.9/HTMLtree.c
--- libxml-1.8.9-old/HTMLtree.c	Sun Jul  9 01:46:32 2000
+++ libxml-1.8.9/HTMLtree.c	Sat May 26 20:53:34 2001
@@ -7,11 +7,7 @@
  */
 
 
-#ifdef WIN32
-#include "win32config.h"
-#else
 #include "config.h"
-#endif
 #include <stdio.h>
 #include <string.h> /* for memset() only ! */
 
diff -upr libxml-1.8.9-old/SAX.c libxml-1.8.9/SAX.c
--- libxml-1.8.9-old/SAX.c	Sun Jul  9 01:46:32 2000
+++ libxml-1.8.9/SAX.c	Sat May 26 20:47:03 2001
@@ -7,11 +7,7 @@
  */
 
 
-#ifdef WIN32
-#include "win32config.h"
-#else
 #include "config.h"
-#endif
 #include <stdio.h>
 #include <stdlib.h>
 #include "xmlmemory.h"
diff -upr libxml-1.8.9-old/acconfig.h libxml-1.8.9/acconfig.h
--- libxml-1.8.9-old/acconfig.h	Thu Jan  6 01:46:16 2000
+++ libxml-1.8.9/acconfig.h	Sat May 26 20:46:38 2001
@@ -1,3 +1,7 @@
+#if defined(WIN32) && !defined(__CYGWIN__)
+#include "win32config.h"
+#else
+@TOP@
 #undef PACKAGE
 #undef VERSION
 #undef HAVE_LIBZ
@@ -6,3 +10,5 @@
 #undef HAVE_ISNAN
 #undef HAVE_LIBHISTORY
 #undef HAVE_LIBREADLINE
+@BOTTOM@
+#endif
diff -upr libxml-1.8.9-old/config.h.in libxml-1.8.9/config.h.in
--- libxml-1.8.9-old/config.h.in	Wed Jan 19 05:01:00 2000
+++ libxml-1.8.9/config.h.in	Sat May 26 20:46:52 2001
@@ -1,4 +1,7 @@
 /* config.h.in.  Generated automatically from configure.in by autoheader.  */
+#if defined(WIN32) && !defined(__CYGWIN__)
+#include "win32config.h"
+#else
 
 /* Define if you have the strftime function.  */
 #undef HAVE_STRFTIME
@@ -141,3 +144,4 @@
 /* Version number of package */
 #undef VERSION
 
+#endif
diff -upr libxml-1.8.9-old/debugXML.c libxml-1.8.9/debugXML.c
--- libxml-1.8.9-old/debugXML.c	Sun Jul  9 01:46:32 2000
+++ libxml-1.8.9/debugXML.c	Sat May 26 20:51:05 2001
@@ -7,11 +7,7 @@
  * Daniel Veillard <Daniel.Veillard@w3.org>
  */
 
-#ifdef WIN32
-#include "win32config.h"
-#else
 #include "config.h"
-#endif
 #include <stdio.h>
 #ifdef HAVE_STDLIB_H
 #include <stdlib.h>
diff -upr libxml-1.8.9-old/encoding.c libxml-1.8.9/encoding.c
--- libxml-1.8.9-old/encoding.c	Sun Jul  9 01:46:32 2000
+++ libxml-1.8.9/encoding.c	Sat May 26 20:51:13 2001
@@ -19,11 +19,7 @@
  * Daniel.Veillard@w3.org
  */
 
-#ifdef WIN32
-#include "win32config.h"
-#else
 #include "config.h"
-#endif
 
 #include <stdio.h>
 #include <string.h>
diff -upr libxml-1.8.9-old/entities.c libxml-1.8.9/entities.c
--- libxml-1.8.9-old/entities.c	Sun Jul  9 01:46:32 2000
+++ libxml-1.8.9/entities.c	Sat May 26 20:51:41 2001
@@ -6,11 +6,7 @@
  * Daniel.Veillard@w3.org
  */
 
-#ifdef WIN32
-#include "win32config.h"
-#else
 #include "config.h"
-#endif
 
 #include <stdio.h>
 #include <string.h>
diff -upr libxml-1.8.9-old/error.c libxml-1.8.9/error.c
--- libxml-1.8.9-old/error.c	Sun Jul  9 01:46:32 2000
+++ libxml-1.8.9/error.c	Sat May 26 20:51:51 2001
@@ -6,11 +6,7 @@
  * Daniel Veillard <Daniel.Veillard@w3.org>
  */
 
-#ifdef WIN32
-#include "win32config.h"
-#else
 #include "config.h"
-#endif
 
 #include <stdio.h>
 #include <stdarg.h>
diff -upr libxml-1.8.9-old/nanoftp.c libxml-1.8.9/nanoftp.c
--- libxml-1.8.9-old/nanoftp.c	Sun Jul  9 02:06:12 2000
+++ libxml-1.8.9/nanoftp.c	Sat May 26 20:54:17 2001
@@ -6,10 +6,9 @@
 
 #ifdef WIN32
 #define INCLUDE_WINSOCK
-#include "win32config.h"
-#else
-#include "config.h"
 #endif
+
+#include "config.h"
 
 #include <stdio.h>
 #include <string.h>
diff -upr libxml-1.8.9-old/nanohttp.c libxml-1.8.9/nanohttp.c
--- libxml-1.8.9-old/nanohttp.c	Sun Jul  9 01:46:33 2000
+++ libxml-1.8.9/nanohttp.c	Sat May 26 20:54:42 2001
@@ -16,11 +16,9 @@
 
 #ifdef WIN32
 #define INCLUDE_WINSOCK
-#include "win32config.h"
-#else
-#include "config.h"
 #endif
 
+#include "config.h"
 
 #include <stdio.h>
 #include <string.h>
diff -upr libxml-1.8.9-old/parser.c libxml-1.8.9/parser.c
--- libxml-1.8.9-old/parser.c	Sun Jul  9 01:46:33 2000
+++ libxml-1.8.9/parser.c	Sat May 26 20:54:54 2001
@@ -6,11 +6,7 @@
  * Daniel.Veillard@w3.org
  */
 
-#ifdef WIN32
-#include "win32config.h"
-#else
 #include "config.h"
-#endif
 
 #include <stdio.h>
 #include <string.h> /* for memset() only */
diff -upr libxml-1.8.9-old/testHTML.c libxml-1.8.9/testHTML.c
--- libxml-1.8.9-old/testHTML.c	Sun Jul  9 01:46:33 2000
+++ libxml-1.8.9/testHTML.c	Sat May 26 20:55:19 2001
@@ -6,11 +6,7 @@
  * Daniel.Veillard@w3.org
  */
 
-#ifdef WIN32
-#include "win32config.h"
-#else
 #include "config.h"
-#endif
 
 #include <stdio.h>
 #include <string.h>
diff -upr libxml-1.8.9-old/testSAX.c libxml-1.8.9/testSAX.c
--- libxml-1.8.9-old/testSAX.c	Sun Jul  9 01:46:33 2000
+++ libxml-1.8.9/testSAX.c	Sat May 26 20:55:27 2001
@@ -6,11 +6,7 @@
  * Daniel.Veillard@w3.org
  */
 
-#ifdef WIN32
-#include "win32config.h"
-#else
 #include "config.h"
-#endif
 
 #include <stdio.h>
 #include <string.h>
diff -upr libxml-1.8.9-old/testXPath.c libxml-1.8.9/testXPath.c
--- libxml-1.8.9-old/testXPath.c	Sun Jul  9 01:46:33 2000
+++ libxml-1.8.9/testXPath.c	Sat May 26 20:55:43 2001
@@ -6,11 +6,7 @@
  * Daniel.Veillard@w3.org
  */
 
-#ifdef WIN32
-#include "win32config.h"
-#else
 #include "config.h"
-#endif
 
 #include <stdio.h>
 #include <string.h>
diff -upr libxml-1.8.9-old/tester.c libxml-1.8.9/tester.c
--- libxml-1.8.9-old/tester.c	Thu Jun 29 09:39:07 2000
+++ libxml-1.8.9/tester.c	Sat May 26 20:55:10 2001
@@ -6,11 +6,7 @@
  * Daniel.Veillard@w3.org
  */
 
-#ifdef WIN32
-#include "win32config.h"
-#else
 #include "config.h"
-#endif
 
 #include <stdio.h>
 #include <string.h>
diff -upr libxml-1.8.9-old/tree.c libxml-1.8.9/tree.c
--- libxml-1.8.9-old/tree.c	Sun Jul  9 01:46:33 2000
+++ libxml-1.8.9/tree.c	Sat May 26 20:55:57 2001
@@ -6,11 +6,7 @@
  * Daniel.Veillard@w3.org
  */
 
-#ifdef WIN32
-#include "win32config.h"
-#else
 #include "config.h"
-#endif
 
 #include <stdio.h>
 #include <string.h> /* for memset() only ! */
diff -upr libxml-1.8.9-old/valid.c libxml-1.8.9/valid.c
--- libxml-1.8.9-old/valid.c	Sun Jul  9 01:46:33 2000
+++ libxml-1.8.9/valid.c	Sat May 26 20:56:21 2001
@@ -7,11 +7,7 @@
  * Daniel.Veillard@w3.org
  */
 
-#ifdef WIN32
-#include "win32config.h"
-#else
 #include "config.h"
-#endif
 
 #include <stdio.h>
 #include <string.h>
diff -upr libxml-1.8.9-old/xlink.c libxml-1.8.9/xlink.c
--- libxml-1.8.9-old/xlink.c	Sun Jul  9 01:46:33 2000
+++ libxml-1.8.9/xlink.c	Sat May 26 20:56:28 2001
@@ -8,11 +8,7 @@
  */
 
 
-#ifdef WIN32
-#include "win32config.h"
-#else
 #include "config.h"
-#endif
 
 #include <stdio.h>
 #include <string.h> /* for memset() only */
diff -upr libxml-1.8.9-old/xmlIO.c libxml-1.8.9/xmlIO.c
--- libxml-1.8.9-old/xmlIO.c	Sun Jul  9 01:46:33 2000
+++ libxml-1.8.9/xmlIO.c	Sat May 26 20:56:37 2001
@@ -6,11 +6,7 @@
  * Daniel.Veillard@w3.org
  */
 
-#ifdef WIN32
-#include "win32config.h"
-#else
 #include "config.h"
-#endif
 
 #include <stdio.h>
 #include <string.h>
diff -upr libxml-1.8.9-old/xmlmemory.c libxml-1.8.9/xmlmemory.c
--- libxml-1.8.9-old/xmlmemory.c	Sun Jul  9 01:46:33 2000
+++ libxml-1.8.9/xmlmemory.c	Sat May 26 20:56:47 2001
@@ -4,11 +4,7 @@
  * Daniel.Veillard@w3.org
  */
 
-#ifdef WIN32
-#include "win32config.h"
-#else
 #include "config.h"
-#endif
 
 #include <stdio.h>
 #include <string.h>
diff -upr libxml-1.8.9-old/xpath.c libxml-1.8.9/xpath.c
--- libxml-1.8.9-old/xpath.c	Sun Jul  9 01:46:33 2000
+++ libxml-1.8.9/xpath.c	Sat May 26 20:56:55 2001
@@ -13,11 +13,7 @@
  * Author: Daniel.Veillard@w3.org
  */
 
-#ifdef WIN32
-#include "win32config.h"
-#else
 #include "config.h"
-#endif
 
 #include <stdio.h>
 #include <string.h>