diff --git a/absl/debugging/failure_signal_handler.cc b/absl/debugging/failure_signal_handler.cc
index 3aaa29f7..46ef7b8f 100644
--- a/absl/debugging/failure_signal_handler.cc
+++ b/absl/debugging/failure_signal_handler.cc
@@ -134,6 +134,9 @@ static bool SetupAlternateStackOnce() {
 #ifdef ABSL_HAVE_MMAP
 #ifndef MAP_STACK
 #define MAP_STACK 0
+#endif
+#if defined(MAP_ANON) && !defined(MAP_ANONYMOUS)
+#define MAP_ANONYMOUS MAP_ANON
 #endif
   sigstk.ss_sp = mmap(nullptr, sigstk.ss_size, PROT_READ | PROT_WRITE,
                       MAP_PRIVATE | MAP_ANONYMOUS | MAP_STACK, -1, 0);
diff --git a/absl/strings/string_view.cc b/absl/strings/string_view.cc
index 0e172954..4ceeb6bf 100644
--- a/absl/strings/string_view.cc
+++ b/absl/strings/string_view.cc
@@ -22,8 +22,6 @@
 #include <ostream>
 
 #include "absl/strings/internal/memutil.h"
-#include "absl/strings/internal/resize_uninitialized.h"
-#include "absl/strings/match.h"
 
 namespace absl {
 
diff --git a/absl/strings/string_view.h b/absl/strings/string_view.h
index 9162bb33..a7f91992 100644
--- a/absl/strings/string_view.h
+++ b/absl/strings/string_view.h
@@ -36,7 +36,7 @@
 
 namespace absl {
 using std::string_view;
-};
+}  // namespace absl
 
 #else  // ABSL_HAVE_STD_STRING_VIEW