diff --git a/client/crashpad_client_linux.cc b/client/crashpad_client_linux.cc
index 5e534599..35742be0 100644
--- a/client/crashpad_client_linux.cc
+++ b/client/crashpad_client_linux.cc
@@ -28,6 +28,8 @@
 #include <sys/wait.h>
 #include <unistd.h>
 
+#include <atomic>
+
 #include "base/logging.h"
 #include "base/strings/stringprintf.h"
 #include "build/build_config.h"
diff --git a/client/crashpad_client_linux_test.cc b/client/crashpad_client_linux_test.cc
index e58352b0..4a2bb418 100644
--- a/client/crashpad_client_linux_test.cc
+++ b/client/crashpad_client_linux_test.cc
@@ -223,7 +223,10 @@ sigjmp_buf do_crash_sigjmp_env;
 
 bool HandleCrashSuccessfully(int, siginfo_t*, ucontext_t*) {
   siglongjmp(do_crash_sigjmp_env, 1);
+#pragma clang diagnostic push
+#pragma clang diagnostic ignored "-Wunreachable-code-return"
   return true;
+#pragma clang diagnostic pop
 }
 
 void DoCrash(const StartHandlerForSelfTestOptions& options,