diff --git a/tun/wintun/setupapi/types_windows_386.go b/tun/wintun/setupapi/types32_windows.go
similarity index 91%
rename from tun/wintun/setupapi/types_windows_386.go
rename to tun/wintun/setupapi/types32_windows.go
index 132f921..bacde58 100644
--- a/tun/wintun/setupapi/types_windows_386.go
+++ b/tun/wintun/setupapi/types32_windows.go
@@ -1,3 +1,5 @@
+// +build 386 arm
+
 /* SPDX-License-Identifier: MIT
  *
  * Copyright (C) 2019 WireGuard LLC. All Rights Reserved.
diff --git a/tun/wintun/setupapi/types_windows_amd64.go b/tun/wintun/setupapi/types64_windows.go
similarity index 90%
rename from tun/wintun/setupapi/types_windows_amd64.go
rename to tun/wintun/setupapi/types64_windows.go
index d4dd65c..d5c8b37 100644
--- a/tun/wintun/setupapi/types_windows_amd64.go
+++ b/tun/wintun/setupapi/types64_windows.go
@@ -1,3 +1,5 @@
+// +build amd64 arm64
+
 /* SPDX-License-Identifier: MIT
  *
  * Copyright (C) 2019 WireGuard LLC. All Rights Reserved.