diff --git a/src/external/BMWtools/CMakeLists.txt b/src/external/BMWtools/CMakeLists.txt
index 4326ee62..be9cdaa4 100644
--- a/src/external/BMWtools/CMakeLists.txt
+++ b/src/external/BMWtools/CMakeLists.txt
@@ -5,7 +5,10 @@ set(MUSRFIT_INC ${CMAKE_SOURCE_DIR}/src/include)
 set(CUBA_INC ${CMAKE_SOURCE_DIR}/src/external/libCuba/src)
 
 root_generate_dictionary(
-  BMWStartupHandlerDict BMWStartupHandler.h LINKDEF BMWStartupHandlerLinkDef.h
+  BMWStartupHandlerDict 
+  -I${MUSRFIT_INC}
+  BMWStartupHandler.h 
+  LINKDEF BMWStartupHandlerLinkDef.h
 )
 
 #--- create pkg-config info ---------------------------------------------------
diff --git a/src/external/libCuba/src/CMakeLists.txt b/src/external/libCuba/src/CMakeLists.txt
index 5253fda5..b29724a0 100644
--- a/src/external/libCuba/src/CMakeLists.txt
+++ b/src/external/libCuba/src/CMakeLists.txt
@@ -9,6 +9,7 @@ set(CUBA_VERSION "4.2.0")
 set(CUBA_LIBRARY_NAME "cuba")
 configure_file("cuba.pc.in" "cuba.pc" @ONLY)
 
+add_subdirectory(common)
 add_subdirectory(cuhre)
 add_subdirectory(divonne)
 add_subdirectory(suave)
@@ -16,6 +17,7 @@ add_subdirectory(vegas)
 
 #--- lib creation -------------------------------------------------------------
 add_library(cuba SHARED
+  $<TARGET_OBJECTS:workerini>
   $<TARGET_OBJECTS:cuhre>
   $<TARGET_OBJECTS:divonne>
   $<TARGET_OBJECTS:suave>
diff --git a/src/external/libCuba/src/common/CMakeLists.txt b/src/external/libCuba/src/common/CMakeLists.txt
new file mode 100644
index 00000000..b991d841
--- /dev/null
+++ b/src/external/libCuba/src/common/CMakeLists.txt
@@ -0,0 +1,23 @@
+#--- workerini ----------------------------------------------------------------
+
+#--- obj lib creation ---------------------------------------------------------
+add_library(workerini OBJECT 
+  WorkerIni.c
+)
+
+#--- make sure that the include directory is found ----------------------------
+target_include_directories(
+  workerini BEFORE PRIVATE 
+    $<BUILD_INTERFACE:${CMAKE_BINARY_DIR}>
+    $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}>
+    $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/..>
+)
+
+#--- check for pre compile flags ----------------------------------------------
+set(COMP_DEF "-DHAVE_CONFIG_H")
+set(COMP_DEF ${COMP_DEF} "-DNOUNDERSCORE")
+
+target_compile_definitions(
+  workerini PRIVATE ${COMP_DEF}
+)
+