diff --git a/src/tint/ast/if_statement.cc b/src/tint/ast/if_statement.cc
index e0ddd77ecb..c8fd374042 100644
--- a/src/tint/ast/if_statement.cc
+++ b/src/tint/ast/if_statement.cc
@@ -45,7 +45,7 @@ const IfStatement* IfStatement::Clone(CloneContext* ctx) const {
     auto src = ctx->Clone(source);
     auto* cond = ctx->Clone(condition);
     auto* b = ctx->Clone(body);
-    auto el = ctx->Clone(else_statement);
+    auto* el = ctx->Clone(else_statement);
     return ctx->dst->create<IfStatement>(src, cond, b, el);
 }
 
diff --git a/src/tint/reader/wgsl/lexer_test.cc b/src/tint/reader/wgsl/lexer_test.cc
index 175ee8fca5..0a875e3841 100644
--- a/src/tint/reader/wgsl/lexer_test.cc
+++ b/src/tint/reader/wgsl/lexer_test.cc
@@ -140,7 +140,7 @@ using LineCommentTerminatorTest = testing::TestWithParam<const char*>;
 TEST_P(LineCommentTerminatorTest, Terminators) {
     // Test that line comments are ended by blankspace characters other than
     // space, horizontal tab, left-to-right mark, and right-to-left mark.
-    auto c = GetParam();
+    auto* c = GetParam();
     std::string src = "let// This is a comment";
     src += c;
     src += "ident";
diff --git a/src/tint/reader/wgsl/parser_impl_enable_directive_test.cc b/src/tint/reader/wgsl/parser_impl_enable_directive_test.cc
index ec09f50c57..0fd6b802b3 100644
--- a/src/tint/reader/wgsl/parser_impl_enable_directive_test.cc
+++ b/src/tint/reader/wgsl/parser_impl_enable_directive_test.cc
@@ -31,7 +31,7 @@ TEST_F(EnableDirectiveTest, Valid) {
     EXPECT_EQ(ast.Extensions(),
               ast::ExtensionSet{ast::Enable::ExtensionKind::kInternalExtensionForTesting});
     EXPECT_EQ(ast.GlobalDeclarations().size(), 1u);
-    auto node = ast.GlobalDeclarations()[0]->As<ast::Enable>();
+    auto* node = ast.GlobalDeclarations()[0]->As<ast::Enable>();
     EXPECT_TRUE(node != nullptr);
     EXPECT_EQ(node->name, "InternalExtensionForTesting");
     EXPECT_EQ(node->kind, ast::Enable::ExtensionKind::kInternalExtensionForTesting);
@@ -50,11 +50,11 @@ enable InternalExtensionForTesting;
     EXPECT_EQ(ast.Extensions(),
               ast::ExtensionSet{ast::Enable::ExtensionKind::kInternalExtensionForTesting});
     EXPECT_EQ(ast.GlobalDeclarations().size(), 2u);
-    auto node1 = ast.GlobalDeclarations()[0]->As<ast::Enable>();
+    auto* node1 = ast.GlobalDeclarations()[0]->As<ast::Enable>();
     EXPECT_TRUE(node1 != nullptr);
     EXPECT_EQ(node1->name, "InternalExtensionForTesting");
     EXPECT_EQ(node1->kind, ast::Enable::ExtensionKind::kInternalExtensionForTesting);
-    auto node2 = ast.GlobalDeclarations()[1]->As<ast::Enable>();
+    auto* node2 = ast.GlobalDeclarations()[1]->As<ast::Enable>();
     EXPECT_TRUE(node2 != nullptr);
     EXPECT_EQ(node2->name, "InternalExtensionForTesting");
     EXPECT_EQ(node2->kind, ast::Enable::ExtensionKind::kInternalExtensionForTesting);
diff --git a/src/tint/writer/spirv/builder.cc b/src/tint/writer/spirv/builder.cc
index 2ddb822204..efb892925f 100644
--- a/src/tint/writer/spirv/builder.cc
+++ b/src/tint/writer/spirv/builder.cc
@@ -4143,4 +4143,8 @@ Builder::Backedge::Backedge(const Builder::Backedge& other) = default;
 Builder::Backedge& Builder::Backedge::operator=(const Builder::Backedge& other) = default;
 Builder::Backedge::~Backedge() = default;
 
+Builder::Scope::Scope() = default;
+Builder::Scope::Scope(const Scope&) = default;
+Builder::Scope::~Scope() = default;
+
 }  // namespace tint::writer::spirv
diff --git a/src/tint/writer/spirv/builder.h b/src/tint/writer/spirv/builder.h
index dfaba22bef..34cfd76292 100644
--- a/src/tint/writer/spirv/builder.h
+++ b/src/tint/writer/spirv/builder.h
@@ -602,6 +602,9 @@ class Builder {
 
     // Scope holds per-block information
     struct Scope {
+        Scope();
+        Scope(const Scope&);
+        ~Scope();
         std::unordered_map<OperandListKey, uint32_t> type_ctor_to_id_;
     };