--- a/ipc/chromium/chromium-config.mozbuild
+++ b/ipc/chromium/chromium-config.mozbuild
@@ -7,17 +7,16 @@
 LOCAL_INCLUDES += [
     '!/ipc/ipdl/_ipdlheaders',
     '/ipc/chromium/src',
     '/ipc/glue',
 ]
 
 if CONFIG['OS_ARCH'] == 'WINNT':
     OS_LIBS += [
-        'psapi',
         'shell32',
         'dbghelp',
     ]
 
     DEFINES.update({
         'UNICODE': True,
         '_UNICODE': True,
         '_CRT_RAND_S': True,

--- a/js/src/build.rs
+++ b/js/src/build.rs
@@ -35,17 +35,16 @@ fn main() {
         .status()
         .expect("Should spawn autospider OK");
     assert!(result.success(), "autospider should exit OK");
 
     println!("cargo:rustc-link-search=native={}/js/src", out_dir);
 
     if target.contains("windows") {
         println!("cargo:rustc-link-lib=winmm");
-        println!("cargo:rustc-link-lib=psapi");
         if target.contains("gnu") {
             println!("cargo:rustc-link-lib=stdc++");
         }
     } else {
         println!("cargo:rustc-link-lib=stdc++");
     }
 
     println!("cargo:rustc-link-lib=static=js_static");

--- a/js/src/old-configure.in
+++ b/js/src/old-configure.in
@@ -654,17 +654,17 @@ case "$target" in
         MKSHLIB='$(CXX) $(DSO_LDOPTS) -o $@'
         MKCSHLIB='$(CC) $(DSO_LDOPTS) -o $@'
         RC='$(WINDRES)'
         # Use static libgcc and libstdc++
         LDFLAGS="$LDFLAGS -static"
         # Use temp file for windres (bug 213281)
         RCFLAGS='-O coff --use-temp-file'
         # mingw doesn't require kernel32, user32, and advapi32 explicitly
-        LIBS="$LIBS -lgdi32 -lwinmm -lwsock32 -lpsapi"
+        LIBS="$LIBS -lgdi32 -lwinmm -lwsock32"
         MOZ_FIX_LINK_PATHS=
         DLL_PREFIX=
         IMPORT_LIB_SUFFIX=a
 
         WIN32_CONSOLE_EXE_LDFLAGS=-mconsole
         WIN32_GUI_EXE_LDFLAGS=-mwindows
     else
         TARGET_COMPILER_ABI=msvc
@@ -784,17 +784,17 @@ case "$target" in
             CXXFLAGS="$CXXFLAGS -Wno-unused-local-typedef"
             # jemalloc uses __declspec(allocator) as a profiler hint,
             # which clang-cl doesn't understand.
             CXXFLAGS="$CXXFLAGS -Wno-ignored-attributes"
         fi
         # make 'foo == bar;' error out
         CFLAGS="$CFLAGS -we4553"
         CXXFLAGS="$CXXFLAGS -we4553"
-        LIBS="$LIBS kernel32.lib user32.lib gdi32.lib winmm.lib wsock32.lib advapi32.lib psapi.lib"
+        LIBS="$LIBS kernel32.lib user32.lib gdi32.lib winmm.lib wsock32.lib advapi32.lib"
         MOZ_DEBUG_LDFLAGS='-DEBUG -DEBUGTYPE:CV'
         WARNINGS_AS_ERRORS='-WX'
         MOZ_OPTIMIZE_FLAGS="-O2"
         MOZ_FIX_LINK_PATHS=
         LDFLAGS="$LDFLAGS -LARGEADDRESSAWARE -NXCOMPAT"
         if test -z "$DEVELOPER_OPTIONS"; then
             LDFLAGS="$LDFLAGS -RELEASE"
         fi

--- a/media/webrtc/trunk/build/common.gypi
+++ b/media/webrtc/trunk/build/common.gypi
@@ -3322,17 +3322,16 @@
       },  # target_defaults
     }],  # OS=="ios"
     ['OS=="win"', {
       'target_defaults': {
         'defines': [
           'WIN32',
           '_WINDOWS',
           'NOMINMAX',
-          'PSAPI_VERSION=1',
           '_CRT_RAND_S',
           'CERT_CHAIN_PARA_HAS_EXTRA_FIELDS',
           'WIN32_LEAN_AND_MEAN',
           '_ATL_NO_OPENGL',
         ],
         'conditions': [
           ['build_with_mozilla==0', {
               'defines': [
@@ -3450,17 +3449,16 @@
           'VCLinkerTool': {
             'AdditionalDependencies': [
               'wininet.lib',
               'dnsapi.lib',
               'version.lib',
               'msimg32.lib',
               'ws2_32.lib',
               'usp10.lib',
-              'psapi.lib',
               'dbghelp.lib',
               'winmm.lib',
               'shlwapi.lib',
             ],
 
             'conditions': [
               ['msvs_express', {
                 # Explicitly required when using the ATL with express

--- a/toolkit/library/moz.build
+++ b/toolkit/library/moz.build
@@ -22,17 +22,16 @@ def Libxul(name):
         GeckoSharedLibrary(name, linkage=None)
         SHARED_LIBRARY_NAME = 'xul'
 
     DELAYLOAD_DLLS += [
         'comdlg32.dll',
         'dbghelp.dll',
         'netapi32.dll',
         'PowrProf.dll',
-        'psapi.dll',
         'rasapi32.dll',
         'rasdlg.dll',
         'secur32.dll',
         'wininet.dll',
         'winspool.drv'
     ]
 
     if CONFIG['ACCESSIBILITY']:
@@ -338,17 +337,16 @@ if CONFIG['OS_ARCH'] == 'WINNT':
         'ole32',
         'version',
         'winspool',
         'comdlg32',
         'imm32',
         'msimg32',
         'netapi32',
         'shlwapi',
-        'psapi',
         'ws2_32',
         'dbghelp',
         'rasapi32',
         'rasdlg',
         'iphlpapi',
         'uxtheme',
         'setupapi',
         'secur32',