9 files changed, 39 insertions, 26 deletions
diff --git a/9/sources/android/support/include/ctype.h b/9/sources/android/support/include/ctype.h
index 79af4b3..f9e859c 100644
--- a/9/sources/android/support/include/ctype.h
+++ b/9/sources/android/support/include/ctype.h
@@ -28,17 +28,17 @@
 #ifndef NDK_ANDROID_SUPPORT_CTYPE_H
 #define NDK_ANDROID_SUPPORT_CTYPE_H
 
-// __LP64__
-
 // Get the system header first.
 #include_next <ctype.h>
+
+#if !defined(__LP64__)
+
 #include <xlocale.h>  // for locale_t
 
 #ifdef __cplusplus
 extern "C" {
 #endif
 
-#if !defined(__LP64__)
 int isalnum_l(int, locale_t);
 int isalpha_l(int, locale_t);
 int isblank_l(int, locale_t);
@@ -47,7 +47,6 @@ int isgraph_l(int, locale_t);
 int isprint_l(int, locale_t);
 int ispunct_l(int, locale_t);
 int isspace_l(int, locale_t);
-#endif // !__LP64__
 
 int islower_l(int, locale_t);
 int isupper_l(int, locale_t);
@@ -60,4 +59,6 @@ int toupper_l(int, locale_t);
 }  // extern "C"
 #endif
 
+#endif // !__LP64__
+
 #endif  // NDK_ANDROID_SUPPORT_CTYPE_H
diff --git a/9/sources/android/support/include/errno.h b/9/sources/android/support/include/errno.h
index 40f4572..ca02371 100644
--- a/9/sources/android/support/include/errno.h
+++ b/9/sources/android/support/include/errno.h
@@ -37,6 +37,7 @@
 #endif
 
 #define ELAST ENOTRECOVERABLE
+
 #endif // !__LP64__
 
 #endif  /* NDK_ANDROID_SUPPORT_ERRNO_H */
diff --git a/9/sources/android/support/include/locale.h b/9/sources/android/support/include/locale.h
index 872fce6..b051a97 100644
--- a/9/sources/android/support/include/locale.h
+++ b/9/sources/android/support/include/locale.h
@@ -29,6 +29,7 @@
 #define NDK_ANDROID_SUPPORT_LOCALE_H
 
 #if defined(__LP64__)
+
 #include_next <locale.h>
 
 #else
diff --git a/9/sources/android/support/include/stdint.h b/9/sources/android/support/include/stdint.h
index 14dc97d..f28797b 100644
--- a/9/sources/android/support/include/stdint.h
+++ b/9/sources/android/support/include/stdint.h
@@ -31,7 +31,9 @@
 #include_next <stdint.h>
 
 #if !defined(__LP64__)
+
 #include <limits.h> // For SIZE_MAX
+
 #endif // !__LP64__
 
 #endif  // NDK_ANDROID_SUPPORT_STDINT_H
diff --git a/9/sources/android/support/include/stdlib.h b/9/sources/android/support/include/stdlib.h
index f145219..57e3d37 100644
--- a/9/sources/android/support/include/stdlib.h
+++ b/9/sources/android/support/include/stdlib.h
@@ -31,13 +31,15 @@
 // __LP64__
 
 #include_next <stdlib.h>
+
+#if !defined(__LP64__)
+
 #include <xlocale.h>
 
 #ifdef __cplusplus
 extern "C" {
 #endif
 
-#if !defined(__LP64__)
 long long   strtoll(const char*, char**, int);
 long double strtold(const char*, char**);
 void _Exit(int);
@@ -47,10 +49,11 @@ unsigned long        strtoul_l(const char *nptr, char **endptr, int base, locale
 long long            strtoll_l(const char *nptr, char **endptr, int base, locale_t loc);
 unsigned long long   strtoull_l(const char *nptr, char **endptr, int base, locale_t loc);
 long double          strtold_l(const char *nptr, char **endptr, locale_t loc);
-#endif // !__LP64__
 
 #ifdef __cplusplus
 }  // extern "C"
 #endif
 
+#endif // !__LP64__
+
 #endif  // NDK_ANDROID_SUPPORT_STDLIB_H
diff --git a/9/sources/android/support/include/string.h b/9/sources/android/support/include/string.h
index d2edd19..732df75 100644
--- a/9/sources/android/support/include/string.h
+++ b/9/sources/android/support/include/string.h
@@ -28,9 +28,10 @@
 #ifndef NDK_ANDROID_SUPPORT_STRING_H
 #define NDK_ANDROID_SUPPORT_STRING_H
 
-// __LP64__
-
 #include_next <string.h>
+
+#if !defined(__LP64__)
+
 #include <xlocale.h>
 
 #ifdef __cplusplus
@@ -44,4 +45,6 @@ size_t strxfrm_l(char *, const char *, size_t, locale_t);
 }  // extern "C"
 #endif
 
+#endif // !__LP64__
+
 #endif  // NDK_ANDROID_SUPPORT_STRING_H
diff --git a/9/sources/android/support/include/time.h b/9/sources/android/support/include/time.h
index 020dcbc..aadec60 100644
--- a/9/sources/android/support/include/time.h
+++ b/9/sources/android/support/include/time.h
@@ -31,6 +31,9 @@
 // __LP64__
 
 #include_next <time.h>
+
+#if !defined(__LP64__)
+
 #include <xlocale.h>
 
 #ifdef __cplusplus
@@ -44,4 +47,6 @@ size_t strftime_l(char *s, size_t maxsize, const char *format,
 }  // extern "C"
 #endif
 
+#endif // !__LP64__
+
 #endif  // NDK_ANDROID_SUPPORT_TIME_H
diff --git a/9/sources/android/support/include/wchar.h b/9/sources/android/support/include/wchar.h
index 3253185..8947bcf 100644
--- a/9/sources/android/support/include/wchar.h
+++ b/9/sources/android/support/include/wchar.h
@@ -25,8 +25,6 @@
 #ifndef NDK_ANDROID_SUPPORT_WCHAR_H
 #define NDK_ANDROID_SUPPORT_WCHAR_H
 
-// __LP64__
-
 /* IMPORTANT NOTE: Unlike other headers in the support library, this
  * one doesn't try to include the Bionic header through #include_next.
  *
@@ -63,17 +61,16 @@
  *
  *    - wscanf() / wfscanf() coming soon :)
  */
-#ifdef __cplusplus
-extern "C" {
-#endif
-
 #if defined(__LP64__)
 
-# include_next <wchar.h>
-#include <xlocale.h> // for locale_t
+#include_next <wchar.h>
 
 #else
 
+#ifdef __cplusplus
+extern "C" {
+#endif
+
 #include <stdarg.h>  // for va_list
 #include <stdio.h>   // for FILE
 #include <stddef.h>  // for size_t
@@ -222,8 +219,6 @@ wint_t    towlower(wint_t);
 wint_t    towupper(wint_t);
 wctype_t  wctype(const char *);
 
-#endif // !__LP64__
-
 int wcscoll_l(const wchar_t *, const wchar_t *, locale_t);
 size_t wcsxfrm_l(wchar_t *__restrict__, const wchar_t *__restrict__, size_t n, locale_t);
 
@@ -231,4 +226,6 @@ size_t wcsxfrm_l(wchar_t *__restrict__, const wchar_t *__restrict__, size_t n, l
 }  // extern "C"
 #endif
 
+#endif // !__LP64__
+
 #endif  // NDK_ANDROID_SUPPORT_WCHAR_H
diff --git a/9/sources/android/support/include/wctype.h b/9/sources/android/support/include/wctype.h
index 6efc58a..cc569fa 100644
--- a/9/sources/android/support/include/wctype.h
+++ b/9/sources/android/support/include/wctype.h
@@ -25,21 +25,21 @@
 #ifndef NDK_ANDROID_SUPPORT_WCTYPE_H
 #define NDK_ANDROID_SUPPORT_WCTYPE_H
 
-// __LP64__
-
 /* Please read note in wchar.h to see why the C library version of this
  * file is not included through #include_next here.
  */
 #if defined(__LP64__)
-#include_next <wctype.h>
-#endif
-#include <xlocale.h>
+
+# include_next <wctype.h>
+
+#else
+
+# include <xlocale.h>
 
 #ifdef __cplusplus
 extern "C" {
 #endif
 
-#if !defined(__LP64__)
 typedef int wint_t;
 typedef int wctrans_t;
 typedef int wctype_t;
@@ -87,10 +87,10 @@ int iswxdigit_l(wint_t, locale_t);
 int towlower_l(int, locale_t);
 int towupper_l(int, locale_t);
 
-#endif // !__LP64__
-
 #ifdef __cplusplus
 }  // extern "C"
 #endif
 
+#endif // !__LP64__
+
 #endif  // NDK_ANDROID_SUPPORT_WCTYPE_H