diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 03916a31..6c05127c 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -19,12 +19,12 @@ jobs:
       matrix:
         config:
           - { name: 'Windows MSVC x86', os: windows-latest, compiler: msvc, arch: x86 }
-#          - { name: 'Windows MSVC x86_64', os: windows-latest, compiler: msvc, arch: x86_64 }
-#          - { name: 'Windows MinGW x86', os: ubuntu-20.04, compiler: mingw, arch: x86 }
-#          - { name: 'Windows MinGW x86_64', os: ubuntu-20.04, compiler: mingw, arch: x86_64 }
-#          - { name: 'macOS x86_64', os: macos-latest, arch: x86_64 }
-#          - { name: 'macOS ARM', os: macos-latest, arch: arm64 }
-#          - { name: 'Linux x86_64', os: ubuntu-18.04, arch: x86_64 }
+          - { name: 'Windows MSVC x86_64', os: windows-latest, compiler: msvc, arch: x86_64 }
+          - { name: 'Windows MinGW x86', os: ubuntu-20.04, compiler: mingw, arch: x86 }
+          - { name: 'Windows MinGW x86_64', os: ubuntu-20.04, compiler: mingw, arch: x86_64 }
+          - { name: 'macOS x86_64', os: macos-latest, arch: x86_64 }
+          - { name: 'macOS ARM', os: macos-latest, arch: arm64 }
+          - { name: 'Linux x86_64', os: ubuntu-18.04, arch: x86_64 }
           #- { name: 'Linux ARM', os: ubuntu-18.04, arch: armhf }
       fail-fast: true
 
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 224945fc..9e17adaf 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -622,7 +622,7 @@ src/gui/volMeter.cpp
 src/gui/gui.cpp
 )
 
-if (WIN32 AND CMAKE_SIZEOF_VOID_P EQUAL 8)
+if (WIN32 AND (MSVC OR CMAKE_SIZEOF_VOID_P EQUAL 8))
   list(APPEND GUI_SOURCES extern/nfd-modified/src/nfd_common.cpp)
   list(APPEND GUI_SOURCES extern/nfd-modified/src/nfd_win.cpp)
 endif()
@@ -707,8 +707,8 @@ if (WIN32)
     list(APPEND DEPENDENCIES_LIBRARIES -static)
   endif()
   # support Windows XP
-  if (CMAKE_SIZEOF_VOID_P EQUAL 4)
-    list(APPEND DEPENDENCIES_DEFINES "_WIN32_WINNT=0x0501" "PSAPI_VERSION=1")
+  if (CMAKE_SIZEOF_VOID_P EQUAL 4 AND NOT MSVC)
+    list(APPEND DEPENDENCIES_DEFINES "_WIN32_WINNT=0x0501")
   endif()
 elseif (APPLE)
   find_library(COCOA Cocoa REQUIRED)