diff --git a/externals/breakpad/android/google_breakpad/Android.mk b/externals/breakpad/android/google_breakpad/Android.mk
index 52fa5e4b..22c0d9c7 100644
--- a/externals/breakpad/android/google_breakpad/Android.mk
+++ b/externals/breakpad/android/google_breakpad/Android.mk
@@ -59,6 +59,8 @@ LOCAL_MODULE := breakpad_client
 
 LOCAL_CPP_EXTENSION := .cc
 
+LOCAL_CPPFLAGS := -std=gnu++11
+
 # Breakpad uses inline ARM assembly that requires the library
 # to be built in ARM mode. Otherwise, the build will fail with
 # cryptic assembler messages like:
@@ -71,9 +73,12 @@ LOCAL_ARM_MODE := arm
 # List of client source files, directly taken from Makefile.am
 LOCAL_SRC_FILES := \
     src/client/linux/crash_generation/crash_generation_client.cc \
+    src/client/linux/dump_writer_common/ucontext_reader.cc \
+    src/client/linux/dump_writer_common/thread_info.cc \
     src/client/linux/handler/exception_handler.cc \
     src/client/linux/handler/minidump_descriptor.cc \
     src/client/linux/log/log.cc \
+    src/client/linux/microdump_writer/microdump_writer.cc \
     src/client/linux/minidump_writer/linux_dumper.cc \
     src/client/linux/minidump_writer/linux_ptrace_dumper.cc \
     src/client/linux/minidump_writer/minidump_writer.cc \
@@ -97,4 +102,4 @@ LOCAL_EXPORT_LDLIBS     := -llog
 
 include $(BUILD_STATIC_LIBRARY)
 
-# Done.
\ No newline at end of file
+# Done.
diff --git a/externals/breakpad/src/common/android/include/link.h b/externals/breakpad/src/common/android/include/link.h
index e7ff8e2d..9778c212 100644
--- a/externals/breakpad/src/common/android/include/link.h
+++ b/externals/breakpad/src/common/android/include/link.h
@@ -43,6 +43,7 @@
 extern "C" {
 #endif  // __cplusplus
 
+#if ANDROID_NDK_HEADERS_ARE_STILL_NOT_CORRECT
 struct r_debug {
   int              r_version;
   struct link_map* r_map;
@@ -61,6 +62,7 @@ struct link_map {
   struct link_map* l_next;
   struct link_map* l_prev;
 };
+#endif
 
 #ifdef __cplusplus
 }  // extern "C"