diff --git a/internal/externalcmd/cmd_unix.go b/internal/externalcmd/cmd_unix.go
index ce4db958..c8c39ecd 100644
--- a/internal/externalcmd/cmd_unix.go
+++ b/internal/externalcmd/cmd_unix.go
@@ -1,5 +1,4 @@
 //go:build !windows
-// +build !windows
 
 package externalcmd
 
diff --git a/internal/externalcmd/cmd_win.go b/internal/externalcmd/cmd_win.go
index 518d9e66..e424d49d 100644
--- a/internal/externalcmd/cmd_win.go
+++ b/internal/externalcmd/cmd_win.go
@@ -1,5 +1,4 @@
 //go:build windows
-// +build windows
 
 package externalcmd
 
diff --git a/internal/logger/syslog_unix.go b/internal/logger/syslog_unix.go
index 98121e88..5d4b1860 100644
--- a/internal/logger/syslog_unix.go
+++ b/internal/logger/syslog_unix.go
@@ -1,5 +1,4 @@
 //go:build !windows
-// +build !windows
 
 package logger
 
diff --git a/internal/logger/syslog_win.go b/internal/logger/syslog_win.go
index 85f5c6ee..380a84d5 100644
--- a/internal/logger/syslog_win.go
+++ b/internal/logger/syslog_win.go
@@ -1,5 +1,4 @@
 //go:build windows
-// +build windows
 
 package logger
 
diff --git a/internal/rlimit/rlimit_unix.go b/internal/rlimit/rlimit_unix.go
index 58d15174..b572a07a 100644
--- a/internal/rlimit/rlimit_unix.go
+++ b/internal/rlimit/rlimit_unix.go
@@ -1,5 +1,4 @@
 //go:build !windows
-// +build !windows
 
 // Package rlimit contains a function to raise rlimit.
 package rlimit
diff --git a/internal/rlimit/rlimit_win.go b/internal/rlimit/rlimit_win.go
index 4d1e295d..a3510e6c 100644
--- a/internal/rlimit/rlimit_win.go
+++ b/internal/rlimit/rlimit_win.go
@@ -1,5 +1,4 @@
 //go:build windows
-// +build windows
 
 package rlimit
 
diff --git a/internal/staticsources/rpicamera/camera.go b/internal/staticsources/rpicamera/camera.go
index f889f858..15b35a99 100644
--- a/internal/staticsources/rpicamera/camera.go
+++ b/internal/staticsources/rpicamera/camera.go
@@ -1,5 +1,4 @@
 //go:build (linux && arm) || (linux && arm64)
-// +build linux,arm linux,arm64
 
 package rpicamera
 
diff --git a/internal/staticsources/rpicamera/camera_disabled.go b/internal/staticsources/rpicamera/camera_disabled.go
index 60a726e2..ccfc5a63 100644
--- a/internal/staticsources/rpicamera/camera_disabled.go
+++ b/internal/staticsources/rpicamera/camera_disabled.go
@@ -1,5 +1,4 @@
 //go:build !linux || (!arm && !arm64)
-// +build !linux !arm,!arm64
 
 package rpicamera
 
diff --git a/internal/staticsources/rpicamera/component.go b/internal/staticsources/rpicamera/component.go
index 3bbf6809..c4036390 100644
--- a/internal/staticsources/rpicamera/component.go
+++ b/internal/staticsources/rpicamera/component.go
@@ -1,5 +1,4 @@
 //go:build (linux && arm) || (linux && arm64)
-// +build linux,arm linux,arm64
 
 package rpicamera
 
diff --git a/internal/staticsources/rpicamera/component_32.go b/internal/staticsources/rpicamera/component_32.go
index d91cce1c..b7d19f11 100644
--- a/internal/staticsources/rpicamera/component_32.go
+++ b/internal/staticsources/rpicamera/component_32.go
@@ -1,5 +1,4 @@
 //go:build linux && arm
-// +build linux,arm
 
 package rpicamera
 
diff --git a/internal/staticsources/rpicamera/component_64.go b/internal/staticsources/rpicamera/component_64.go
index cdc924dd..690bf567 100644
--- a/internal/staticsources/rpicamera/component_64.go
+++ b/internal/staticsources/rpicamera/component_64.go
@@ -1,5 +1,4 @@
 //go:build linux && arm64
-// +build linux,arm64
 
 package rpicamera
 
diff --git a/internal/staticsources/rpicamera/params_serialize.go b/internal/staticsources/rpicamera/params_serialize.go
index 1234fdbb..d9e023b1 100644
--- a/internal/staticsources/rpicamera/params_serialize.go
+++ b/internal/staticsources/rpicamera/params_serialize.go
@@ -1,5 +1,4 @@
 //go:build (linux && arm) || (linux && arm64)
-// +build linux,arm linux,arm64
 
 package rpicamera
 
diff --git a/internal/staticsources/rpicamera/pipe.go b/internal/staticsources/rpicamera/pipe.go
index 926ad77c..44eb3bf1 100644
--- a/internal/staticsources/rpicamera/pipe.go
+++ b/internal/staticsources/rpicamera/pipe.go
@@ -1,5 +1,4 @@
 //go:build (linux && arm) || (linux && arm64)
-// +build linux,arm linux,arm64
 
 package rpicamera
 
diff --git a/internal/testhighlevel/build_images_test.go b/internal/testhighlevel/build_images_test.go
index 7d24e4b1..f8e1cafe 100644
--- a/internal/testhighlevel/build_images_test.go
+++ b/internal/testhighlevel/build_images_test.go
@@ -1,5 +1,4 @@
 //go:build enable_highlevel_tests
-// +build enable_highlevel_tests
 
 package testhighlevel
 
diff --git a/internal/testhighlevel/hls_manager_test.go b/internal/testhighlevel/hls_manager_test.go
index b0cc8c19..402735a1 100644
--- a/internal/testhighlevel/hls_manager_test.go
+++ b/internal/testhighlevel/hls_manager_test.go
@@ -1,5 +1,4 @@
 //go:build enable_highlevel_tests
-// +build enable_highlevel_tests
 
 package testhighlevel
 
diff --git a/internal/testhighlevel/rtsp_server_test.go b/internal/testhighlevel/rtsp_server_test.go
index 48bd9f7b..e62bf404 100644
--- a/internal/testhighlevel/rtsp_server_test.go
+++ b/internal/testhighlevel/rtsp_server_test.go
@@ -1,5 +1,4 @@
 //go:build enable_highlevel_tests
-// +build enable_highlevel_tests
 
 package testhighlevel
 
diff --git a/internal/testhighlevel/tests_test.go b/internal/testhighlevel/tests_test.go
index b72d88d4..0ed216da 100644
--- a/internal/testhighlevel/tests_test.go
+++ b/internal/testhighlevel/tests_test.go
@@ -1,5 +1,4 @@
 //go:build enable_highlevel_tests
-// +build enable_highlevel_tests
 
 package testhighlevel