diff --git a/internal/glfw/callback_notwindows.go b/internal/glfw/callback_cglfw.go
similarity index 100%
rename from internal/glfw/callback_notwindows.go
rename to internal/glfw/callback_cglfw.go
diff --git a/internal/glfw/callback_windows.go b/internal/glfw/callback_goglfw.go
similarity index 99%
rename from internal/glfw/callback_windows.go
rename to internal/glfw/callback_goglfw.go
index eb4afb420..da22e931e 100644
--- a/internal/glfw/callback_windows.go
+++ b/internal/glfw/callback_goglfw.go
@@ -12,6 +12,8 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
+//go:build windows
+
 package glfw
 
 import (
diff --git a/internal/glfw/glfw_notwindows.go b/internal/glfw/glfw_cglfw.go
similarity index 100%
rename from internal/glfw/glfw_notwindows.go
rename to internal/glfw/glfw_cglfw.go
diff --git a/internal/glfw/glfw_windows.go b/internal/glfw/glfw_goglfw.go
similarity index 99%
rename from internal/glfw/glfw_windows.go
rename to internal/glfw/glfw_goglfw.go
index 256d73ae1..528c742a4 100644
--- a/internal/glfw/glfw_windows.go
+++ b/internal/glfw/glfw_goglfw.go
@@ -12,6 +12,8 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
+//go:build windows
+
 package glfw
 
 import (
diff --git a/internal/glfw/type_notwindows.go b/internal/glfw/type_cglfw.go
similarity index 100%
rename from internal/glfw/type_notwindows.go
rename to internal/glfw/type_cglfw.go
diff --git a/internal/glfw/type_windows.go b/internal/glfw/type_goglfw.go
similarity index 98%
rename from internal/glfw/type_windows.go
rename to internal/glfw/type_goglfw.go
index cba83e140..d7c84ebf0 100644
--- a/internal/glfw/type_windows.go
+++ b/internal/glfw/type_goglfw.go
@@ -12,6 +12,8 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
+//go:build windows
+
 package glfw
 
 import (