diff --git a/BaseLib/CMakeLists.txt b/BaseLib/CMakeLists.txt
index d6b0f56d76a6d7d81d6ffcfe6fad7f1335e3c16d..1ac8d1f646e6de27cb4cb38969ffefa2786eb58d 100644
--- a/BaseLib/CMakeLists.txt
+++ b/BaseLib/CMakeLists.txt
@@ -13,6 +13,7 @@ target_link_libraries(
     PUBLIC Boost::boost
            spdlog::spdlog
            std::filesystem
+           tclap
            $<$<BOOL:${MSVC}>:WinMM> # needed for timeGetTime
            $<$<BOOL:${OGS_BUILD_GUI}>:Qt5::Xml>
            $<$<BOOL:${OGS_BUILD_GUI}>:Qt5::XmlPatterns>
diff --git a/BaseLib/DynamicSpan.h b/BaseLib/DynamicSpan.h
index 1a68801963c5550a665e646646ad385ab645f95b..139495c3e66fe57a3e7a74d82c4c2819f7eb8161 100644
--- a/BaseLib/DynamicSpan.h
+++ b/BaseLib/DynamicSpan.h
@@ -7,6 +7,8 @@
  *              http://www.opengeosys.org/project/license
  */
 
+#include <cstddef>
+
 namespace BaseLib
 {
 template <typename T>
diff --git a/scripts/cmake/Dependencies.cmake b/scripts/cmake/Dependencies.cmake
index 3317f39b7526020242b91941dcfd200610c19788..98a5dbf610635c321c5edd4eeaa3c308e2374536 100644
--- a/scripts/cmake/Dependencies.cmake
+++ b/scripts/cmake/Dependencies.cmake
@@ -150,6 +150,8 @@ CPMFindPackage(
 if(Boost_ADDED)
     add_library(Boost::boost INTERFACE IMPORTED)
     target_include_directories(Boost::boost INTERFACE "${Boost_SOURCE_DIR}")
+else()
+    target_include_directories(Boost::boost INTERFACE "${Boost_INCLUDE_DIR}")
 endif()
 
 CPMFindPackage(