diff --git a/build/libxml2/win32/include/libxml/xmlversion.h b/build/libxml2/win32/include/libxml/xmlversion.h
index f7991db..0457647 100644
--- a/build/libxml2/win32/include/libxml/xmlversion.h
+++ b/build/libxml2/win32/include/libxml/xmlversion.h
@@ -61,14 +61,7 @@ XMLPUBFUN void XMLCALL xmlCheckVersion(int version);
 #define LIBXML_TEST_VERSION xmlCheckVersion(209010);
 
 #ifndef VMS
-#if 0
-/**
- * WITH_TRIO:
- *
- * defined if the trio support need to be configured in
- */
-#define WITH_TRIO
-#else
+#if 1
 /**
  * WITHOUT_TRIO:
  *
@@ -94,15 +87,6 @@ XMLPUBFUN void XMLCALL xmlCheckVersion(int version);
 #define LIBXML_THREAD_ENABLED
 #endif
 
-/**
- * LIBXML_THREAD_ALLOC_ENABLED:
- *
- * Whether the allocation hooks are per-thread
- */
-#if 0
-#define LIBXML_THREAD_ALLOC_ENABLED
-#endif
-
 /**
  * LIBXML_TREE_ENABLED:
  *
@@ -265,24 +249,6 @@ XMLPUBFUN void XMLCALL xmlCheckVersion(int version);
 #define LIBXML_XINCLUDE_ENABLED
 #endif
 
-/**
- * LIBXML_ICONV_ENABLED:
- *
- * Whether iconv support is available
- */
-#if 0
-#define LIBXML_ICONV_ENABLED
-#endif
-
-/**
- * LIBXML_ICU_ENABLED:
- *
- * Whether icu support is available
- */
-#if 0
-#define LIBXML_ICU_ENABLED
-#endif
-
 /**
  * LIBXML_ISO8859X_ENABLED:
  *
@@ -301,24 +267,6 @@ XMLPUBFUN void XMLCALL xmlCheckVersion(int version);
 #define LIBXML_DEBUG_ENABLED
 #endif
 
-/**
- * DEBUG_MEMORY_LOCATION:
- *
- * Whether the memory debugging is configured in
- */
-#if 0
-#define DEBUG_MEMORY_LOCATION
-#endif
-
-/**
- * LIBXML_DEBUG_RUNTIME:
- *
- * Whether the runtime debugging is configured in
- */
-#if 0
-#define LIBXML_DEBUG_RUNTIME
-#endif
-
 /**
  * LIBXML_UNICODE_ENABLED:
  *
@@ -346,17 +294,6 @@ XMLPUBFUN void XMLCALL xmlCheckVersion(int version);
 #define LIBXML_AUTOMATA_ENABLED
 #endif
 
-/**
- * LIBXML_EXPR_ENABLED:
- *
- * Whether the formal expressions interfaces are compiled in
- *
- * This code is unused and disabled unconditionally for now.
- */
-#if 0
-#define LIBXML_EXPR_ENABLED
-#endif
-
 /**
  * LIBXML_SCHEMAS_ENABLED:
  *
@@ -390,24 +327,6 @@ XMLPUBFUN void XMLCALL xmlCheckVersion(int version);
 #define LIBXML_MODULE_EXTENSION "" 
 #endif
 
-/**
- * LIBXML_ZLIB_ENABLED:
- *
- * Whether the Zlib support is compiled in
- */
-#if 0
-#define LIBXML_ZLIB_ENABLED
-#endif
-
-/**
- * LIBXML_LZMA_ENABLED:
- *
- * Whether the Lzma support is compiled in
- */
-#if 0
-#define LIBXML_LZMA_ENABLED
-#endif
-
 #ifdef __GNUC__
 
 /**