diff --git a/ops/matmul.h b/ops/matmul.h
index 85deb624..0f3d2866 100644
--- a/ops/matmul.h
+++ b/ops/matmul.h
@@ -663,7 +663,7 @@ struct MatMulEnv {
     MMKeys keys;
     std::vector<MMPerKey> per_key;
     // Prevents false sharing.
-    HWY_MAYBE_UNUSED uint8_t
+    HWY_MEMBER_VAR_MAYBE_UNUSED uint8_t
         padding[HWY_ALIGNMENT - sizeof(MMKeys) - sizeof(per_key)];
   };
   std::vector<PerCluster> per_cluster;
diff --git a/util/basics.h b/util/basics.h
index f4423a1b..bfab3f89 100644
--- a/util/basics.h
+++ b/util/basics.h
@@ -198,7 +198,8 @@ class RngStream {
   uint64_t stream_ = 0;  // immutable after ctor
   uint64_t counter_ = 0;
   // Prevent false sharing if used by multiple threads.
-  HWY_MAYBE_UNUSED uint8_t padding_[HWY_ALIGNMENT - 16 - sizeof(engine_)];
+  HWY_MEMBER_VAR_MAYBE_UNUSED uint8_t
+      padding_[HWY_ALIGNMENT - 16 - sizeof(engine_)];
 };
 
 }  // namespace gcpp