diff --git a/README.md b/README.md
index 2427d48bbf2fa31d54aa3cde138d765d7a835633..6a95f00290f98e953537effd8f11bd622b1853d6 100644
--- a/README.md
+++ b/README.md
@@ -19,7 +19,7 @@ Example install of all needed packages for ubuntu:
 ```bash
 sudo apt install gcc cmake make
 ```
-Then download Armadillo from here: [Linux](https://rwth-aachen.sciebo.de/s/igDWzLpdO5zYHBj/download?path=%2Fubuntu%2F18.06.20-armadillo-linux&files=armadillo-8.500.1-linux.zip) and set the environment variable `Armadillo_HOME` to the base dir of your installation.
+Then download Armadillo from here: [Linux](https://rwth-aachen.sciebo.de/s/igDWzLpdO5zYHBj/download?path=%2Fubuntu%2F18.10.24-armadillo-linux&files=armadillo-8.500.1-linux.zip) and set the environment variable `Armadillo_HOME` to the base dir of your installation.
 
 To check everything is installed correctly use whereis/ls:
 ```bash
diff --git a/pom.xml b/pom.xml
index 70840641cec70a38da5a8ed07588572f933dba4b..efc48e6fdd85a14e5350494450e9774f79d8f02d 100644
--- a/pom.xml
+++ b/pom.xml
@@ -9,7 +9,7 @@
 
     <groupId>de.monticore.lang.monticar</groupId>
     <artifactId>embedded-montiarc-math-middleware-generator</artifactId>
-    <version>0.0.8-SNAPSHOT</version>
+    <version>0.0.9-SNAPSHOT</version>
 
     <!-- == PROJECT DEPENDENCIES ============================================= -->
 
@@ -17,7 +17,7 @@
 
         <!-- .. SE-Libraries .................................................. -->
         <se-commons.version>1.7.7</se-commons.version>
-        <Embedded-montiarc-math-generator.version>0.0.25-SNAPSHOT</Embedded-montiarc-math-generator.version>
+        <Embedded-montiarc-math-generator.version>0.0.26-SNAPSHOT</Embedded-montiarc-math-generator.version>
         <Embedded-montiarc-math-roscpp-generator.version>0.0.4-SNAPSHOT</Embedded-montiarc-math-roscpp-generator.version>
         <Embedded-montiarc-math-rosmsg-generator.version>0.0.3-SNAPSHOT</Embedded-montiarc-math-rosmsg-generator.version>
         <EMADL.version>0.2.2-SNAPSHOT</EMADL.version>
diff --git a/src/test/resources/results/CMakeCppOnly/src/cpp/CMakeLists.txt b/src/test/resources/results/CMakeCppOnly/src/cpp/CMakeLists.txt
index 333a671087694fe488bce519aa886c5cf583a87b..e6322dad26a28e95846c7b4bc70d6a012d916035 100644
--- a/src/test/resources/results/CMakeCppOnly/src/cpp/CMakeLists.txt
+++ b/src/test/resources/results/CMakeCppOnly/src/cpp/CMakeLists.txt
@@ -16,7 +16,7 @@ set(LIBS ${LIBS} ${Armadillo_LIBRARIES})
 # create static library
 include_directories(${INCLUDE_DIRS})
 add_library(tests_a_addComp tests_a_addComp.h)
-target_include_directories(tests_a_addComp PUBLIC ${CMAKE_CURRENT_SOURCE_DIR})
+target_include_directories(tests_a_addComp PUBLIC ${CMAKE_CURRENT_SOURCE_DIR} ${INCLUDE_DIRS})
 target_link_libraries(tests_a_addComp PUBLIC ${LIBS})
 set_target_properties(tests_a_addComp PROPERTIES LINKER_LANGUAGE CXX)
 
diff --git a/src/test/resources/results/system/src/ba_system_collisionDetection/cpp/CMakeLists.txt b/src/test/resources/results/system/src/ba_system_collisionDetection/cpp/CMakeLists.txt
index bcabedb92f7249bc1f598c02232900480db25c36..0c508b6a1594ca345508faa2b4f8354a2a516e72 100644
--- a/src/test/resources/results/system/src/ba_system_collisionDetection/cpp/CMakeLists.txt
+++ b/src/test/resources/results/system/src/ba_system_collisionDetection/cpp/CMakeLists.txt
@@ -16,7 +16,7 @@ set(LIBS ${LIBS} ${Armadillo_LIBRARIES})
 # create static library
 include_directories(${INCLUDE_DIRS})
 add_library(ba_system_collisionDetection ba_system_collisionDetection.h)
-target_include_directories(ba_system_collisionDetection PUBLIC ${CMAKE_CURRENT_SOURCE_DIR})
+target_include_directories(ba_system_collisionDetection PUBLIC ${CMAKE_CURRENT_SOURCE_DIR} ${INCLUDE_DIRS})
 target_link_libraries(ba_system_collisionDetection PUBLIC ${LIBS})
 set_target_properties(ba_system_collisionDetection PROPERTIES LINKER_LANGUAGE CXX)
 
diff --git a/src/test/resources/results/system/src/ba_system_intersectionController/cpp/CMakeLists.txt b/src/test/resources/results/system/src/ba_system_intersectionController/cpp/CMakeLists.txt
index e36282db1e7bb8dc9448ecdfe4088c28280e5523..acc227c8bf4f602d02c91e5e3275a38b26d8f4f1 100644
--- a/src/test/resources/results/system/src/ba_system_intersectionController/cpp/CMakeLists.txt
+++ b/src/test/resources/results/system/src/ba_system_intersectionController/cpp/CMakeLists.txt
@@ -16,7 +16,7 @@ set(LIBS ${LIBS} ${Armadillo_LIBRARIES})
 # create static library
 include_directories(${INCLUDE_DIRS})
 add_library(ba_system_intersectionController ba_system_intersectionController.h)
-target_include_directories(ba_system_intersectionController PUBLIC ${CMAKE_CURRENT_SOURCE_DIR})
+target_include_directories(ba_system_intersectionController PUBLIC ${CMAKE_CURRENT_SOURCE_DIR} ${INCLUDE_DIRS})
 target_link_libraries(ba_system_intersectionController PUBLIC ${LIBS})
 set_target_properties(ba_system_intersectionController PROPERTIES LINKER_LANGUAGE CXX)
 
diff --git a/src/test/resources/results/system/src/ba_system_stopCommQuality_1_/cpp/CMakeLists.txt b/src/test/resources/results/system/src/ba_system_stopCommQuality_1_/cpp/CMakeLists.txt
index dd6e39ac1fb26b55d45dc0afa6aa9be7183cc416..08c1b3228927f09a05547d0254a950f73075b26f 100644
--- a/src/test/resources/results/system/src/ba_system_stopCommQuality_1_/cpp/CMakeLists.txt
+++ b/src/test/resources/results/system/src/ba_system_stopCommQuality_1_/cpp/CMakeLists.txt
@@ -16,7 +16,7 @@ set(LIBS ${LIBS} ${Armadillo_LIBRARIES})
 # create static library
 include_directories(${INCLUDE_DIRS})
 add_library(ba_system_stopCommQuality_1_ ba_system_stopCommQuality_1_.h)
-target_include_directories(ba_system_stopCommQuality_1_ PUBLIC ${CMAKE_CURRENT_SOURCE_DIR})
+target_include_directories(ba_system_stopCommQuality_1_ PUBLIC ${CMAKE_CURRENT_SOURCE_DIR} ${INCLUDE_DIRS})
 target_link_libraries(ba_system_stopCommQuality_1_ PUBLIC ${LIBS})
 set_target_properties(ba_system_stopCommQuality_1_ PROPERTIES LINKER_LANGUAGE CXX)
 
diff --git a/src/test/resources/results/system/src/ba_system_stopCommQuality_2_/cpp/CMakeLists.txt b/src/test/resources/results/system/src/ba_system_stopCommQuality_2_/cpp/CMakeLists.txt
index 0c1f2349de7323f4554e59c00cd86c45bc81e11e..c686bd64d071adde4cb528bc0cfcb70c87983feb 100644
--- a/src/test/resources/results/system/src/ba_system_stopCommQuality_2_/cpp/CMakeLists.txt
+++ b/src/test/resources/results/system/src/ba_system_stopCommQuality_2_/cpp/CMakeLists.txt
@@ -16,7 +16,7 @@ set(LIBS ${LIBS} ${Armadillo_LIBRARIES})
 # create static library
 include_directories(${INCLUDE_DIRS})
 add_library(ba_system_stopCommQuality_2_ ba_system_stopCommQuality_2_.h)
-target_include_directories(ba_system_stopCommQuality_2_ PUBLIC ${CMAKE_CURRENT_SOURCE_DIR})
+target_include_directories(ba_system_stopCommQuality_2_ PUBLIC ${CMAKE_CURRENT_SOURCE_DIR} ${INCLUDE_DIRS})
 target_link_libraries(ba_system_stopCommQuality_2_ PUBLIC ${LIBS})
 set_target_properties(ba_system_stopCommQuality_2_ PROPERTIES LINKER_LANGUAGE CXX)
 
diff --git a/src/test/resources/results/system/src/ba_system_velocityController_1_/cpp/CMakeLists.txt b/src/test/resources/results/system/src/ba_system_velocityController_1_/cpp/CMakeLists.txt
index 09bf995b010fab45602916807b4da9106ea87998..6c8775592fd02adabf5f4580eefc0bd1cf119759 100644
--- a/src/test/resources/results/system/src/ba_system_velocityController_1_/cpp/CMakeLists.txt
+++ b/src/test/resources/results/system/src/ba_system_velocityController_1_/cpp/CMakeLists.txt
@@ -16,7 +16,7 @@ set(LIBS ${LIBS} ${Armadillo_LIBRARIES})
 # create static library
 include_directories(${INCLUDE_DIRS})
 add_library(ba_system_velocityController_1_ ba_system_velocityController_1_.h)
-target_include_directories(ba_system_velocityController_1_ PUBLIC ${CMAKE_CURRENT_SOURCE_DIR})
+target_include_directories(ba_system_velocityController_1_ PUBLIC ${CMAKE_CURRENT_SOURCE_DIR} ${INCLUDE_DIRS})
 target_link_libraries(ba_system_velocityController_1_ PUBLIC ${LIBS})
 set_target_properties(ba_system_velocityController_1_ PROPERTIES LINKER_LANGUAGE CXX)
 
diff --git a/src/test/resources/results/system/src/ba_system_velocityController_2_/cpp/CMakeLists.txt b/src/test/resources/results/system/src/ba_system_velocityController_2_/cpp/CMakeLists.txt
index 10c218406502465a4493dc23310208494852778f..a201dec94a452788ad7f947e0d30c2434d44bbf9 100644
--- a/src/test/resources/results/system/src/ba_system_velocityController_2_/cpp/CMakeLists.txt
+++ b/src/test/resources/results/system/src/ba_system_velocityController_2_/cpp/CMakeLists.txt
@@ -16,7 +16,7 @@ set(LIBS ${LIBS} ${Armadillo_LIBRARIES})
 # create static library
 include_directories(${INCLUDE_DIRS})
 add_library(ba_system_velocityController_2_ ba_system_velocityController_2_.h)
-target_include_directories(ba_system_velocityController_2_ PUBLIC ${CMAKE_CURRENT_SOURCE_DIR})
+target_include_directories(ba_system_velocityController_2_ PUBLIC ${CMAKE_CURRENT_SOURCE_DIR} ${INCLUDE_DIRS})
 target_link_libraries(ba_system_velocityController_2_ PUBLIC ${LIBS})
 set_target_properties(ba_system_velocityController_2_ PROPERTIES LINKER_LANGUAGE CXX)