diff --git a/Plugins/org.mitk.gui.qt.xnat/CMakeLists.txt b/Plugins/org.mitk.gui.qt.xnat/CMakeLists.txt
index c608468902..1f3699ff9a 100644
--- a/Plugins/org.mitk.gui.qt.xnat/CMakeLists.txt
+++ b/Plugins/org.mitk.gui.qt.xnat/CMakeLists.txt
@@ -1,7 +1,7 @@
 project(org_mitk_gui_qt_xnat)
 
 MACRO_CREATE_MITK_CTK_PLUGIN(
   EXPORT_DIRECTIVE XNAT_EXPORT
   EXPORTED_INCLUDE_SUFFIXES src
-  MODULE_DEPENDENCIES QmitkExt
+  MODULE_DEPENDS QmitkExt
 )
diff --git a/Plugins/org.mitk.gui.qt.xnat/files.cmake b/Plugins/org.mitk.gui.qt.xnat/files.cmake
index d5a5fb8942..8ab313cdf7 100644
--- a/Plugins/org.mitk.gui.qt.xnat/files.cmake
+++ b/Plugins/org.mitk.gui.qt.xnat/files.cmake
@@ -1,51 +1,49 @@
 set(SRC_CPP_FILES
 
 )
 
 set(INTERNAL_CPP_FILES
   org_mitk_gui_qt_xnatinterface_Activator.cpp
   QmitkXnatEditor.cpp
   QmitkXnatTreeBrowserView.cpp
   QmitkXnatObjectEditorInput.cpp
   QmitkXnatConnectionPreferencePage.cpp
   QmitkXnatConnectionManager.cpp
 )
 
 set(UI_FILES
   src/internal/QmitkXnatEditorControls.ui
   src/internal/QmitkXnatTreeBrowserViewControls.ui
 )
 
 set(MOC_H_FILES
   src/internal/org_mitk_gui_qt_xnatinterface_Activator.h
   src/internal/QmitkXnatEditor.h
   src/internal/QmitkXnatTreeBrowserView.h
-  src/internal/QmitkXnatObjectEditorInput.h
   src/internal/QmitkXnatConnectionPreferencePage.h
-  src/internal/QmitkXnatConnectionManager.h
 )
 
 # list of resource files which can be used by the plug-in
 # system without loading the plug-ins shared library,
 # for example the icon used in the menu and tabs for the
 # plug-in views in the workbench
 set(CACHED_RESOURCE_FILES
   resources/icon.xpm
   resources/xnat_treebrowser_icon.xpm
   plugin.xml
 )
 
 # list of Qt .qrc files which contain additional resources
 # specific to this plugin
 set(QRC_FILES
 )
 
 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.xnat/src/internal/QmitkXnatConnectionManager.h b/Plugins/org.mitk.gui.qt.xnat/src/internal/QmitkXnatConnectionManager.h
index 893ed8aa4b..1478777a06 100644
--- a/Plugins/org.mitk.gui.qt.xnat/src/internal/QmitkXnatConnectionManager.h
+++ b/Plugins/org.mitk.gui.qt.xnat/src/internal/QmitkXnatConnectionManager.h
@@ -1,46 +1,44 @@
 /*===================================================================
 
 The Medical Imaging Interaction Toolkit (MITK)
 
 Copyright (c) German Cancer Research Center,
 Division of Medical and Biological Informatics.
 All rights reserved.
 
 This software is distributed WITHOUT ANY WARRANTY; without
 even the implied warranty of MERCHANTABILITY or FITNESS FOR
 A PARTICULAR PURPOSE.
 
 See LICENSE.txt or http://www.mitk.org for details.
 
 ===================================================================*/
 
 
 #ifndef QMITKXNATCONNECTIONMANAGER_H_
 #define QMITKXNATCONNECTIONMANAGER_H_
 
-#include <QObject>
 #include <berryIPreferencesService.h>
 
 #include "ctkXnatSession.h"
 #include "ctkXnatLoginProfile.h"
 
-class QmitkXnatConnectionManager : public QObject
+class QmitkXnatConnectionManager
 {
-  Q_OBJECT
 
 public:
 
   QmitkXnatConnectionManager();
   ~QmitkXnatConnectionManager();
 
   /// \brief Opens and tests a xnat session and returns it if the test was ok.
   ctkXnatSession* GetXnatConnection();
 
 private:
 
   ctkXnatSession* m_Session;
   berry::IPreferencesService::WeakPtr m_PreferencesService;
 
 };
 
 #endif /*QMITKXNATCONNECTIONMANAGER_H_*/