diff --git a/expat/lib/expat.h b/expat/lib/expat.h
index ea98d48d..d94a8890 100644
--- a/expat/lib/expat.h
+++ b/expat/lib/expat.h
@@ -8,11 +8,11 @@
 #include <stdlib.h>
 
 #ifndef XMLPARSEAPI
-#  if defined(_MSC_EXTENSIONS) && !defined(__BEOS__) && !defined(__CYGWIN__)
-#    define XMLPARSEAPI(type) __declspec(dllimport) type __cdecl
-#  else
-#    define XMLPARSEAPI(type) type
-#  endif
+#if defined(_MSC_EXTENSIONS) && !defined(__BEOS__) && !defined(__CYGWIN__)
+#define XMLPARSEAPI(type) __declspec(dllimport) type __cdecl
+#else
+#define XMLPARSEAPI(type) type
+#endif
 #endif  /* not defined XMLPARSEAPI */
 
 #ifdef __cplusplus
@@ -20,23 +20,23 @@ extern "C" {
 #endif
 
 #ifdef XML_UNICODE_WCHAR_T 
-#  define XML_UNICODE
+#define XML_UNICODE
 #endif
 
 typedef void *XML_Parser;
 
 #ifdef XML_UNICODE     /* Information is UTF-16 encoded. */
-#  ifdef XML_UNICODE_WCHAR_T
+#ifdef XML_UNICODE_WCHAR_T
 typedef wchar_t XML_Char;
 typedef wchar_t XML_LChar;
-#  else
+#else
 typedef unsigned short XML_Char;
 typedef char XML_LChar;
-#  endif
+#endif /* XML_UNICODE_WCHAR_T */
 #else                  /* Information is UTF-8 encoded. */
 typedef char XML_Char;
 typedef char XML_LChar;
-#endif
+#endif /* XML_UNICODE */
 
 enum XML_Content_Type {
   XML_CTYPE_EMPTY = 1,
diff --git a/expat/lib/xmlparse.c b/expat/lib/xmlparse.c
index effc75a7..51437679 100644
--- a/expat/lib/xmlparse.c
+++ b/expat/lib/xmlparse.c
@@ -3,21 +3,24 @@
 */
 
 #ifdef COMPILED_FROM_DSP
-#  include "winconfig.h"
-#  define XMLPARSEAPI(type) __declspec(dllexport) type __cdecl
-#  include "expat.h"
-#  undef XMLPARSEAPI
+
+#include "winconfig.h"
+#define XMLPARSEAPI(type) __declspec(dllexport) type __cdecl
+#include "expat.h"
+#undef XMLPARSEAPI
+
 #else
+
 #include <expat_config.h>
 
 #ifdef __declspec
-#  define XMLPARSEAPI(type) __declspec(dllexport) type __cdecl
+#define XMLPARSEAPI(type) __declspec(dllexport) type __cdecl
 #endif
 
 #include "expat.h"
 
 #ifdef __declspec
-#  undef XMLPARSEAPI
+#undef XMLPARSEAPI
 #endif
 #endif /* ndef COMPILED_FROM_DSP */
 
@@ -55,13 +58,13 @@ typedef char ICHAR;
 
 #ifdef XML_UNICODE 
 
-#  ifdef XML_UNICODE_WCHAR_T
-#  define XML_T(x) (const wchar_t)x
-#  define XML_L(x) L ## x
-#  else
-#  define XML_T(x) (const unsigned short)x
-#  define XML_L(x) x
-#  endif
+#ifdef XML_UNICODE_WCHAR_T
+#define XML_T(x) (const wchar_t)x
+#define XML_L(x) L ## x
+#else
+#define XML_T(x) (const unsigned short)x
+#define XML_L(x) x
+#endif
  
 #else 
                 
diff --git a/expat/lib/xmlrole.c b/expat/lib/xmlrole.c
index 93bd30c2..730bfd26 100644
--- a/expat/lib/xmlrole.c
+++ b/expat/lib/xmlrole.c
@@ -3,9 +3,9 @@
 */
 
 #ifdef COMPILED_FROM_DSP
-#  include "winconfig.h"
+#include "winconfig.h"
 #else
-#  include <expat_config.h>
+#include <expat_config.h>
 #endif /* ndef COMPILED_FROM_DSP */
 
 #include "xmlrole.h"
diff --git a/expat/lib/xmltok.c b/expat/lib/xmltok.c
index 9ff6c84e..6a68db5c 100644
--- a/expat/lib/xmltok.c
+++ b/expat/lib/xmltok.c
@@ -3,9 +3,9 @@
 */
 
 #ifdef COMPILED_FROM_DSP
-#  include "winconfig.h"
+#include "winconfig.h"
 #else
-#  include <expat_config.h>
+#include <expat_config.h>
 #endif /* ndef COMPILED_FROM_DSP */
 
 #include "xmltok.h"