diff --git a/Modules/ToFHardware/files.cmake b/Modules/ToFHardware/files.cmake
index b34ba123fa..d6b63558a3 100644
--- a/Modules/ToFHardware/files.cmake
+++ b/Modules/ToFHardware/files.cmake
@@ -1,93 +1,91 @@
 SET(CPP_FILES
   mitkToFImageGrabberCreator.cpp
   mitkToFImageGrabber.cpp
   mitkToFOpenCVImageGrabber.cpp
   mitkToFCameraDevice.cpp
   mitkToFCameraMITKPlayerController.cpp
   mitkToFCameraMITKPlayerDevice.cpp
   mitkToFCameraPMDDevice.cpp
   mitkToFCameraPMDPlayerDevice.cpp
   mitkToFCameraPMDMITKPlayerDevice.cpp
   mitkToFCameraPMDO3Device.cpp
   mitkToFCameraPMDCamCubeDevice.cpp
   mitkToFCameraPMDCamBoardDevice.cpp
   mitkToFCameraMESADevice.cpp
   mitkToFCameraMESASR4000Device.cpp
   mitkToFImageRecorder.cpp
   mitkToFImageRecorderFilter.cpp
   mitkToFImageWriter.cpp
   mitkToFImageCsvWriter.cpp
 )
 
 IF(MITK_USE_TOF_PMDCAMCUBE)
 SET(CPP_FILES ${CPP_FILES}
   mitkToFCameraPMDMITKPlayerController.cpp
   mitkToFCameraPMDCamCubeController.cpp
   mitkToFCameraPMDController.cpp
   mitkToFCameraPMDPlayerController.cpp
 )
 IF(WIN32)
   IF(CMAKE_CL_64)
     SET(CPP_FILES ${CPP_FILES} mitkToFCameraPMDPlayerControllerStub.cpp)
   ELSE(CMAKE_CL_64)
     SET(CPP_FILES ${CPP_FILES} mitkToFCameraPMDPlayerController.cpp)
   ENDIF(CMAKE_CL_64)
 ELSE(WIN32)
     SET(CPP_FILES ${CPP_FILES} mitkToFCameraPMDPlayerControllerStub.cpp)
 ENDIF(WIN32)
 ELSE()
 SET(CPP_FILES ${CPP_FILES}	
   mitkToFCameraPMDMITKPlayerControllerStub.cpp
   mitkToFCameraPMDCamCubeControllerStub.cpp
   mitkToFCameraPMDPlayerControllerStub.cpp
 )
 ENDIF(MITK_USE_TOF_PMDCAMCUBE)
 
 IF(MITK_USE_TOF_PMDCAMBOARD)
 SET(CPP_FILES ${CPP_FILES}
   mitkToFCameraPMDCamBoardController.cpp
   mitkToFCameraPMDController.cpp
 )
 ELSE()
 SET(CPP_FILES ${CPP_FILES}
   mitkToFCameraPMDCamBoardControllerStub.cpp
-  mitkToFCameraPMDControllerStub.cpp
 )
 ENDIF(MITK_USE_TOF_PMDCAMBOARD)
 
 
 IF(MITK_USE_TOF_PMDO3)
 SET(CPP_FILES ${CPP_FILES}
   mitkToFCameraPMDO3Controller.cpp
   mitkToFCameraPMDController.cpp
 )
 ELSE()
 SET(CPP_FILES ${CPP_FILES}
   mitkToFCameraPMDO3ControllerStub.cpp
 )
 ENDIF(MITK_USE_TOF_PMDO3)
 
-IF(MITK_USE_TOF_PMDCAMBOARD)
-SET(CPP_FILES ${CPP_FILES}
-  mitkToFCameraPMDCamBoardController.cpp
-  mitkToFCameraPMDController.cpp
-)
-ELSE()
+IF(NOT MITK_USE_TOF_PMDCAMCUBE)
+IF(NOT MITK_USE_TOF_PMDCAMBOARD)
+IF(NOT MITK_USE_TOF_PMDO3)
 SET(CPP_FILES ${CPP_FILES}
-  mitkToFCameraPMDCamBoardControllerStub.cpp
+  mitkToFCameraPMDControllerStub.cpp
 )
-ENDIF(MITK_USE_TOF_PMDCAMBOARD)
+ENDIF(NOT MITK_USE_TOF_PMDO3)
+ENDIF(NOT MITK_USE_TOF_PMDCAMBOARD)
+ENDIF(NOT MITK_USE_TOF_PMDCAMCUBE)
 
 IF(MITK_USE_TOF_MESASR4000)
 SET(CPP_FILES ${CPP_FILES}
   mitkToFCameraMESASR4000Controller.cpp
   mitkToFCameraMESAController.cpp
 )
 ELSE()
 SET(CPP_FILES ${CPP_FILES}
   mitkToFCameraMESAControllerStub.cpp
   mitkToFCameraMESASR4000ControllerStub.cpp
 )
 ENDIF(MITK_USE_TOF_MESASR4000)
 
 
diff --git a/Modules/ToFHardware/mitkToFHardware.cmake b/Modules/ToFHardware/mitkToFHardware.cmake
index 9d85f70eab..27e5d47825 100644
--- a/Modules/ToFHardware/mitkToFHardware.cmake
+++ b/Modules/ToFHardware/mitkToFHardware.cmake
@@ -1,115 +1,116 @@
 #option MITK_USE_TOF_HARDWARE
 
 IF(WIN32)
   IF(CMAKE_CL_64)
     SET(_PLATFORM_STRING "W64")
   ELSE(CMAKE_CL_64)
     SET(_PLATFORM_STRING "W32")
   ENDIF(CMAKE_CL_64)
 ELSE(WIN32)
   IF(CMAKE_SYSTEM_PROCESSOR MATCHES "x86_64")
     SET(_PLATFORM_STRING "L64")
   ELSE(CMAKE_SYSTEM_PROCESSOR MATCHES "x86_64")
     SET(_PLATFORM_STRING "L32")
   ENDIF(CMAKE_SYSTEM_PROCESSOR MATCHES "x86_64")
 ENDIF(WIN32)
 
+SET(MITK_TOF_AVAILABLE_CAMERAS MITK Player)
+
 OPTION(MITK_ENABLE_TOF_HARDWARE "Support for range cameras" OFF)
 IF(MITK_ENABLE_TOF_HARDWARE)
-SET(MITK_TOF_AVAILABLE_CAMERAS MITK Player)
 	
 #Begin PMD Camcube hardware
 OPTION(MITK_USE_TOF_PMDCAMCUBE "Enable support for PMD camcube" OFF)
 
 # only if PMD Camcube is enabled
 IF(MITK_USE_TOF_PMDCAMCUBE)
   FIND_LIBRARY(MITK_PMD_LIB pmdaccess2 DOC "PMD access library.")
   GET_FILENAME_COMPONENT(MITK_PMD_SDK_DIR ${MITK_PMD_LIB} PATH)
   SET(MITK_PMD_SDK_DIR ${MITK_PMD_SDK_DIR}/..)
   FIND_PATH(MITK_PMD_INCLUDE_DIR pmdsdk2.h ${MITK_PMD_SDK_DIR}/include DOC  "Include directory of PMD-SDK.")
   SET(MITK_TOF_PMD_CAMCUBE_SOURCE ${MITK_PMD_SDK_DIR}/plugins/camcube3.${_PLATFORM_STRING}.pap)
   SET(MITK_TOF_PMD_CAMCUBE_PROC ${MITK_PMD_SDK_DIR}/plugins/camcubeproc.${_PLATFORM_STRING}.ppp)
   SET(MITK_TOF_PMD_FILE_SOURCE ${MITK_PMD_SDK_DIR}/plugins/pmdfile.${_PLATFORM_STRING}.pcp)
   SET(MITK_TOF_AVAILABLE_CAMERAS ${MITK_TOF_AVAILABLE_CAMERAS},PMD CamCube 2.0/3.0,PMD Player,PMD Raw Data Player)
 #  FILE(GLOB MITK_TOF_PMD_CAMCUBE_SOURCE camcube3.${_PLATFORM_STRING}.pap)
 #  FILE(GLOB MITK_TOF_PMD_CAMCUBE_PROC camcubeproc.${_PLATFORM_STRING}.ppp)
 #  FILE(GLOB MITK_TOF_PMD_FILE_SOURCE pmdfile.${_PLATFORM_STRING}.pcp)
   IF(WIN32)
    MITK_INSTALL(FILES ${MITK_PMD_SDK_DIR}/bin/pmdaccess2.dll  CONFIGURATIONS Release)
    MITK_INSTALL(FILES ${MITK_PMD_SDK_DIR}/plugins/camcube3.W32.pap  CONFIGURATIONS Release)
    MITK_INSTALL(FILES ${MITK_PMD_SDK_DIR}/plugins/camcubeproc.W32.ppp  CONFIGURATIONS Release)
    MITK_INSTALL(FILES ${MITK_PMD_SDK_DIR}/plugins/camcube3.W64.pap  CONFIGURATIONS Release)
    MITK_INSTALL(FILES ${MITK_PMD_SDK_DIR}/plugins/camcubeproc.W64.ppp  CONFIGURATIONS Release)
    MITK_INSTALL(FILES ${MITK_PMD_SDK_DIR}/plugins/pmdfile.W32.pcp  CONFIGURATIONS Release)
   ENDIf(WIN32)
 ENDIF(MITK_USE_TOF_PMDCAMCUBE)
 #End PMD Camcube Hardware
 
 #Begin PMD CamBoard hardware
 OPTION(MITK_USE_TOF_PMDCAMBOARD "Enable support for PMD camboard" OFF)
 
 # only if PMD CamBoard is enabled
 IF(MITK_USE_TOF_PMDCAMBOARD)
   FIND_LIBRARY(MITK_PMD_LIB pmdaccess2 DOC "PMD access library.")
   GET_FILENAME_COMPONENT(MITK_PMD_SDK_DIR ${MITK_PMD_LIB} PATH)
   SET(MITK_PMD_SDK_DIR ${MITK_PMD_SDK_DIR}/..)
   FIND_PATH(MITK_PMD_INCLUDE_DIR pmdsdk2.h ${MITK_PMD_SDK_DIR}/include DOC  "Include directory of PMD-SDK.")
   SET(MITK_TOF_PMD_CAMBOARD_SOURCE ${MITK_PMD_SDK_DIR}/plugins/camboard.${_PLATFORM_STRING}.pap)
   SET(MITK_TOF_PMD_CAMBOARD_PROC ${MITK_PMD_SDK_DIR}/plugins/camboardproc.${_PLATFORM_STRING}.ppp)
   SET(MITK_TOF_AVAILABLE_CAMERAS ${MITK_TOF_AVAILABLE_CAMERAS},PMD CamBoard)
 #  FILE(GLOB MITK_TOF_PMD_CAMBOARD_SOURCE camboard.${_PLATFORM_STRING}.pap)
 #  FILE(GLOB MITK_TOF_PMD_CAMBOARD_PROC camboardproc.${_PLATFORM_STRING}.ppp)
 #  FILE(GLOB MITK_TOF_PMD_FILE_SOURCE ${MITK_PMD_SDK_DIR}/plugins/pmdfile.${_PLATFORM_STRING}.pcp)
   IF(WIN32)
    INSTALL(FILES ${MITK_PMD_SDK_DIR}/bin/pmdaccess2.dll DESTINATION bin CONFIGURATIONS Release)
    INSTALL(FILES ${MITK_PMD_SDK_DIR}/plugins/camboard.W32.pap DESTINATION bin CONFIGURATIONS Release)
    INSTALL(FILES ${MITK_PMD_SDK_DIR}/plugins/camboardproc.W32.ppp DESTINATION bin CONFIGURATIONS Release)
 #   INSTALL(FILES ${MITK_PMD_SDK_DIR}/plugins/camboard.W64.pap DESTINATION bin CONFIGURATIONS Release)
 #   INSTALL(FILES ${MITK_PMD_SDK_DIR}/plugins/camboardproc.W64.ppp DESTINATION bin CONFIGURATIONS Release)
 #   INSTALL(FILES ${MITK_PMD_SDK_DIR}/plugins/pmdfile.W32.pcp DESTINATION bin CONFIGURATIONS Release)
   ENDIf(WIN32)
 ENDIF(MITK_USE_TOF_PMDCAMBOARD)
 #End PMD CamBoard Hardware
 
 #Begin MESA SR4000 hardware
 OPTION(MITK_USE_TOF_MESASR4000 "Enable support for MESA SR4000" OFF)
 
 # only if MESA SR4000 is enabled
 IF(MITK_USE_TOF_MESASR4000)
   FIND_LIBRARY(MITK_MESA_LIB libMesaSR DOC "MESA access library.")
   GET_FILENAME_COMPONENT(MITK_MESA_SDK_DIR ${MITK_MESA_LIB} PATH)
   SET(MITK_MESA_SDK_DIR ${MITK_MESA_SDK_DIR}/..)
   FIND_PATH(MITK_MESA_INCLUDE_DIR libMesaSR.h ${MITK_MESA_SDK_DIR}/include DOC  "Include directory of MESA-SDK.")
   SET(MITK_TOF_AVAILABLE_CAMERAS ${MITK_TOF_AVAILABLE_CAMERAS},MESA Swissranger 4000)
   IF(WIN32)
    INSTALL(FILES ${MITK_MESA_SDK_DIR}/bin/libMesaSR.dll DESTINATION bin CONFIGURATIONS Release)
   ENDIf(WIN32)
 ENDIF(MITK_USE_TOF_MESASR4000)
 #End MESA SR4000 Hardware
 
 IF (WIN32)
 
 #Begin PMD O3 hardware
 OPTION(MITK_USE_TOF_PMDO3 "Enable support for PMD O3 camera" OFF)
 # only if PMD O3 is enabled
 IF(MITK_USE_TOF_PMDO3)
   FIND_LIBRARY(MITK_PMD_LIB pmdaccess2 DOC "PMD access library.")
   GET_FILENAME_COMPONENT(MITK_PMD_SDK_DIR ${MITK_PMD_LIB} PATH)
   SET(MITK_PMD_SDK_DIR ${MITK_PMD_SDK_DIR}/..)
   FIND_PATH(MITK_PMD_INCLUDE_DIR pmdsdk2.h ${MITK_PMD_SDK_DIR}/include DOC  "Include directory of PMD-SDK.")
   SET(MITK_TOF_PMD_O3D_SOURCE ${MITK_PMD_SDK_DIR}/plugins/o3d.${_PLATFORM_STRING}.pcp)
   SET(MITK_TOF_PMD_O3D_PROC ${MITK_PMD_SDK_DIR}/plugins/o3d.${_PLATFORM_STRING}.pcp)
   SET(MITK_TOF_AVAILABLE_CAMERAS ${MITK_TOF_AVAILABLE_CAMERAS},PMD O3D)
   
 #  FILE(GLOB MITK_TOF_PMD_O3D_SOURCE o3d.${_PLATFORM_STRING}.pcp)
 #  FILE(GLOB MITK_TOF_PMD_O3D_PROC o3d.${_PLATFORM_STRING}.pcp)
   MITK_INSTALL(FILES ${MITK_PMD_SDK_DIR}/bin/pmdaccess2.dll  CONFIGURATIONS Release)
   MITK_INSTALL(FILES ${MITK_PMD_SDK_DIR}/plugins/o3d.W32.pcp  CONFIGURATIONS Release)
 ENDIF(MITK_USE_TOF_PMDO3)
 #End PMD O3 Hardware
 ENDIF(WIN32)
 
 ENDIF(MITK_ENABLE_TOF_HARDWARE)
 
 CONFIGURE_FILE(mitkToFConfig.h.in ${PROJECT_BINARY_DIR}/mitkToFConfig.h @ONLY)