diff --git a/config/system-headers b/config/system-headers
index 8cc86c426629..4822d2434d5f 100644
--- a/config/system-headers
+++ b/config/system-headers
@@ -531,6 +531,7 @@ nl_types.h
 NodeInfo.h
 nss.h
 nssilock.h
+nsswitch.h
 objbase.h
 objidl.h
 Objsafe.h
@@ -750,6 +751,7 @@ sys/sysctl.h
 sys/sysinfo.h
 sys/sysmp.h
 sys/syssgi.h
+sys/system_properties.h
 sys/systeminfo.h
 sys/timeb.h
 sys/time.h
diff --git a/js/src/config/system-headers b/js/src/config/system-headers
index 8cc86c426629..4822d2434d5f 100644
--- a/js/src/config/system-headers
+++ b/js/src/config/system-headers
@@ -531,6 +531,7 @@ nl_types.h
 NodeInfo.h
 nss.h
 nssilock.h
+nsswitch.h
 objbase.h
 objidl.h
 Objsafe.h
@@ -750,6 +751,7 @@ sys/sysctl.h
 sys/sysinfo.h
 sys/sysmp.h
 sys/syssgi.h
+sys/system_properties.h
 sys/systeminfo.h
 sys/timeb.h
 sys/time.h
diff --git a/xpcom/base/nsSystemInfo.cpp b/xpcom/base/nsSystemInfo.cpp
index 101452a042af..87cf07b12ba9 100644
--- a/xpcom/base/nsSystemInfo.cpp
+++ b/xpcom/base/nsSystemInfo.cpp
@@ -53,7 +53,7 @@
 #include "AndroidBridge.h"
 
 extern "C" {
-extern int android_sdk_version;
+NS_EXPORT int android_sdk_version;
 }
 #endif