diff --git a/CMakeLists.txt b/CMakeLists.txt
index 7721ff83..2e8a6ccb 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -107,6 +107,7 @@ if(APPLE)
         set(YAML_CPP_LIBRARY_DIR ${HOMEBREW_PREFIX}/lib)
     endif(PKG_CONFIG_FOUND)
 elseif(MSVC)
+    find_package(yaml-cpp REQUIRED)
     set(YAML_CPP_LIBRARIES "yaml-cpp")
 else()
     find_package(yaml-cpp REQUIRED)
diff --git a/cmake/LLVMSetup.cmake b/cmake/LLVMSetup.cmake
index 26a96025..077fd7c5 100644
--- a/cmake/LLVMSetup.cmake
+++ b/cmake/LLVMSetup.cmake
@@ -81,6 +81,11 @@ else(LINK_LLVM_SHARED)
     if(${LLVM_PACKAGE_VERSION} VERSION_GREATER_EQUAL "16.0")
         list(APPEND LIBTOOLING_LIBS clangASTMatchers)
     endif()
+    if(MSVC)
+        if(${LLVM_PACKAGE_VERSION} VERSION_GREATER_EQUAL "18.1")
+            list(APPEND LIBTOOLING_LIBS clangAPINotes)
+        endif()
+    endif(MSVC)
 endif(LINK_LLVM_SHARED)
 
 if("${LIBTOOLING_LIBS}" STREQUAL "")