diff --git a/include/win32config.h b/include/win32config.h
index 2b113237..a25e0385 100644
--- a/include/win32config.h
+++ b/include/win32config.h
@@ -6,16 +6,16 @@
 #define HAVE_FCNTL_H
 
 #if defined(__MINGW32__) || (defined(_MSC_VER) && _MSC_VER >= 1600)
-#define HAVE_STDINT_H
+  #define HAVE_STDINT_H
 #endif
 
 #if defined(_MSC_VER)
-#if _MSC_VER < 1900
-#define snprintf _snprintf
-#endif
-#if _MSC_VER < 1500
-#define vsnprintf(b,c,f,a) _vsnprintf(b,c,f,a)
-#endif
+  #if _MSC_VER < 1900
+    #define snprintf _snprintf
+  #endif
+  #if _MSC_VER < 1500
+    #define vsnprintf(b,c,f,a) _vsnprintf(b,c,f,a)
+  #endif
 #endif
 
 #endif /* __LIBXML_WIN32_CONFIG__ */
diff --git a/libxml.h b/libxml.h
index 7ff431ad..c3d04bc5 100644
--- a/libxml.h
+++ b/libxml.h
@@ -14,45 +14,49 @@
  * Do not add any #include directives above this block.
  */
 #ifndef NO_LARGEFILE_SOURCE
-#ifndef _LARGEFILE_SOURCE
-#define _LARGEFILE_SOURCE
-#endif
-#ifndef _FILE_OFFSET_BITS
-#define _FILE_OFFSET_BITS 64
-#endif
+  #ifndef _LARGEFILE_SOURCE
+    #define _LARGEFILE_SOURCE
+  #endif
+  #ifndef _FILE_OFFSET_BITS
+    #define _FILE_OFFSET_BITS 64
+  #endif
 #endif
 
 /*
- * Currently supported platforms use either autoconf or
- * copy to config.h own "preset" configuration file.
- * As result ifdef HAVE_CONFIG_H is omitted here.
+ * These files are generated by the build system and contain private
+ * and public build configuration.
  */
 #include "config.h"
 #include <libxml/xmlversion.h>
 
+/*
+ * Due to some Autotools limitations, this variable must be passed as
+ * compiler flag. Define a default value if the macro wasn't set by the
+ * build system.
+ */
 #ifndef SYSCONFDIR
   #define SYSCONFDIR "/etc"
 #endif
 
 #ifdef WITH_TRIO
-#define TRIO_REPLACE_STDIO
-#include "trio.h"
+  #define TRIO_REPLACE_STDIO
+  #include "trio.h"
 #endif
 
 #if !defined(_WIN32) && \
     !defined(__CYGWIN__) && \
     (defined(__clang__) || \
      (defined(__GNUC__) && (__GNUC__ >= 4)))
-#define XML_HIDDEN __attribute__((visibility("hidden")))
+  #define XML_HIDDEN __attribute__((visibility("hidden")))
 #else
-#define XML_HIDDEN
+  #define XML_HIDDEN
 #endif
 
 #if defined(__clang__) || \
     (defined(__GNUC__) && (__GNUC__ >= 8))
-#define ATTRIBUTE_NO_SANITIZE(arg) __attribute__((no_sanitize(arg)))
+  #define ATTRIBUTE_NO_SANITIZE(arg) __attribute__((no_sanitize(arg)))
 #else
-#define ATTRIBUTE_NO_SANITIZE(arg)
+  #define ATTRIBUTE_NO_SANITIZE(arg)
 #endif
 
 #endif /* ! __XML_LIBXML_H__ */