diff --git a/builder/cc1as.cpp b/builder/cc1as.cpp
index cd3229ad..6c31a1c5 100644
--- a/builder/cc1as.cpp
+++ b/builder/cc1as.cpp
@@ -1,4 +1,4 @@
-// +build byollvm
+//go:build byollvm
 
 //===-- cc1as.cpp - Clang Assembler  --------------------------------------===//
 //
diff --git a/builder/clang.cpp b/builder/clang.cpp
index 27c260fd..e51d6933 100644
--- a/builder/clang.cpp
+++ b/builder/clang.cpp
@@ -1,4 +1,4 @@
-// +build byollvm
+//go:build byollvm
 
 #include <clang/Basic/DiagnosticOptions.h>
 #include <clang/CodeGen/CodeGenAction.h>
diff --git a/builder/lld.cpp b/builder/lld.cpp
index a03944c5..c7688f0c 100644
--- a/builder/lld.cpp
+++ b/builder/lld.cpp
@@ -1,4 +1,4 @@
-// +build byollvm
+//go:build byollvm
 
 // This file provides C wrappers for liblld.
 
diff --git a/src/machine/machine_esp32c3_spi.go b/src/machine/machine_esp32c3_spi.go
index 7430df4d..8f831202 100644
--- a/src/machine/machine_esp32c3_spi.go
+++ b/src/machine/machine_esp32c3_spi.go
@@ -1,5 +1,4 @@
 //go:build esp32c3
-// +build esp32c3
 
 package machine