diff --git a/source/RobotAPI/applications/ForceTorqueObserver/CMakeLists.txt b/source/RobotAPI/applications/ForceTorqueObserver/CMakeLists.txt
index 3a02531313f90edf32ded55e11ec325969453925..07d5eedc2fd66b04c60faf76313152d4c582e847 100755
--- a/source/RobotAPI/applications/ForceTorqueObserver/CMakeLists.txt
+++ b/source/RobotAPI/applications/ForceTorqueObserver/CMakeLists.txt
@@ -20,9 +20,7 @@ armarx_build_if(ArmarXCoreObservers_ENABLED "ArmarXCoreObservers library disable
 if (ARMARX_BUILD)
     set(COMPONENT_LIBS RobotAPIUnits RobotAPICore RobotAPIInterfaces  ArmarXInterfaces ArmarXCore ArmarXCoreObservers ArmarXCoreRemoteRobot)
 
-    set(SOURCES "")
-    set(HEADERS ForceTorqueObserverApp.h)
-
-    armarx_component_add_executable("${SOURCES}" "${HEADERS}")
+    set(SOURCES ForceTorqueObserverApp.h)
 
+    armarx_add_component_executable("${SOURCES}")
 endif()
diff --git a/source/RobotAPI/applications/MotionControl/CMakeLists.txt b/source/RobotAPI/applications/MotionControl/CMakeLists.txt
index ea23a4dc5095874712bbc14592dadc8104cb239f..fc628f1e4d91b4a7bc1235e97b2f4539838e2b79 100755
--- a/source/RobotAPI/applications/MotionControl/CMakeLists.txt
+++ b/source/RobotAPI/applications/MotionControl/CMakeLists.txt
@@ -20,9 +20,7 @@ armarx_build_if(ArmarXCoreObservers_ENABLED "ArmarXCoreObservers library disable
 if (ARMARX_BUILD)
     set(COMPONENT_LIBS MotionControl RobotAPICore ArmarXInterfaces ArmarXCore ArmarXCoreObservers ArmarXCoreRobotStateComponent ArmarXCoreStatechart ArmarXCoreOperations)
 
-    set(SOURCES "")
-    set(HEADERS MotionControlApp.h)
-
-    armarx_component_add_executable("${SOURCES}" "${HEADERS}")
+    set(SOURCES MotionControlApp.h)
 
+    armarx_add_component_executable("${SOURCES}")
 endif()
diff --git a/source/RobotAPI/applications/MotionControlTest/CMakeLists.txt b/source/RobotAPI/applications/MotionControlTest/CMakeLists.txt
index b60a8768fe79af2621c4ef043b275fbc7ab36d1c..54cdd89036872e86d6d1c1154d456dbc1289a373 100644
--- a/source/RobotAPI/applications/MotionControlTest/CMakeLists.txt
+++ b/source/RobotAPI/applications/MotionControlTest/CMakeLists.txt
@@ -22,9 +22,7 @@ if (ARMARX_BUILD)
     include_directories(${Simox_INCLUDE_DIRS})
     set(COMPONENT_LIBS MotionControl RobotAPICore ArmarXInterfaces ArmarXCore ArmarXCoreObservers ArmarXCoreRobotStateComponent ArmarXCoreStatechart ArmarXCoreOperations ${Simox_LIBRARIES})
 
-    set(SOURCES "")
-    set(HEADERS MotionControlTestApp.h)
-
-    armarx_component_add_executable("${SOURCES}" "${HEADERS}")
+    set(SOURCES MotionControlTestApp.h)
 
+    armarx_add_component_executable("${SOURCES}")
 endif()
diff --git a/source/RobotAPI/applications/TCPControlUnit/CMakeLists.txt b/source/RobotAPI/applications/TCPControlUnit/CMakeLists.txt
index 95497c39491a6fb2e32f36d3408e3a47e087a1c0..1a1a725f4ff9039810753fc77e5f8e62b495aaa5 100755
--- a/source/RobotAPI/applications/TCPControlUnit/CMakeLists.txt
+++ b/source/RobotAPI/applications/TCPControlUnit/CMakeLists.txt
@@ -22,9 +22,7 @@ if (ARMARX_BUILD)
     include_directories(${Simox_INCLUDE_DIRS})
     set(COMPONENT_LIBS RobotAPIUnits RobotAPICore RobotAPIInterfaces  ArmarXInterfaces ArmarXCore ArmarXCoreObservers ArmarXCoreRemoteRobot ${Simox_LIBRARIES})
 
-    set(SOURCES "")
-    set(HEADERS TCPControlUnitApp.h)
-
-    armarx_component_add_executable("${SOURCES}" "${HEADERS}")
+    set(SOURCES TCPControlUnitApp.h)
 
+    armarx_add_component_executable("${SOURCES}")
 endif()