diff --git a/toolbelt/payload_buffer_test.cc b/toolbelt/payload_buffer_test.cc
index 4a15ec2..e8c6cfd 100644
--- a/toolbelt/payload_buffer_test.cc
+++ b/toolbelt/payload_buffer_test.cc
@@ -656,17 +656,12 @@ TEST(BufferTest, VectorPushWithResize) {
   bool resized = false;
   PayloadBuffer *pb = new (buffer) PayloadBuffer(
       256, [&resized, &buffer](PayloadBuffer **p, size_t, size_t new_size) {
-#if defined(__clang__)
-#pragma clang diagnostic push
-#pragma clang diagnostic ignored "-Wclass-memaccess"
-#elif defined(__GNUC__)
+#if defined(__GNUC__) && !defined(__clang__)
 #pragma GCC diagnostic push
 #pragma GCC diagnostic ignored "-Wclass-memaccess"
 #endif
         *p = reinterpret_cast<PayloadBuffer *>(realloc(*p, new_size));
-#if defined(__clang__)
-#pragma clang diagnostic pop
-#elif defined(__GNUC__)
+#if defined(__GNUC__) && !defined(__clang__)
 #pragma GCC diagnostic pop
 #endif
         buffer = reinterpret_cast<char *>(*p);
@@ -699,17 +694,12 @@ TEST(BufferTest, VectorReserveWithResize) {
   bool resized = false;
   PayloadBuffer *pb = new (buffer) PayloadBuffer(
       256, [&resized, &buffer](PayloadBuffer **p, size_t, size_t new_size) {
-#if defined(__clang__)
-#pragma clang diagnostic push
-#pragma clang diagnostic ignored "-Wclass-memaccess"
-#elif defined(__GNUC__)
+#if defined(__GNUC__) && !defined(__clang__)
 #pragma GCC diagnostic push
 #pragma GCC diagnostic ignored "-Wclass-memaccess"
 #endif
         *p = reinterpret_cast<PayloadBuffer *>(realloc(*p, new_size));
-#if defined(__clang__)
-#pragma clang diagnostic pop
-#elif defined(__GNUC__)
+#if defined(__GNUC__) && !defined(__clang__)
 #pragma GCC diagnostic pop
 #endif
         buffer = reinterpret_cast<char *>(*p);
@@ -735,17 +725,12 @@ TEST(BufferTest, VectorResizeWithResize) {
   bool resized = false;
   PayloadBuffer *pb = new (buffer) PayloadBuffer(
       256, [&resized, &buffer](PayloadBuffer **p, size_t, size_t new_size) {
-#if defined(__clang__)
-#pragma clang diagnostic push
-#pragma clang diagnostic ignored "-Wclass-memaccess"
-#elif defined(__GNUC__)
+#if defined(__GNUC__) && !defined(__clang__)
 #pragma GCC diagnostic push
 #pragma GCC diagnostic ignored "-Wclass-memaccess"
 #endif
         *p = reinterpret_cast<PayloadBuffer *>(realloc(*p, new_size));
-#if defined(__clang__)
-#pragma clang diagnostic pop
-#elif defined(__GNUC__)
+#if defined(__GNUC__) && !defined(__clang__)
 #pragma GCC diagnostic pop
 #endif
         buffer = reinterpret_cast<char *>(*p);
@@ -772,17 +757,12 @@ TEST(BufferTest, Resizeable) {
   PayloadBuffer *pb = new (buffer) PayloadBuffer(
       256, [&resized](PayloadBuffer **p, size_t, size_t new_size) {
         std::cout << "resize for " << new_size << std::endl;
-#if defined(__clang__)
-#pragma clang diagnostic push
-#pragma clang diagnostic ignored "-Wclass-memaccess"
-#elif defined(__GNUC__)
+#if defined(__GNUC__) && !defined(__clang__)
 #pragma GCC diagnostic push
 #pragma GCC diagnostic ignored "-Wclass-memaccess"
 #endif
         *p = reinterpret_cast<PayloadBuffer *>(realloc(*p, new_size));
-#if defined(__clang__)
-#pragma clang diagnostic pop
-#elif defined(__GNUC__)
+#if defined(__GNUC__) && !defined(__clang__)
 #pragma GCC diagnostic pop
 #endif
         resized = true;
diff --git a/toolbelt/pipe.cc b/toolbelt/pipe.cc
index 919c690..e8adac8 100644
--- a/toolbelt/pipe.cc
+++ b/toolbelt/pipe.cc
@@ -69,7 +69,7 @@ absl::StatusOr<size_t> Pipe::GetPipeSize() {
 #endif
 }
 
-absl::Status Pipe::SetPipeSize(size_t size) {
+absl::Status Pipe::SetPipeSize([[maybe_unused]] size_t size) {
 #if defined(__linux__)
   int e = fcntl(write_.Fd(), F_SETPIPE_SZ, size);
   if (e == -1) {
diff --git a/toolbelt/pipe.h b/toolbelt/pipe.h
index fd0d27c..3f5a316 100644
--- a/toolbelt/pipe.h
+++ b/toolbelt/pipe.h
@@ -149,7 +149,7 @@ template <typename T> class SharedPtrPipe : public Pipe {
     return absl::InternalError("Not supported on SharedPtrPipe");
   }
   absl::StatusOr<ssize_t> Write(const char *, size_t ,
-                                const AsyncWaiter *c = nullptr) override {
+                                const AsyncWaiter * = nullptr) override {
     return absl::InternalError("Not supported on SharedPtrPipe");
   }
 
diff --git a/toolbelt/sockets_test.cc b/toolbelt/sockets_test.cc
index 2a0ef9b..c6fe6c3 100644
--- a/toolbelt/sockets_test.cc
+++ b/toolbelt/sockets_test.cc
@@ -202,7 +202,7 @@ TEST(SocketsTest, UnixSocketShortFdCountRead) {
         ASSERT_EQ(std::size_t{1}, fds.size());
     });
 
-    co::Coroutine outgoing(scheduler, [&socket_name](co::Coroutine* c) {
+    co::Coroutine outgoing(scheduler, [&socket_name](co::Coroutine*) {
         toolbelt::UnixSocket socket;
         absl::Status s = socket.Connect(socket_name);
         ASSERT_TRUE(s.ok());