diff --git a/.github/workflows/macos-scan-build.yml b/.github/workflows/macos-scan-build.yml
index f4cbcb7a..d22884c4 100644
--- a/.github/workflows/macos-scan-build.yml
+++ b/.github/workflows/macos-scan-build.yml
@@ -20,6 +20,10 @@ jobs:
       with:
         egress-policy: audit
 
+    - uses: maxim-lobanov/setup-xcode@v1
+      with:
+        xcode-version: '14.3.1'
+
     - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
       with:
         submodules: recursive
diff --git a/.github/workflows/macosx_build.yml b/.github/workflows/macosx_build.yml
index 623c08d7..24d8e4c7 100644
--- a/.github/workflows/macosx_build.yml
+++ b/.github/workflows/macosx_build.yml
@@ -20,6 +20,10 @@ jobs:
       with:
         egress-policy: audit
 
+    - uses: maxim-lobanov/setup-xcode@v1
+      with:
+        xcode-version: '14.3.1'
+
     - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
       with:
         submodules: recursive
diff --git a/appveyor.yml b/appveyor.yml
index aa1dd482..64fb18f4 100644
--- a/appveyor.yml
+++ b/appveyor.yml
@@ -6,6 +6,8 @@ configuration: Release
 platform: x64
 before_build:
 - cmd: >-
+    nuget restore src\WinMSRDriver\MSR.vcxproj
+
     cmake --version
 
     cmake -B build
@@ -13,9 +15,11 @@ before_build:
 
 build_script:
 - cmake --build build --config Release --parallel
+- msbuild src\WinMSRDriver\MSR.vcxproj /m /t:Build /p:Configuration=Release /p:Platform=x64
 
 after_build:
-- cmd: 7z a pcm-all.zip %APPVEYOR_BUILD_FOLDER%\build\bin\Release\*.exe %APPVEYOR_BUILD_FOLDER%\build\bin\Release\*.dll %APPVEYOR_BUILD_FOLDER%\build\src\Release\*.lib %APPVEYOR_BUILD_FOLDER%\build\src\Release\*.exp %APPVEYOR_BUILD_FOLDER%\src\windows\PCM-Service.exe.config
+- cmd: 7z a pcm-all.zip %APPVEYOR_BUILD_FOLDER%\build\bin\Release\*.exe %APPVEYOR_BUILD_FOLDER%\build\bin\Release\*.dll %APPVEYOR_BUILD_FOLDER%\build\src\Release\*.lib %APPVEYOR_BUILD_FOLDER%\build\src\Release\*.exp %APPVEYOR_BUILD_FOLDER%\src\windows\PCM-Service.exe.config %APPVEYOR_BUILD_FOLDER%\src\WinMSRDriver\x64\Release\MSR\msr.*
 artifacts:
 - path: pcm-all.zip
   name: pcm-all
+
diff --git a/src/MacMSRDriver/PcmMsr/CMakeLists.txt b/src/MacMSRDriver/PcmMsr/CMakeLists.txt
index f0434b33..c76cf4e3 100644
--- a/src/MacMSRDriver/PcmMsr/CMakeLists.txt
+++ b/src/MacMSRDriver/PcmMsr/CMakeLists.txt
@@ -15,6 +15,8 @@ set_target_properties(PcmMsrDriver PROPERTIES BUNDLE_EXTENSION kext MACOSX_BUNDL
 target_include_directories(PcmMsrDriver PRIVATE
         ${CMAKE_OSX_SYSROOT}/System/Library/Frameworks/Kernel.framework/PrivateHeaders
         ${CMAKE_OSX_SYSROOT}/System/Library/Frameworks/Kernel.framework/Headers
+        ${CMAKE_OSX_SYSROOT}/System/Library/Frameworks/Kernel.framework/Versions/A/Headers
+        /Applications/Xcode_15.2.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX.sdk/System/Library/Frameworks/IOKit.framework/Headers
 )
 target_compile_definitions(PcmMsrDriver PRIVATE
         -DKERNEL