diff --git a/compat/armon.go b/compat/armon.go
index 5529976..659c245 100644
--- a/compat/armon.go
+++ b/compat/armon.go
@@ -2,7 +2,6 @@
 // SPDX-License-Identifier: MIT
 
 //go:build armonmetrics || ignore || !hashicorpmetrics
-// +build armonmetrics ignore !hashicorpmetrics
 
 package metrics
 
diff --git a/compat/circonus/armon.go b/compat/circonus/armon.go
index ece2ba4..d1170db 100644
--- a/compat/circonus/armon.go
+++ b/compat/circonus/armon.go
@@ -2,7 +2,6 @@
 // SPDX-License-Identifier: MIT
 
 //go:build armonmetrics || ignore || !hashicorpmetrics
-// +build armonmetrics ignore !hashicorpmetrics
 
 package circonus
 
diff --git a/compat/circonus/hashicorp.go b/compat/circonus/hashicorp.go
index b32ee89..9abf5cc 100644
--- a/compat/circonus/hashicorp.go
+++ b/compat/circonus/hashicorp.go
@@ -2,7 +2,6 @@
 // SPDX-License-Identifier: MIT
 
 //go:build hashicorpmetrics
-// +build hashicorpmetrics
 
 package circonus
 
diff --git a/compat/datadog/armon.go b/compat/datadog/armon.go
index a9e7f5c..ce8de5a 100644
--- a/compat/datadog/armon.go
+++ b/compat/datadog/armon.go
@@ -2,7 +2,6 @@
 // SPDX-License-Identifier: MIT
 
 //go:build armonmetrics || ignore || !hashicorpmetrics
-// +build armonmetrics ignore !hashicorpmetrics
 
 package datadog
 
diff --git a/compat/datadog/hashicorp.go b/compat/datadog/hashicorp.go
index c54c1d5..0a6f362 100644
--- a/compat/datadog/hashicorp.go
+++ b/compat/datadog/hashicorp.go
@@ -2,7 +2,6 @@
 // SPDX-License-Identifier: MIT
 
 //go:build hashicorpmetrics
-// +build hashicorpmetrics
 
 package datadog
 
diff --git a/compat/hashicorp.go b/compat/hashicorp.go
index b0574a0..244b991 100644
--- a/compat/hashicorp.go
+++ b/compat/hashicorp.go
@@ -2,7 +2,6 @@
 // SPDX-License-Identifier: MIT
 
 //go:build hashicorpmetrics
-// +build hashicorpmetrics
 
 package metrics
 
diff --git a/compat/prometheus/armon.go b/compat/prometheus/armon.go
index f5e3e7e..7ddffc2 100644
--- a/compat/prometheus/armon.go
+++ b/compat/prometheus/armon.go
@@ -2,7 +2,6 @@
 // SPDX-License-Identifier: MIT
 
 //go:build armonmetrics || ignore || !hashicorpmetrics
-// +build armonmetrics ignore !hashicorpmetrics
 
 package prometheus
 
diff --git a/compat/prometheus/hashicorp.go b/compat/prometheus/hashicorp.go
index e12dd4b..a000780 100644
--- a/compat/prometheus/hashicorp.go
+++ b/compat/prometheus/hashicorp.go
@@ -2,7 +2,6 @@
 // SPDX-License-Identifier: MIT
 
 //go:build hashicorpmetrics
-// +build hashicorpmetrics
 
 package prometheus
 
diff --git a/const_unix.go b/const_unix.go
index 6df46d2..b75a883 100644
--- a/const_unix.go
+++ b/const_unix.go
@@ -2,7 +2,6 @@
 // SPDX-License-Identifier: MIT
 
 //go:build !windows && !js
-// +build !windows,!js
 
 package metrics
 
diff --git a/const_windows.go b/const_windows.go
index 11cb785..cf92dcd 100644
--- a/const_windows.go
+++ b/const_windows.go
@@ -1,7 +1,7 @@
 // Copyright (c) HashiCorp, Inc.
 // SPDX-License-Identifier: MIT
 
-// +build windows
+//go:build windows
 
 package metrics
 
diff --git a/prometheus/prometheus.go b/prometheus/prometheus.go
index 0a897c1..2080e1a 100644
--- a/prometheus/prometheus.go
+++ b/prometheus/prometheus.go
@@ -2,7 +2,6 @@
 // SPDX-License-Identifier: MIT
 
 //go:build go1.9
-// +build go1.9
 
 package prometheus