diff --git a/windows/aliases.go b/windows/aliases.go
index af3af60d..a20ebea6 100644
--- a/windows/aliases.go
+++ b/windows/aliases.go
@@ -2,8 +2,8 @@
 // Use of this source code is governed by a BSD-style
 // license that can be found in the LICENSE file.
 
-// +build windows
-// +build go1.9
+//go:build windows && go1.9
+// +build windows,go1.9
 
 package windows
 
diff --git a/windows/eventlog.go b/windows/eventlog.go
index 40af946e..2cd60645 100644
--- a/windows/eventlog.go
+++ b/windows/eventlog.go
@@ -2,6 +2,7 @@
 // Use of this source code is governed by a BSD-style
 // license that can be found in the LICENSE file.
 
+//go:build windows
 // +build windows
 
 package windows
diff --git a/windows/mksyscall.go b/windows/mksyscall.go
index 328e3b2a..61029109 100644
--- a/windows/mksyscall.go
+++ b/windows/mksyscall.go
@@ -2,6 +2,7 @@
 // Use of this source code is governed by a BSD-style
 // license that can be found in the LICENSE file.
 
+//go:build generate
 // +build generate
 
 package windows
diff --git a/windows/race.go b/windows/race.go
index a74e3e24..9196b089 100644
--- a/windows/race.go
+++ b/windows/race.go
@@ -2,6 +2,7 @@
 // Use of this source code is governed by a BSD-style
 // license that can be found in the LICENSE file.
 
+//go:build windows && race
 // +build windows,race
 
 package windows
diff --git a/windows/race0.go b/windows/race0.go
index e44a3cbf..7bae4817 100644
--- a/windows/race0.go
+++ b/windows/race0.go
@@ -2,6 +2,7 @@
 // Use of this source code is governed by a BSD-style
 // license that can be found in the LICENSE file.
 
+//go:build windows && !race
 // +build windows,!race
 
 package windows
diff --git a/windows/service.go b/windows/service.go
index 1a22b3e8..5b28ae16 100644
--- a/windows/service.go
+++ b/windows/service.go
@@ -2,6 +2,7 @@
 // Use of this source code is governed by a BSD-style
 // license that can be found in the LICENSE file.
 
+//go:build windows
 // +build windows
 
 package windows
diff --git a/windows/str.go b/windows/str.go
index 917cc2aa..4fc01434 100644
--- a/windows/str.go
+++ b/windows/str.go
@@ -2,6 +2,7 @@
 // Use of this source code is governed by a BSD-style
 // license that can be found in the LICENSE file.
 
+//go:build windows
 // +build windows
 
 package windows
diff --git a/windows/syscall.go b/windows/syscall.go
index 6122f557..72074d58 100644
--- a/windows/syscall.go
+++ b/windows/syscall.go
@@ -2,6 +2,7 @@
 // Use of this source code is governed by a BSD-style
 // license that can be found in the LICENSE file.
 
+//go:build windows
 // +build windows
 
 // Package windows contains an interface to the low-level operating system
diff --git a/windows/syscall_test.go b/windows/syscall_test.go
index af3ff32d..fd4a0156 100644
--- a/windows/syscall_test.go
+++ b/windows/syscall_test.go
@@ -2,6 +2,7 @@
 // Use of this source code is governed by a BSD-style
 // license that can be found in the LICENSE file.
 
+//go:build windows
 // +build windows
 
 package windows_test