Fails to build with LLVM/Clang 16.0.2

I'm updating llvm projects in pkgsrc to build with llvm 16.0.2 Using clang + llvm 16.0.2 with the following diff:

--- generator/CMakeLists.txt.orig       2023-05-12 08:37:40.641030643 +0200
+++ generator/CMakeLists.txt    2023-05-12 08:40:22.165272119 +0200
@@ -37,7 +37,7 @@
 endif()

 install(TARGETS codebrowser_generator RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR})
-target_include_directories(codebrowser_generator SYSTEM PUBLIC ${CLANG_INCLUDE_DIRS})
+target_include_directories(codebrowser_generator SYSTEM PUBLIC ${LLVM_INCLUDE_DIRS} ${CLANG_INCLUDE_DIRS})
 set_property(TARGET codebrowser_generator PROPERTY CXX_STANDARD 14)

and

CMAKE_ARGS+=    -DLLVM_CONFIG_EXECUTABLE=${LLVM_CONFIG_PATH:Q}
CMAKE_ARGS+=    -DCMAKE_BUILD_TYPE=Release
CMAKE_ARGS+=    -DCLANG_BUILTIN_HEADERS_DIR=${BUILDLINK_PREFIX.clang}/lib/clang/16/include

where BUILDLINK_PREFIX.clang is resolving to the location of the clang prefix, codebrowser fails to build. Buildlog attached.

build.log

KDAB / codebrowser

Fails to build with LLVM/Clang 16.0.2 #112