--- mozilla-release.orig/tools/profiler/local_debug_info_symbolizer.cc
+++ mozilla-release/tools/profiler/local_debug_info_symbolizer.cc
@@ -3,6 +3,7 @@
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
+#include <sys/types.h>
 #include "PlatformMacros.h"
 #include "nsAutoPtr.h"
 
--- mozilla-release.orig/tools/profiler/platform-linux.cc
+++ mozilla-release/tools/profiler/platform-linux.cc
@@ -84,7 +84,7 @@
 
 #define SIGNAL_SAVE_PROFILE SIGUSR2
 
-#if defined(__GLIBC__)
+#if 1
 // glibc doesn't implement gettid(2).
 #include <sys/syscall.h>
 pid_t gettid()
--- mozilla-release.orig/tools/profiler/platform.h
+++ mozilla-release/tools/profiler/platform.h
@@ -29,6 +29,8 @@
 #ifndef TOOLS_PLATFORM_H_
 #define TOOLS_PLATFORM_H_
 
+#include <sys/types.h>
+
 #ifdef ANDROID
 #include <android/log.h>
 #else
--- mozilla-release/tools.orig/profiler/shared-libraries-linux.cc
+++ mozilla-release/tools/profiler/shared-libraries-linux.cc
@@ -14,7 +14,7 @@
 #include "platform.h"
 #include "shared-libraries.h"
 
-#if !defined(__GLIBC__) && ANDROID_VERSION < 18
+#if defined(ANDROID) && ANDROID_VERSION < 18
 /* a crapy version of getline, because it's not included in old bionics */
 static ssize_t getline(char **lineptr, size_t *n, FILE *stream)
 {