diff --git a/externals/breakpad/src/client/linux/minidump_writer/linux_dumper.cc b/externals/breakpad/src/client/linux/minidump_writer/linux_dumper.cc
index 43b74ad9..d70300af 100644
--- a/externals/breakpad/src/client/linux/minidump_writer/linux_dumper.cc
+++ b/externals/breakpad/src/client/linux/minidump_writer/linux_dumper.cc
@@ -434,6 +434,9 @@ void LinuxDumper::ParseLoadedElfProgramHeaders(ElfW(Ehdr)* ehdr,
                                                size_t* dyn_count_ptr) {
   uintptr_t phdr_addr = start_addr + ehdr->e_phoff;
 
+#ifndef UINTPTR_MAX
+#   define UINTPTR_MAX UINT_MAX
+#endif
   const uintptr_t max_addr = UINTPTR_MAX;
   uintptr_t min_vaddr = max_addr;
   uintptr_t dyn_vaddr = 0;
diff --git a/externals/breakpad/src/common/android/include/link.h b/externals/breakpad/src/common/android/include/link.h
index 9778c212..e7ff8e2d 100644
--- a/externals/breakpad/src/common/android/include/link.h
+++ b/externals/breakpad/src/common/android/include/link.h
@@ -43,7 +43,6 @@
 extern "C" {
 #endif  // __cplusplus
 
-#if ANDROID_NDK_HEADERS_ARE_STILL_NOT_CORRECT
 struct r_debug {
   int              r_version;
   struct link_map* r_map;
@@ -62,7 +61,6 @@ struct link_map {
   struct link_map* l_next;
   struct link_map* l_prev;
 };
-#endif
 
 #ifdef __cplusplus
 }  // extern "C"