diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml
index bd3fe9a262a60..e001c824c9e24 100644
--- a/.github/workflows/ci.yaml
+++ b/.github/workflows/ci.yaml
@@ -38,7 +38,7 @@ jobs:
     name: Clippy on ${{ matrix.os }}
     strategy:
       matrix:
-        os: [ubuntu-24.04, macos-15, windows-2022]
+        os: [ubuntu-24.04, macos-15, windows-2025]
     runs-on: ${{ matrix.os }}
     timeout-minutes: 10
     steps:
@@ -56,7 +56,7 @@ jobs:
     strategy:
       matrix:
         toolchain: [stable, nightly, 1.63.0]
-        os: [ubuntu-24.04, macos-15, windows-2022]
+        os: [ubuntu-24.04, macos-15, windows-2025]
         include:
           - toolchain: beta
             os: ubuntu-24.04
@@ -122,19 +122,19 @@ jobs:
           - target: aarch64-apple-darwin
             os: macos-15
           - target: x86_64-pc-windows-gnu
-            os: windows-2022
+            os: windows-2025
             env:
               ARCH_BITS: 64
               ARCH: x86_64
           - target: x86_64-pc-windows-msvc
-            os: windows-2022
+            os: windows-2025
           # FIXME: It currently causes segfaults.
           #- target: i686-pc-windows-gnu
           #  env:
           #    ARCH_BITS: 32
           #    ARCH: i686
           - target: i686-pc-windows-msvc
-            os: windows-2022
+            os: windows-2025
     runs-on: ${{ matrix.os }}
     timeout-minutes: 25
     env:
diff --git a/libc-test/build.rs b/libc-test/build.rs
index bb3258ac8f16b..640c9dd31664f 100644
--- a/libc-test/build.rs
+++ b/libc-test/build.rs
@@ -859,8 +859,6 @@ fn test_windows(target: &str) {
             "SIG_DFL" | "SIG_IGN" | "SIG_GET" | "SIG_SGE" | "SIG_ACK" => true,
             // FIXME(windows): newer windows-gnu environment on CI?
             "_O_OBTAIN_DIR" if gnu => true,
-            // FIXME: These constants have been changed since windows-2022 20251014.68.1:
-            "L_tmpnam" | "TMP_MAX" => true,
             _ => false,
         }
     });
diff --git a/src/windows/gnu/mod.rs b/src/windows/gnu/mod.rs
index aee2c1efed108..7ea6a933c8e85 100644
--- a/src/windows/gnu/mod.rs
+++ b/src/windows/gnu/mod.rs
@@ -18,9 +18,6 @@ cfg_if! {
     }
 }
 
-pub const L_tmpnam: c_uint = 14;
-pub const TMP_MAX: c_uint = 0x7fff;
-
 // stdio file descriptor numbers
 pub const STDIN_FILENO: c_int = 0;
 pub const STDOUT_FILENO: c_int = 1;
diff --git a/src/windows/mod.rs b/src/windows/mod.rs
index cc47bfcfe96d3..5a00b44ac73aa 100644
--- a/src/windows/mod.rs
+++ b/src/windows/mod.rs
@@ -243,6 +243,9 @@ pub const SIG_GET: crate::sighandler_t = 2;
 pub const SIG_SGE: crate::sighandler_t = 3;
 pub const SIG_ACK: crate::sighandler_t = 4;
 
+pub const L_tmpnam: c_uint = 260;
+pub const TMP_MAX: c_uint = 0x7fff_ffff;
+
 #[derive(Debug)]
 pub enum FILE {}
 impl Copy for FILE {}
diff --git a/src/windows/msvc/mod.rs b/src/windows/msvc/mod.rs
index 5b620bc6c1afa..967df8c57f8bd 100644
--- a/src/windows/msvc/mod.rs
+++ b/src/windows/msvc/mod.rs
@@ -1,8 +1,5 @@
 use crate::prelude::*;
 
-pub const L_tmpnam: c_uint = 260;
-pub const TMP_MAX: c_uint = 0x7fff_ffff;
-
 // POSIX Supplement (from errno.h)
 // This particular error code is only currently available in msvc toolchain
 pub const EOTHER: c_int = 131;