diff --git a/cpp/applications/openScenarioReader/src/OpenScenarioReader.cpp b/cpp/applications/openScenarioReader/src/OpenScenarioReader.cpp
index 1060fb83..d780dc59 100644
--- a/cpp/applications/openScenarioReader/src/OpenScenarioReader.cpp
+++ b/cpp/applications/openScenarioReader/src/OpenScenarioReader.cpp
@@ -467,7 +467,8 @@ int main(int argc, char** argv)
             if (argc == 6 && std::string(argv[5]) == "-v1_1")
             {
                 version = VERSION_1_1;
-            }else if (argc == 6 && std::string(argv[5]) == "-v1_2")
+            }
+            else if (argc == 6 && std::string(argv[5]) == "-v1_2")
 			{
 				version = VERSION_1_2;
 			}
diff --git a/cpp/applications/openScenarioTester/CMakeLists.txt b/cpp/applications/openScenarioTester/CMakeLists.txt
index ee420d6c..62a1f204 100644
--- a/cpp/applications/openScenarioTester/CMakeLists.txt
+++ b/cpp/applications/openScenarioTester/CMakeLists.txt
@@ -136,8 +136,6 @@ set( SOURCES
     ${SOURCES}
 	"src/TestBaseV1_0.cpp"
     "src/TestExamplesV1_0.cpp"
-    "src/TestExamplesV1_1.cpp"
-    "src/TestCardinalityV1_1.cpp"
     "src/TestFilesV1_0.cpp"
     "src/TestFlexInterfaceV1_0.cpp"
     "src/TestImportsV1_0.cpp"
@@ -151,11 +149,11 @@ set( SOURCES
 endif (SUPPORT_OSC_1_0)
 
 if (SUPPORT_OSC_1_1)
-
 set( SOURCES
     ${SOURCES}
 	"src/TestBaseV1_1.cpp"
     "src/TestExamplesV1_1.cpp"
+    "src/TestCardinalityV1_1.cpp"
     "src/TestFilesV1_1.cpp"
     "src/TestFlexInterfaceV1_1.cpp"
     "src/TestImportsV1_1.cpp"
diff --git a/cpp/applications/openScenarioTester/src/OpenScenarioTester.cpp b/cpp/applications/openScenarioTester/src/OpenScenarioTester.cpp
index b8e30d72..c8d6bc05 100644
--- a/cpp/applications/openScenarioTester/src/OpenScenarioTester.cpp
+++ b/cpp/applications/openScenarioTester/src/OpenScenarioTester.cpp
@@ -15,8 +15,6 @@
  * limitations under the License.
  */
 
-#include <TestExamplesOscV1_2.h>
-
 #include "TestVersionOptionsWithReader.h"
 
 #ifdef SUPPORT_OSC_1_0
@@ -47,7 +45,6 @@
 #include "TestFlexInterfaceV1_1.h"
 #include "TestInjectedParametersV1_1.h"
 #include "TestWriterApiV1_1.h"
-
 #endif
 
 #ifdef SUPPORT_OSC_1_2
@@ -57,6 +54,7 @@
 #include "TestAlksV1_2.h"
 #include "TestDeprecatedV1_2.h"
 #include "TestExamplesV1_2.h"
+#include <TestExamplesOscV1_2.h>
 #include "TestRangeCheckerV1_2.h"
 #include "TestFilesV1_2.h"
 #include "TestImportsV1_2.h"
diff --git a/cpp/buildArtifact/collectHeaderFiles.sh b/cpp/buildArtifact/collectHeaderFiles.sh
index 1bfe3695..bd8ab9ca 100755
--- a/cpp/buildArtifact/collectHeaderFiles.sh
+++ b/cpp/buildArtifact/collectHeaderFiles.sh
@@ -30,7 +30,7 @@ FIND_HEADERS_SH=${FIND_HEADERS_SH_PATH}/${FIND_HEADERS_SH_FILE}
 # prepare inlude paths for C++ compiler in order to extract ALL necessary non-system include files
 # this has to be done outside the openScenarioReader project folder to also reach all referenced external dependencies
 echo "#!/bin/bash" > ${FIND_HEADERS_SH}
-echo "cpp -DCOLLECT_HEADERS -MM \\" >> ${FIND_HEADERS_SH}
+echo "cpp -DCOLLECT_HEADERS -DSUPPORT_OSC_1_0 -DSUPPORT_OSC_1_1 -DSUPPORT_OSC_1_2 -MM \\" >> ${FIND_HEADERS_SH}
 for i in `find . -type d -print` ; do
     if [[ $i == *"CMake"* ]] || [[ $i == *"antlr_runtime"* ]] || [[ $i == *"ython"* ]] || [[ $i == *"java"* ]] || [[ $i == *".dir"* ]] || [[ $i == "./build"* ]] ;
     then
diff --git a/cpp/buildArtifact/createCMakeLists.sh b/cpp/buildArtifact/createCMakeLists.sh
index 7b167454..8683d53c 100755
--- a/cpp/buildArtifact/createCMakeLists.sh
+++ b/cpp/buildArtifact/createCMakeLists.sh
@@ -80,6 +80,20 @@ set( ENV{CMAKE_BUILD_PARALLEL_LEVEL} 4 )
 
 ################################################################
 # Preprocessor settings
+option(SUPPORT_OSC_1_0 \"Build the artifacts supporting OSC standard version 1.0\" ON)
+option(SUPPORT_OSC_1_1 \"Build the artifacts supporting OSC standard version 1.1\" ON)
+option(SUPPORT_OSC_1_2 \"Build the artifacts supporting OSC standard version 1.2\" ON)
+
+if (SUPPORT_OSC_1_0)
+	add_definitions(-DSUPPORT_OSC_1_0)	
+endif (SUPPORT_OSC_1_0)
+if (SUPPORT_OSC_1_1)
+	add_definitions(-DSUPPORT_OSC_1_1)	
+endif (SUPPORT_OSC_1_1)
+if (SUPPORT_OSC_1_2)
+	add_definitions(-DSUPPORT_OSC_1_2)	
+endif (SUPPORT_OSC_1_2)
+
 if( WIN32 )
     add_definitions( -D_CRT_SECURE_NO_WARNINGS )
 else( WIN32 )