diff --git a/toolkit/crashreporter/Makefile.in b/toolkit/crashreporter/Makefile.in
index 9ba5c2e580bb..64559bd433d3 100644
--- a/toolkit/crashreporter/Makefile.in
+++ b/toolkit/crashreporter/Makefile.in
@@ -61,12 +61,19 @@ endif
 ifeq ($(OS_ARCH),Darwin)
 CMMSRCS = mac_utils.mm
 
+# Check both OS_ARCH (needed to be able to run it afterward) and
+# HOST_OS_ARCH (needed because it refuses to cross-compile).
+ifeq ($(HOST_OS_ARCH),Darwin)
+DIRS += \
+  google-breakpad/src/tools/mac/dump_syms \
+  $(NULL)
+endif
+
 DIRS += \
   google-breakpad/src/common \
   google-breakpad/src/common/mac \
   google-breakpad/src/client \
   google-breakpad/src/client/mac/handler \
-  google-breakpad/src/tools/mac/dump_syms \
   $(NULL)
 endif
 
diff --git a/toolkit/crashreporter/google-breakpad/src/common/dwarf/functioninfo.cc b/toolkit/crashreporter/google-breakpad/src/common/dwarf/functioninfo.cc
index 1957153e92f7..8b3056e2daba 100644
--- a/toolkit/crashreporter/google-breakpad/src/common/dwarf/functioninfo.cc
+++ b/toolkit/crashreporter/google-breakpad/src/common/dwarf/functioninfo.cc
@@ -34,6 +34,9 @@
 #include <map>
 #include <queue>
 #include <vector>
+#include <limits.h>
+#include <stdio.h>
+#include <memory>
 
 #include "common/dwarf/functioninfo.h"
 
diff --git a/toolkit/crashreporter/google-breakpad/src/common/mac/Makefile.in b/toolkit/crashreporter/google-breakpad/src/common/mac/Makefile.in
index c0bdbccc3438..eda5680186b3 100644
--- a/toolkit/crashreporter/google-breakpad/src/common/mac/Makefile.in
+++ b/toolkit/crashreporter/google-breakpad/src/common/mac/Makefile.in
@@ -62,11 +62,13 @@ CMSRCS = \
   HTTPMultipartUpload.m \
   $(NULL)
 
+ifeq ($(HOST_OS_ARCH),Darwin)
 HOST_CPPSRCS = $(CPPSRCS)
 
 HOST_CMMSRCS = \
   dump_syms.mm \
   $(NULL)
+endif
 
 # need static lib
 FORCE_STATIC_LIB = 1