diff --git a/cmd/bundle/main.go b/cmd/bundle/main.go
index fa73eb83a0a..a4831c78776 100644
--- a/cmd/bundle/main.go
+++ b/cmd/bundle/main.go
@@ -68,6 +68,9 @@
 // Update all bundles in the standard library:
 //
 //	go generate -run bundle std
+
+//go:debug gotypesalias=0
+
 package main
 
 import (
diff --git a/cmd/callgraph/main.go b/cmd/callgraph/main.go
index 9e440bbafb9..1b5af1b52e1 100644
--- a/cmd/callgraph/main.go
+++ b/cmd/callgraph/main.go
@@ -4,6 +4,9 @@
 
 // callgraph: a tool for reporting the call graph of a Go program.
 // See Usage for details, or run with -help.
+
+//go:debug gotypesalias=0
+
 package main // import "golang.org/x/tools/cmd/callgraph"
 
 // TODO(adonovan):
diff --git a/cmd/deadcode/deadcode.go b/cmd/deadcode/deadcode.go
index f129102cc4c..e6f32bb9979 100644
--- a/cmd/deadcode/deadcode.go
+++ b/cmd/deadcode/deadcode.go
@@ -2,6 +2,8 @@
 // Use of this source code is governed by a BSD-style
 // license that can be found in the LICENSE file.
 
+//go:debug gotypesalias=0
+
 package main
 
 import (
diff --git a/cmd/eg/eg.go b/cmd/eg/eg.go
index 108b9e3009f..07e73d2efe7 100644
--- a/cmd/eg/eg.go
+++ b/cmd/eg/eg.go
@@ -5,6 +5,9 @@
 // The eg command performs example-based refactoring.
 // For documentation, run the command, or see Help in
 // golang.org/x/tools/refactor/eg.
+
+//go:debug gotypesalias=0
+
 package main // import "golang.org/x/tools/cmd/eg"
 
 import (
diff --git a/cmd/godex/godex.go b/cmd/godex/godex.go
index e91dbfcea5f..4955600f2d6 100644
--- a/cmd/godex/godex.go
+++ b/cmd/godex/godex.go
@@ -2,6 +2,8 @@
 // Use of this source code is governed by a BSD-style
 // license that can be found in the LICENSE file.
 
+//go:debug gotypesalias=0
+
 package main
 
 import (
diff --git a/cmd/godoc/main.go b/cmd/godoc/main.go
index a665be0769d..1c874cc0e15 100644
--- a/cmd/godoc/main.go
+++ b/cmd/godoc/main.go
@@ -14,6 +14,8 @@
 //				http://godoc/pkg/compress/zlib)
 //
 
+//go:debug gotypesalias=0
+
 package main
 
 import (
diff --git a/cmd/goimports/goimports.go b/cmd/goimports/goimports.go
index dcb5023a2e7..7463e641e95 100644
--- a/cmd/goimports/goimports.go
+++ b/cmd/goimports/goimports.go
@@ -2,6 +2,8 @@
 // Use of this source code is governed by a BSD-style
 // license that can be found in the LICENSE file.
 
+//go:debug gotypesalias=0
+
 package main
 
 import (
diff --git a/cmd/gomvpkg/main.go b/cmd/gomvpkg/main.go
index 5de1e44062d..d54b7070dec 100644
--- a/cmd/gomvpkg/main.go
+++ b/cmd/gomvpkg/main.go
@@ -4,6 +4,9 @@
 
 // The gomvpkg command moves go packages, updating import declarations.
 // See the -help message or Usage constant for details.
+
+//go:debug gotypesalias=0
+
 package main
 
 import (
diff --git a/cmd/gotype/gotype.go b/cmd/gotype/gotype.go
index 4a731f26233..09b66207e63 100644
--- a/cmd/gotype/gotype.go
+++ b/cmd/gotype/gotype.go
@@ -85,6 +85,9 @@ To verify the output of a pipe:
 
 	echo "package foo" | gotype
 */
+
+//go:debug gotypesalias=0
+
 package main
 
 import (
diff --git a/cmd/ssadump/main.go b/cmd/ssadump/main.go
index 275e0a92aef..2ecf04fba50 100644
--- a/cmd/ssadump/main.go
+++ b/cmd/ssadump/main.go
@@ -3,6 +3,9 @@
 // license that can be found in the LICENSE file.
 
 // ssadump: a tool for displaying and interpreting the SSA form of Go programs.
+
+//go:debug gotypesalias=0
+
 package main // import "golang.org/x/tools/cmd/ssadump"
 
 import (
diff --git a/cmd/stringer/stringer.go b/cmd/stringer/stringer.go
index 09be11ca58e..94eaee844a4 100644
--- a/cmd/stringer/stringer.go
+++ b/cmd/stringer/stringer.go
@@ -70,6 +70,9 @@
 //	PillAspirin // Aspirin
 //
 // to suppress it in the output.
+
+//go:debug gotypesalias=0
+
 package main // import "golang.org/x/tools/cmd/stringer"
 
 import (
diff --git a/go/analysis/passes/defers/cmd/defers/main.go b/go/analysis/passes/defers/cmd/defers/main.go
index b3dc8b94eca..ffa5ae2da9b 100644
--- a/go/analysis/passes/defers/cmd/defers/main.go
+++ b/go/analysis/passes/defers/cmd/defers/main.go
@@ -3,6 +3,9 @@
 // license that can be found in the LICENSE file.
 
 // The defers command runs the defers analyzer.
+
+//go:debug gotypesalias=0
+
 package main
 
 import (
diff --git a/go/analysis/passes/fieldalignment/cmd/fieldalignment/main.go b/go/analysis/passes/fieldalignment/cmd/fieldalignment/main.go
index 47d383d2d0e..9ec4b9b505e 100644
--- a/go/analysis/passes/fieldalignment/cmd/fieldalignment/main.go
+++ b/go/analysis/passes/fieldalignment/cmd/fieldalignment/main.go
@@ -1,6 +1,9 @@
 // Copyright 2021 The Go Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style
 // license that can be found in the LICENSE file.
+
+//go:debug gotypesalias=0
+
 package main
 
 import (
diff --git a/go/analysis/passes/findcall/cmd/findcall/main.go b/go/analysis/passes/findcall/cmd/findcall/main.go
index e0ce9137d61..1ada9668313 100644
--- a/go/analysis/passes/findcall/cmd/findcall/main.go
+++ b/go/analysis/passes/findcall/cmd/findcall/main.go
@@ -3,6 +3,9 @@
 // license that can be found in the LICENSE file.
 
 // The findcall command runs the findcall analyzer.
+
+//go:debug gotypesalias=0
+
 package main
 
 import (
diff --git a/go/analysis/passes/httpmux/cmd/httpmux/main.go b/go/analysis/passes/httpmux/cmd/httpmux/main.go
index e8a631157dc..5933df923da 100644
--- a/go/analysis/passes/httpmux/cmd/httpmux/main.go
+++ b/go/analysis/passes/httpmux/cmd/httpmux/main.go
@@ -3,6 +3,9 @@
 // license that can be found in the LICENSE file.
 
 // The httpmux command runs the httpmux analyzer.
+
+//go:debug gotypesalias=0
+
 package main
 
 import (
diff --git a/go/analysis/passes/ifaceassert/cmd/ifaceassert/main.go b/go/analysis/passes/ifaceassert/cmd/ifaceassert/main.go
index 42250f93df8..32390be1643 100644
--- a/go/analysis/passes/ifaceassert/cmd/ifaceassert/main.go
+++ b/go/analysis/passes/ifaceassert/cmd/ifaceassert/main.go
@@ -3,6 +3,9 @@
 // license that can be found in the LICENSE file.
 
 // The ifaceassert command runs the ifaceassert analyzer.
+
+//go:debug gotypesalias=0
+
 package main
 
 import (
diff --git a/go/analysis/passes/lostcancel/cmd/lostcancel/main.go b/go/analysis/passes/lostcancel/cmd/lostcancel/main.go
index 0bba8465242..3f2ac7c38f5 100644
--- a/go/analysis/passes/lostcancel/cmd/lostcancel/main.go
+++ b/go/analysis/passes/lostcancel/cmd/lostcancel/main.go
@@ -4,6 +4,9 @@
 
 // The lostcancel command applies the golang.org/x/tools/go/analysis/passes/lostcancel
 // analysis to the specified packages of Go source code.
+
+//go:debug gotypesalias=0
+
 package main
 
 import (
diff --git a/go/analysis/passes/nilness/cmd/nilness/main.go b/go/analysis/passes/nilness/cmd/nilness/main.go
index 136ac254a45..91b4d5c44b3 100644
--- a/go/analysis/passes/nilness/cmd/nilness/main.go
+++ b/go/analysis/passes/nilness/cmd/nilness/main.go
@@ -4,6 +4,9 @@
 
 // The nilness command applies the golang.org/x/tools/go/analysis/passes/nilness
 // analysis to the specified packages of Go source code.
+
+//go:debug gotypesalias=0
+
 package main
 
 import (
diff --git a/go/analysis/passes/shadow/cmd/shadow/main.go b/go/analysis/passes/shadow/cmd/shadow/main.go
index f9e36ecee95..38de46beb3e 100644
--- a/go/analysis/passes/shadow/cmd/shadow/main.go
+++ b/go/analysis/passes/shadow/cmd/shadow/main.go
@@ -3,6 +3,9 @@
 // license that can be found in the LICENSE file.
 
 // The shadow command runs the shadow analyzer.
+
+//go:debug gotypesalias=0
+
 package main
 
 import (
diff --git a/go/analysis/passes/stringintconv/cmd/stringintconv/main.go b/go/analysis/passes/stringintconv/cmd/stringintconv/main.go
index 118b9579a50..8dfb9a2056d 100644
--- a/go/analysis/passes/stringintconv/cmd/stringintconv/main.go
+++ b/go/analysis/passes/stringintconv/cmd/stringintconv/main.go
@@ -3,6 +3,9 @@
 // license that can be found in the LICENSE file.
 
 // The stringintconv command runs the stringintconv analyzer.
+
+//go:debug gotypesalias=0
+
 package main
 
 import (
diff --git a/go/analysis/passes/unmarshal/cmd/unmarshal/main.go b/go/analysis/passes/unmarshal/cmd/unmarshal/main.go
index 1a17cd64de3..fd69013fa59 100644
--- a/go/analysis/passes/unmarshal/cmd/unmarshal/main.go
+++ b/go/analysis/passes/unmarshal/cmd/unmarshal/main.go
@@ -3,6 +3,9 @@
 // license that can be found in the LICENSE file.
 
 // The unmarshal command runs the unmarshal analyzer.
+
+//go:debug gotypesalias=0
+
 package main
 
 import (
diff --git a/go/analysis/passes/unusedresult/cmd/unusedresult/main.go b/go/analysis/passes/unusedresult/cmd/unusedresult/main.go
index 8116c6e06e9..635883c4051 100644
--- a/go/analysis/passes/unusedresult/cmd/unusedresult/main.go
+++ b/go/analysis/passes/unusedresult/cmd/unusedresult/main.go
@@ -4,6 +4,9 @@
 
 // The unusedresult command applies the golang.org/x/tools/go/analysis/passes/unusedresult
 // analysis to the specified packages of Go source code.
+
+//go:debug gotypesalias=0
+
 package main
 
 import (
diff --git a/go/packages/gopackages/main.go b/go/packages/gopackages/main.go
index aab3362dbfd..7387e7fd10e 100644
--- a/go/packages/gopackages/main.go
+++ b/go/packages/gopackages/main.go
@@ -6,6 +6,9 @@
 // how to use golang.org/x/tools/go/packages to load, parse,
 // type-check, and print one or more Go packages.
 // Its precise output is unspecified and may change.
+
+//go:debug gotypesalias=0
+
 package main
 
 import (
diff --git a/go/packages/internal/nodecount/nodecount.go b/go/packages/internal/nodecount/nodecount.go
index a9f25bfdc6c..4b36a579ac0 100644
--- a/go/packages/internal/nodecount/nodecount.go
+++ b/go/packages/internal/nodecount/nodecount.go
@@ -13,6 +13,9 @@
 // A typical distribution is 40% identifiers, 10% literals, 8%
 // selectors, and 6% calls; around 3% each of BinaryExpr, BlockStmt,
 // AssignStmt, Field, and Comment; and the rest accounting for 20%.
+
+//go:debug gotypesalias=0
+
 package main
 
 import (
diff --git a/go/types/internal/play/play.go b/go/types/internal/play/play.go
index e8ab0540cee..e8b8cb9bbbe 100644
--- a/go/types/internal/play/play.go
+++ b/go/types/internal/play/play.go
@@ -9,6 +9,9 @@
 // It is intended for convenient exploration and debugging of
 // go/types. The command and its web interface are not officially
 // supported and they may be changed arbitrarily in the future.
+
+//go:debug gotypesalias=0
+
 package main
 
 import (