diff --git a/tools/profiler/LulElf.cpp b/tools/profiler/LulElf.cpp
index 203b15d..08a270a 100644
--- a/tools/profiler/lul/LulElf.cpp
+++ b/tools/profiler/lul/LulElf.cpp
@@ -612,10 +612,10 @@ string FormatIdentifier(unsigned char identifier[16]) {
 // Return the non-directory portion of FILENAME: the portion after the
 // last slash, or the whole filename if there are no slashes.
 string BaseFileName(const string &filename) {
-  // Lots of copies!  basename's behavior is less than ideal.
-  char *c_filename = strdup(filename.c_str());
-  string base = basename(c_filename);
-  free(c_filename);
+  // basename's behavior is less than ideal so avoid it
+  const char *c_filename = filename.c_str();
+  const char *p = strrchr(c_filename, '/');
+  string base = p ? p+1 : c_filename;
   return base;
 }
 
diff --git a/tools/profiler/local_debug_info_symbolizer.cc b/tools/profiler/local_debug_info_symbolizer.cc
index 2232130..41dabc8 100644
--- a/tools/profiler/gecko/local_debug_info_symbolizer.cc
+++ b/tools/profiler/gecko/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"
 
--- ./tools/profiler/core/platform.h.orig
+++ ./tools/profiler/core/platform.h
@@ -34,6 +34,8 @@
 #define MOZ_COUNT_DTOR(name)
 #endif
 
+#include <sys/types.h>
+
 #ifdef ANDROID
 #include <android/log.h>
 #else
@@ -60,7 +62,7 @@
 
 // We need a definition of gettid(), but glibc doesn't provide a
 // wrapper for it.
-#if defined(__GLIBC__)
+#if defined(__linux__)
 #include <unistd.h>
 #include <sys/syscall.h>
 static inline pid_t gettid()