diff --git a/make/autoconf/libraries.m4 b/make/autoconf/libraries.m4
index 5daacdc1ced..99851bfd376 100644
--- a/make/autoconf/libraries.m4
+++ b/make/autoconf/libraries.m4
@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2011, 2025, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2011, 2026, Oracle and/or its affiliates. All rights reserved.
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 #
 # This code is free software; you can redistribute it and/or modify it
@@ -149,7 +149,7 @@ AC_DEFUN_ONCE([LIB_SETUP_LIBRARIES],
   if test "x$OPENJDK_TARGET_OS" = xwindows; then
     BASIC_JVM_LIBS="$BASIC_JVM_LIBS kernel32.lib user32.lib gdi32.lib winspool.lib \
         comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib powrprof.lib uuid.lib \
-        ws2_32.lib winmm.lib version.lib psapi.lib"
+        ws2_32.lib winmm.lib version.lib"
   fi
   LIB_SETUP_JVM_LIBS(BUILD)
   LIB_SETUP_JVM_LIBS(TARGET)
diff --git a/make/modules/java.management/Lib.gmk b/make/modules/java.management/Lib.gmk
index 89c99266fcc..cdc70c773fc 100644
--- a/make/modules/java.management/Lib.gmk
+++ b/make/modules/java.management/Lib.gmk
@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2011, 2025, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2011, 2026, Oracle and/or its affiliates. All rights reserved.
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 #
 # This code is free software; you can redistribute it and/or modify it
@@ -36,7 +36,7 @@ $(eval $(call SetupJdkLibrary, BUILD_LIBMANAGEMENT, \
     OPTIMIZATION := HIGH, \
     JDK_LIBS := java.base:libjava java.base:libjvm, \
     LIBS_aix := -lperfstat, \
-    LIBS_windows := advapi32.lib psapi.lib, \
+    LIBS_windows := advapi32.lib, \
 ))
 
 TARGETS += $(BUILD_LIBMANAGEMENT)
diff --git a/make/modules/jdk.attach/Lib.gmk b/make/modules/jdk.attach/Lib.gmk
index 78437d761d2..92fb58d7317 100644
--- a/make/modules/jdk.attach/Lib.gmk
+++ b/make/modules/jdk.attach/Lib.gmk
@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2011, 2025, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2011, 2026, Oracle and/or its affiliates. All rights reserved.
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 #
 # This code is free software; you can redistribute it and/or modify it
@@ -31,20 +31,12 @@ include LibCommon.gmk
 ## Build libattach
 ################################################################################
 
-ifeq ($(call isTargetOs, windows), true)
-  # In (at least) VS2013 and later, -DPSAPI_VERSION=1 is needed to generate
-  # a binary that is compatible with windows versions older than 7/2008R2.
-  # See MSDN documentation for GetProcessMemoryInfo for more information.
-  LIBATTACH_CFLAGS := -DPSAPI_VERSION=1
-endif
-
 $(eval $(call SetupJdkLibrary, BUILD_LIBATTACH, \
     NAME := attach, \
     OPTIMIZATION := LOW, \
-    CFLAGS := $(LIBATTACH_CFLAGS), \
     CFLAGS_windows := -Gy, \
     JDK_LIBS := java.base:libjava, \
-    LIBS_windows := advapi32.lib psapi.lib, \
+    LIBS_windows := advapi32.lib, \
 ))
 
 TARGETS += $(BUILD_LIBATTACH)
diff --git a/make/modules/jdk.management/Lib.gmk b/make/modules/jdk.management/Lib.gmk
index f65348e9381..927c2c3529f 100644
--- a/make/modules/jdk.management/Lib.gmk
+++ b/make/modules/jdk.management/Lib.gmk
@@ -31,21 +31,13 @@ include LibCommon.gmk
 ## Build libmanagement_ext
 ################################################################################
 
-ifeq ($(call isTargetOs, windows), true)
-  # In (at least) VS2013 and later, -DPSAPI_VERSION=1 is needed to generate
-  # a binary that is compatible with windows versions older than 7/2008R2.
-  # See MSDN documentation for GetProcessMemoryInfo for more information.
-  LIBMANAGEMENT_EXT_CFLAGS := -DPSAPI_VERSION=1
-endif
-
 $(eval $(call SetupJdkLibrary, BUILD_LIBMANAGEMENT_EXT, \
     NAME := management_ext, \
     OPTIMIZATION := HIGH, \
     DISABLED_WARNINGS_clang_UnixOperatingSystem.c := format-nonliteral, \
-    CFLAGS := $(LIBMANAGEMENT_EXT_CFLAGS), \
     JDK_LIBS := java.base:libjava java.base:libjvm, \
     LIBS_aix := -lperfstat, \
-    LIBS_windows := advapi32.lib psapi.lib, \
+    LIBS_windows := advapi32.lib, \
 ))
 
 TARGETS += $(BUILD_LIBMANAGEMENT_EXT)