diff --git a/Modules/Bundles/org.mitk.gui.qt.tofutil/CMakeLists.txt b/Modules/Bundles/org.mitk.gui.qt.tofutil/CMakeLists.txt
index 73aadc4e30..30022b1fbd 100644
--- a/Modules/Bundles/org.mitk.gui.qt.tofutil/CMakeLists.txt
+++ b/Modules/Bundles/org.mitk.gui.qt.tofutil/CMakeLists.txt
@@ -1,4 +1,2 @@
-IF (MITK_ENABLE_TOF_HARDWARE)
 MACRO_CREATE_MITK_PLUGIN(mitkToFHardware Qmitk QmitkExt mitkTOFUI)
-ENDIF (MITK_ENABLE_TOF_HARDWARE)
 
diff --git a/Modules/ToFHardware/CMakeLists.txt b/Modules/ToFHardware/CMakeLists.txt
index 80ab278aa3..3c0fc19f29 100644
--- a/Modules/ToFHardware/CMakeLists.txt
+++ b/Modules/ToFHardware/CMakeLists.txt
@@ -1,33 +1,35 @@
 OPTION(MITK_ENABLE_TOF_HARDWARE "Support for range cameras" OFF)
 IF(MITK_ENABLE_TOF_HARDWARE)
 
 INCLUDE(mitkToFHardware.cmake)
 
 IF(MITK_USE_TOF_PMDCAMCUBE)
   SET(INCLUDE_DIRS_INTERNAL ${INCLUDE_DIRS_INTERNAL} ${MITK_PMD_SDK_DIR}/include)
   SET(ADDITIONAL_LIBS ${ADDITIONAL_LIBS} ${MITK_PMD_LIB})
 ENDIF(MITK_USE_TOF_PMDCAMCUBE)
 
 IF(MITK_USE_TOF_O3)
   SET(INCLUDE_DIRS_INTERNAL ${INCLUDE_DIRS_INTERNAL} ${MITK_PMD_SDK_DIR}/include)
   SET(ADDITIONAL_LIBS ${ADDITIONAL_LIBS} ${MITK_PMD_LIB})
 ENDIF(MITK_USE_TOF_O3)
 
 IF(MITK_USE_TOF_PMDCAMBOARD)
   SET(INCLUDE_DIRS_INTERNAL ${INCLUDE_DIRS_INTERNAL} ${MITK_PMD_SDK_DIR}/include)
   SET(ADDITIONAL_LIBS ${ADDITIONAL_LIBS} ${MITK_PMD_LIB})
 ENDIF(MITK_USE_TOF_PMDCAMBOARD)
 
-  MITK_CREATE_MODULE(mitkToFHardware
-    SUBPROJECTS MITK-ToF
-    INCLUDE_DIRS ${MITK_BIN_DIR}
-    INTERNAL_INCLUDE_DIRS ${INCLUDE_DIRS_INTERNAL}
-    DEPENDS Mitk MitkExt mitkOpenCVVideoSupport MitkIGT 
-    PROVIDES mitkToFHardware
-    EXPORT_DEFINE MITK_TOFHARDWARE_EXPORT
-    ADDITIONAL_LIBS ${ADDITIONAL_LIBS}
-  )
+ENDIF(MITK_ENABLE_TOF_HARDWARE)
+
+MITK_CREATE_MODULE(mitkToFHardware
+  SUBPROJECTS MITK-ToF
+  INCLUDE_DIRS ${MITK_BIN_DIR}
+  INTERNAL_INCLUDE_DIRS ${INCLUDE_DIRS_INTERNAL}
+  DEPENDS Mitk MitkExt mitkOpenCVVideoSupport MitkIGT 
+  PROVIDES mitkToFHardware
+  EXPORT_DEFINE MITK_TOFHARDWARE_EXPORT
+  ADDITIONAL_LIBS ${ADDITIONAL_LIBS}
+)
 
 ADD_SUBDIRECTORY(Testing)
-ENDIF(MITK_ENABLE_TOF_HARDWARE)
+
  
diff --git a/Modules/ToFUI/CMakeLists.txt b/Modules/ToFUI/CMakeLists.txt
index 6ade38b24a..1587a7c5a8 100644
--- a/Modules/ToFUI/CMakeLists.txt
+++ b/Modules/ToFUI/CMakeLists.txt
@@ -1,11 +1,9 @@
-IF (MITK_ENABLE_TOF_HARDWARE)
 MITK_CREATE_MODULE(mitkTOFUI
   SUBPROJECTS MITK-ToF
   INCLUDE_DIRS Qmitk
   DEPENDS mitkToFHardware mitkToFProcessing Qmitk QmitkExt
   PROVIDES mitkTOFUI
   QT_MODULE
   GENERATED_CPP ${TOOL_GUI_CPPS} ${TOOL_CPPS}
 )
-ENDIF (MITK_ENABLE_TOF_HARDWARE)