diff --git a/absl/debugging/internal/stacktrace_x86-inl.inc b/absl/debugging/internal/stacktrace_x86-inl.inc
index 9fbfcf76..2f8bf428 100644
--- a/absl/debugging/internal/stacktrace_x86-inl.inc
+++ b/absl/debugging/internal/stacktrace_x86-inl.inc
@@ -29,6 +29,7 @@
 #include <cstdint>
 #include <limits>
 
+#include "absl/base/attributes.h"
 #include "absl/base/macros.h"
 #include "absl/base/port.h"
 #include "absl/debugging/internal/address_is_readable.h"
diff --git a/absl/log/internal/log_message.cc b/absl/log/internal/log_message.cc
index a044a5a7..20050a04 100644
--- a/absl/log/internal/log_message.cc
+++ b/absl/log/internal/log_message.cc
@@ -372,12 +372,16 @@ void LogMessage::Flush() {
   }
 
   // Have we already seen a fatal message?
-  ABSL_CONST_INIT static std::atomic_flag seen_fatal = ATOMIC_FLAG_INIT;
+  ABSL_CONST_INIT static std::atomic<bool> seen_fatal(false);
   if (data_->entry.log_severity() == absl::LogSeverity::kFatal &&
       absl::log_internal::ExitOnDFatal()) {
     // Exactly one LOG(FATAL) message is responsible for aborting the process,
     // even if multiple threads LOG(FATAL) concurrently.
-    data_->first_fatal = !seen_fatal.test_and_set(std::memory_order_relaxed);
+    bool expected_seen_fatal = false;
+    if (seen_fatal.compare_exchange_strong(expected_seen_fatal, true,
+                                           std::memory_order_relaxed)) {
+      data_->first_fatal = true;
+    }
   }
 
   data_->entry.text_message_with_prefix_and_newline_and_nul_ =