diff --git a/Modules/IGTUI/files.cmake b/Modules/IGTUI/files.cmake
index 5773331a13..5c6808a6d6 100644
--- a/Modules/IGTUI/files.cmake
+++ b/Modules/IGTUI/files.cmake
@@ -1,113 +1,112 @@
 set(CPP_FILES
   Qmitk/QmitkTrackingDeviceWidget.cpp
   Qmitk/QmitkTrackingDeviceConfigurationWidget.cpp
   Qmitk/QmitkNDIConfigurationWidget.cpp
   Qmitk/QmitkFiducialRegistrationWidget.cpp
   Qmitk/QmitkNDIToolDelegate.cpp
   Qmitk/QmitkNavigationToolManagementWidget.cpp
   Qmitk/QmitkIGTLoggerWidget.cpp
   Qmitk/QmitkUpdateTimerWidget.cpp
   Qmitk/QmitkToolDistanceWidget.cpp
   Qmitk/QmitkToolTrackingStatusWidget.cpp
   Qmitk/QmitkTrackingSourcesCheckBoxPanelWidget.cpp
   Qmitk/QmitkIGTPlayerWidget.cpp
   Qmitk/QmitkIGTConnectionWidget.cpp
   Qmitk/QmitkToolSelectionWidget.cpp
   Qmitk/QmitkNavigationToolCreationWidget.cpp
   Qmitk/QmitkNavigationDataSourceSelectionWidget.cpp
   Qmitk/QmitkInteractiveTransformationWidget.cpp
   Qmitk/QmitkNavigationToolStorageSelectionWidget.cpp
 
   Qmitk/QmitkNavigationDataPlayerControlWidget.cpp
   Qmitk/QmitkNavigationDataSequentialPlayerControlWidget.cpp
 
   Qmitk/QmitkNDIAuroraWidget.cpp
   Qmitk/QmitkNDIPolarisWidget.cpp
   Qmitk/QmitkMicronTrackerWidget.cpp
   Qmitk/QmitkNPOptitrackWidget.cpp
   Qmitk/QmitkVirtualTrackerWidget.cpp
   Qmitk/QmitkOpenIGTLinkWidget.cpp
 
   Qmitk/mitkTrackingDeviceWidgetCollection.cpp
   Qmitk/QmitkTrackingDeviceConfigurationWidgetScanPortsWorker.cpp
   Qmitk/QmitkTrackingDeviceConfigurationWidgetConnectionWorker.cpp
   Qmitk/QmitkNDIAbstractDeviceWidget.cpp
   Qmitk/QmitkAbstractTrackingDeviceWidget.cpp
   Qmitk/QmitkIGTCommonHelper.cpp
 )
 
 set(UI_FILES
   Qmitk/QmitkNavigationToolManagementWidgetControls.ui
   Qmitk/QmitkTrackingDeviceConfigurationWidgetControls.ui
   Qmitk/QmitkNDIConfigurationWidget.ui
   Qmitk/QmitkFiducialRegistrationWidget.ui
   Qmitk/QmitkIGTLoggerWidgetControls.ui
   Qmitk/QmitkUpdateTimerWidgetControls.ui
   Qmitk/QmitkToolDistanceWidgetControls.ui
   Qmitk/QmitkToolTrackingStatusWidgetControls.ui
   Qmitk/QmitkTrackingSourcesCheckBoxPanelWidgetControls.ui
   Qmitk/QmitkIGTPlayerWidgetControls.ui
   Qmitk/QmitkIGTConnectionWidgetControls.ui
   Qmitk/QmitkToolSelectionWidgetControls.ui
   Qmitk/QmitkNavigationToolCreationWidget.ui
   Qmitk/QmitkNavigationDataSourceSelectionWidgetControls.ui
   Qmitk/QmitkInteractiveTransformationWidgetControls.ui
   Qmitk/QmitkNavigationToolStorageSelectionWidgetControls.ui
 
   Qmitk/QmitkNavigationDataPlayerControlWidget.ui
   Qmitk/QmitkNavigationDataSequentialPlayerControlWidget.ui
 
   Qmitk/QmitkNDIAuroraWidget.ui
   Qmitk/QmitkNDIPolarisWidget.ui
   Qmitk/QmitkMicronTrackerWidget.ui
   Qmitk/QmitkNPOptitrackWidget.ui
   Qmitk/QmitkVirtualTrackerWidget.ui
   Qmitk/QmitkOpenIGTLinkWidget.ui
 )
 
 set(MOC_H_FILES
   Qmitk/QmitkNavigationToolManagementWidget.h
   Qmitk/QmitkTrackingDeviceWidget.h
   Qmitk/QmitkTrackingDeviceConfigurationWidget.h
   Qmitk/QmitkNDIConfigurationWidget.h
   Qmitk/QmitkFiducialRegistrationWidget.h
   Qmitk/QmitkNDIToolDelegate.h
   Qmitk/QmitkIGTLoggerWidget.h
   Qmitk/QmitkUpdateTimerWidget.h
   Qmitk/QmitkToolDistanceWidget.h
   Qmitk/QmitkToolTrackingStatusWidget.h
   Qmitk/QmitkTrackingSourcesCheckBoxPanelWidget.h
   Qmitk/QmitkIGTPlayerWidget.h
   Qmitk/QmitkIGTConnectionWidget.h
   Qmitk/QmitkToolSelectionWidget.h
   Qmitk/QmitkNavigationToolCreationWidget.h
   Qmitk/QmitkNavigationDataSourceSelectionWidget.h
   Qmitk/QmitkInteractiveTransformationWidget.h
   Qmitk/QmitkNavigationToolStorageSelectionWidget.h
 
   Qmitk/QmitkNavigationDataPlayerControlWidget.h
   Qmitk/QmitkNavigationDataSequentialPlayerControlWidget.h
 
   Qmitk/QmitkNDIAuroraWidget.h
   Qmitk/QmitkNDIPolarisWidget.h
   Qmitk/QmitkMicronTrackerWidget.h
   Qmitk/QmitkNPOptitrackWidget.h
   Qmitk/QmitkVirtualTrackerWidget.h
   Qmitk/QmitkOpenIGTLinkWidget.h
 
   Qmitk/QmitkTrackingDeviceConfigurationWidgetScanPortsWorker.h
   Qmitk/QmitkTrackingDeviceConfigurationWidgetConnectionWorker.h
   Qmitk/QmitkNDIAbstractDeviceWidget.h
   Qmitk/QmitkAbstractTrackingDeviceWidget.h
-  Qmitk/QmitkIGTCommonHelper.h
 )
 
 if(MITK_USE_POLHEMUS_TRACKER)
   set(CPP_FILES ${CPP_FILES} Qmitk/QmitkPolhemusTrackerWidget.cpp)
   set(UI_FILES ${UI_FILES} Qmitk/QmitkPolhemusTrackerWidget.ui)
   set(MOC_H_FILES ${MOC_H_FILES} Qmitk/QmitkPolhemusTrackerWidget.h)
 endif(MITK_USE_POLHEMUS_TRACKER)
 
 set(QRC_FILES
   resources/IGTUI.qrc
 )
diff --git a/Modules/XNAT/files.cmake b/Modules/XNAT/files.cmake
index c7bac427c8..99014ede7f 100644
--- a/Modules/XNAT/files.cmake
+++ b/Modules/XNAT/files.cmake
@@ -1,38 +1,37 @@
 file(GLOB_RECURSE H_FILES RELATIVE "${CMAKE_CURRENT_SOURCE_DIR}" "${CMAKE_CURRENT_SOURCE_DIR}/include/*")
 
 set(CPP_FILES
   mitkXnatSessionTracker.cpp
   QmitkXnatTreeModel.cpp
   QmitkXnatProjectWidget.cpp
   QmitkXnatSubjectWidget.cpp
   QmitkXnatExperimentWidget.cpp
   QmitkXnatCreateObjectDialog.cpp
   QmitkSelectXnatUploadDestinationDialog.cpp
   QmitkXnatUploadFromDataStorageDialog.cpp
   QmitkHttpStatusCodeHandler.cpp
 )
 
 set(MOC_H_FILES
  include/mitkXnatSessionTracker.h
  include/QmitkXnatTreeModel.h
  include/QmitkXnatProjectWidget.h
  include/QmitkXnatSubjectWidget.h
  include/QmitkXnatExperimentWidget.h
  include/QmitkXnatCreateObjectDialog.h
  include/QmitkSelectXnatUploadDestinationDialog.h
  include/QmitkXnatUploadFromDataStorageDialog.h
- include/QmitkHttpStatusCodeHandler.h
 )
 
 set(QRC_FILES
   resources/xnat.qrc
 )
 
 
 set(UI_FILES
   src/QmitkXnatExperimentWidgetControls.ui
   src/QmitkXnatProjectWidgetControls.ui
   src/QmitkSelectXnatUploadDestinationDialog.ui
   src/QmitkXnatSubjectWidgetControls.ui
   src/QmitkXnatUploadFromDataStorageDialog.ui
 )
diff --git a/Plugins/org.mitk.gui.qt.application/files.cmake b/Plugins/org.mitk.gui.qt.application/files.cmake
index 9bf54191ea..4d661dfef3 100644
--- a/Plugins/org.mitk.gui.qt.application/files.cmake
+++ b/Plugins/org.mitk.gui.qt.application/files.cmake
@@ -1,87 +1,86 @@
 set(SRC_CPP_FILES
   QmitkAbstractDataNodeAction.cpp
   QmitkCloseProjectAction.cpp
   QmitkDataNodeColorAction.cpp
   QmitkDataNodeColorMapAction.cpp
   QmitkDataNodeComponentAction.cpp
   QmitkDataNodeContextMenu.cpp
   QmitkDataNodeGlobalReinitAction.cpp
   QmitkDataNodeHideAllAction.cpp
   QmitkDataNodeOpacityAction.cpp
   QmitkDataNodeOpenInAction.cpp
   QmitkDataNodeReinitAction.cpp
   QmitkDataNodeRemoveAction.cpp
   QmitkDataNodeShowDetailsAction.cpp
   QmitkDataNodeShowSelectedNodesAction.cpp
   QmitkDataNodeSurfaceRepresentationAction.cpp
   QmitkDataNodeTextureInterpolationAction.cpp
   QmitkDataNodeToggleVisibilityAction.cpp
   QmitkDefaultDropTargetListener.cpp
   QmitkFileExitAction.cpp
   QmitkFileOpenAction.cpp
   QmitkFileSaveAction.cpp
   QmitkUndoAction.cpp
   QmitkRedoAction.cpp
   QmitkPreferencesDialog.cpp
   QmitkStatusBar.cpp
 )
 
 set(INTERNAL_CPP_FILES
   org_mitk_gui_qt_application_Activator.cpp
   QmitkEditorsPreferencePage.cpp
   QmitkGeneralPreferencePage.cpp
   QmitkShowPreferencePageHandler.cpp
 )
 
 set(MOC_H_FILES
-  src/QmitkAbstractDataNodeAction.h
   src/QmitkCloseProjectAction.h
   src/QmitkDataNodeColorAction.h
   src/QmitkDataNodeColorMapAction.h
   src/QmitkDataNodeComponentAction.h
   src/QmitkDataNodeGlobalReinitAction.h
   src/QmitkDataNodeContextMenu.h
   src/QmitkDataNodeHideAllAction.h
   src/QmitkDataNodeOpacityAction.h
   src/QmitkDataNodeOpenInAction.h
   src/QmitkDataNodeReinitAction.h
   src/QmitkDataNodeRemoveAction.h
   src/QmitkDataNodeShowDetailsAction.h
   src/QmitkDataNodeShowSelectedNodesAction.h
   src/QmitkDataNodeSurfaceRepresentationAction.h
   src/QmitkDataNodeTextureInterpolationAction.h
   src/QmitkDataNodeToggleVisibilityAction.h
   src/QmitkFileExitAction.h
   src/QmitkFileOpenAction.h
   src/QmitkFileSaveAction.h
   src/QmitkUndoAction.h
   src/QmitkRedoAction.h
   src/QmitkPreferencesDialog.h
 
   src/internal/org_mitk_gui_qt_application_Activator.h
   src/internal/QmitkEditorsPreferencePage.h
   src/internal/QmitkGeneralPreferencePage.h
   src/internal/QmitkShowPreferencePageHandler.h
 )
 
 set(UI_FILES
   src/QmitkPreferencesDialog.ui
 )
 
 set(CACHED_RESOURCE_FILES
   plugin.xml
 )
 
 set(QRC_FILES
   resources/resources.qrc
 )
 
 set(CPP_FILES )
 
 foreach(file ${SRC_CPP_FILES})
   set(CPP_FILES ${CPP_FILES} src/${file})
 endforeach(file ${SRC_CPP_FILES})
 
 foreach(file ${INTERNAL_CPP_FILES})
   set(CPP_FILES ${CPP_FILES} src/internal/${file})
 endforeach(file ${INTERNAL_CPP_FILES})
diff --git a/Plugins/org.mitk.gui.qt.common/files.cmake b/Plugins/org.mitk.gui.qt.common/files.cmake
index 67e72c7578..0bde8b2087 100755
--- a/Plugins/org.mitk.gui.qt.common/files.cmake
+++ b/Plugins/org.mitk.gui.qt.common/files.cmake
@@ -1,72 +1,71 @@
 set(SRC_CPP_FILES
   QmitkAbstractMultiWidgetEditor.cpp
   QmitkAbstractRenderEditor.cpp
   QmitkAbstractView.cpp
   QmitkDataNodeSelectionProvider.cpp
   QmitkDnDFrameWidget.cpp
   QmitkSelectionServiceConnector.cpp
   QmitkSliceNavigationListener.cpp
   QmitkSingleNodeSelectionWidget.cpp
   QmitkNodeSelectionDialog.cpp
   QmitkAbstractNodeSelectionWidget.cpp
   QmitkMultiNodeSelectionWidget.cpp
   QmitkMultiWidgetDecorationManager.cpp
   QmitkNodeSelectionPreferenceHelper.cpp
   QmitkNodeSelectionButton.cpp
   QmitkSimpleTextOverlayWidget.cpp
 )
 
 set(INTERNAL_CPP_FILES
   QmitkCommonActivator.cpp
   QmitkDataNodeItemModel.cpp
   QmitkDataNodeSelection.cpp
   QmitkViewCoordinator.cpp
   QmitkNodeSelectionConstants.cpp
   QmitkNodeSelectionPreferencePage.cpp
   QmitkNodeSelectionListItemWidget.cpp
 )
 
 set(UI_FILES
   src/QmitkSingleNodeSelectionWidget.ui
   src/QmitkMultiNodeSelectionWidget.ui
   src/QmitkNodeSelectionDialog.ui
   src/internal/QmitkNodeSelectionPreferencePage.ui
   src/internal/QmitkNodeSelectionListItemWidget.ui
 )
 
 set(MOC_H_FILES
   src/QmitkAbstractMultiWidgetEditor.h
   src/QmitkAbstractRenderEditor.h
   src/QmitkDnDFrameWidget.h
   src/QmitkSelectionServiceConnector.h
   src/QmitkSliceNavigationListener.h
-  src/ImporterUtil.h
   src/QmitkSingleNodeSelectionWidget.h
   src/QmitkNodeSelectionDialog.h
   src/QmitkAbstractNodeSelectionWidget.h
   src/QmitkMultiNodeSelectionWidget.h
   src/QmitkNodeSelectionButton.h
   src/QmitkSimpleTextOverlayWidget.h
   src/internal/QmitkCommonActivator.h
   src/internal/QmitkNodeSelectionPreferencePage.h
   src/internal/QmitkNodeSelectionListItemWidget.h
 )
 
 set(CACHED_RESOURCE_FILES
   plugin.xml
   resources/times.svg
 )
 
 set(QRC_FILES
   resources/common.qrc
 )
 
 set(CPP_FILES )
 
 foreach(file ${SRC_CPP_FILES})
   set(CPP_FILES ${CPP_FILES} src/${file})
 endforeach(file ${SRC_CPP_FILES})
 
 foreach(file ${INTERNAL_CPP_FILES})
   set(CPP_FILES ${CPP_FILES} src/internal/${file})
 endforeach(file ${INTERNAL_CPP_FILES})