--- nsprpub/config/make-system-wrappers.orig.pl	2016-01-28 00:14:51.000000000 +0100
+++ nsprpub/config/make-system-wrappers.pl	2016-02-02 19:46:06.558587887 +0100
@@ -19,7 +19,9 @@
     open OUT, ">$output_dir/$_";
     print OUT "#pragma GCC system_header\n";  # suppress include_next warning
     print OUT "#pragma GCC visibility push(default)\n";
+    print OUT "#define _GLIBCXX_INCLUDE_NEXT_C_HEADERS\n";
     print OUT "#include_next \<$_\>\n";
+    print OUT "#undef _GLIBCXX_INCLUDE_NEXT_C_HEADERS\n";
     print OUT "#pragma GCC visibility pop\n";
     close OUT;
 }
--- mozglue/build/arm.cpp.old	2016-02-03 10:07:29.879526500 +0100
+++ mozglue/build/arm.cpp	2016-02-03 10:08:11.062697517 +0100
@@ -104,7 +104,9 @@ check_neon(void)
 
 #  elif defined(__linux__) || defined(ANDROID)
 #    include <stdio.h>
+#define _GLIBCXX_INCLUDE_NEXT_C_HEADERS
 #    include <stdlib.h>
+#undef _GLIBCXX_INCLUDE_NEXT_C_HEADERS
 #    include <string.h>
 
 enum{