diff --git a/Modules/QtWidgetsExt/QtWidgetsExtRegisterClasses.cpp b/Modules/QtWidgetsExt/QtWidgetsExtRegisterClasses.cpp
new file mode 100644
index 0000000000..7dd896652b
--- /dev/null
+++ b/Modules/QtWidgetsExt/QtWidgetsExtRegisterClasses.cpp
@@ -0,0 +1,33 @@
+/*===================================================================
+
+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.
+
+===================================================================*/
+
+#include "QtWidgetsExtRegisterClasses.h"
+#include "QmitkCallbackFromGUIThread.h"
+
+void QtWidgetsExtRegisterClasses()
+{
+  static bool alreadyDone = false;
+  if (!alreadyDone)
+  {
+    MITK_DEBUG << "QmitkExtRegisterClasses()";
+
+    static QmitkCallbackFromGUIThread globalQmitkCallbackFromGUIThread;
+
+
+    alreadyDone = true;
+  }
+}
+
diff --git a/Modules/QtWidgetsExt/QtWidgetsExtRegisterClasses.h b/Modules/QtWidgetsExt/QtWidgetsExtRegisterClasses.h
new file mode 100644
index 0000000000..9ba885844c
--- /dev/null
+++ b/Modules/QtWidgetsExt/QtWidgetsExtRegisterClasses.h
@@ -0,0 +1,26 @@
+/*===================================================================
+
+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 QtWidgetsExtRegisterClasses_h
+#define QtWidgetsExtRegisterClasses_h
+
+#include "mitkCommon.h"
+#include "MitkQtWidgetsExtExports.h"
+
+MitkQtWidgetsExt_EXPORT void QtWidgetsExtRegisterClasses();
+
+#endif
+
diff --git a/Modules/QtWidgetsExt/files.cmake b/Modules/QtWidgetsExt/files.cmake
index 8f5c5c9251..88c3741a44 100644
--- a/Modules/QtWidgetsExt/files.cmake
+++ b/Modules/QtWidgetsExt/files.cmake
@@ -1,118 +1,119 @@
 set(CPP_FILES
   QmitkAboutDialog/QmitkAboutDialog.cpp
   QmitkApplicationBase/QmitkIOUtil.cpp
   QmitkPropertyObservers/QmitkBasePropertyView.cpp
   QmitkPropertyObservers/QmitkBoolPropertyWidget.cpp
   QmitkPropertyObservers/QmitkColorPropertyEditor.cpp
   QmitkPropertyObservers/QmitkColorPropertyView.cpp
   QmitkPropertyObservers/QmitkEnumerationPropertyWidget.cpp
   QmitkPropertyObservers/QmitkNumberPropertyEditor.cpp
   QmitkPropertyObservers/QmitkNumberPropertySlider.cpp
   QmitkPropertyObservers/QmitkNumberPropertyView.cpp
   QmitkPropertyObservers/QmitkPropertyViewFactory.cpp
   QmitkPropertyObservers/QmitkStringPropertyEditor.cpp
   QmitkPropertyObservers/QmitkStringPropertyOnDemandEdit.cpp
   QmitkPropertyObservers/QmitkStringPropertyView.cpp
   QmitkPropertyObservers/QmitkUGCombinedRepresentationPropertyWidget.cpp
   qclickablelabel.cpp
   QmitkBoundingObjectWidget.cpp
   QmitkCallbackFromGUIThread.cpp
   QmitkColorTransferFunctionCanvas.cpp
   QmitkCorrespondingPointSetsModel.cpp
   QmitkCorrespondingPointSetsView.cpp
   QmitkCorrespondingPointSetsWidget.cpp
   QmitkCrossWidget.cpp
   QmitkEditPointDialog.cpp
   QmitkFileChooser.cpp
   QmitkFloatingPointSpanSlider.cpp
   QmitkGnuplotWidget.cpp
   QmitkHistogram.cpp
   QmitkHistogramJSWidget.cpp
   QmitkHistogramWidget.cpp
   QmitkHotkeyLineEdit.cpp
   QmitkLineEdit.cpp
   QmitkModulesDialog.cpp
   QmitkModuleTableModel.cpp
   QmitkPiecewiseFunctionCanvas.cpp
   QmitkPlotWidget.cpp
   QmitkPlotDialog.cpp
   QmitkPointListModel.cpp
   QmitkPointListView.cpp
   QmitkPointListViewWidget.cpp
   QmitkPointListWidget.cpp
   QmitkPrimitiveMovieNavigatorWidget.cpp
   QmitkSelectableGLWidget.cpp
   QmitkSliceWidget.cpp
   QmitkSliderNavigatorWidget.cpp
   QmitkStandardViews.cpp
   QmitkStepperAdapter.cpp
   QmitkTransferFunctionCanvas.cpp
   QmitkTransferFunctionGeneratorWidget.cpp
   QmitkTransferFunctionWidget.cpp
   QmitkVideoBackground.cpp
   QmitkWebPage.cpp
+  QtWidgetsExtRegisterClasses.cpp
 )
 
 set(MOC_H_FILES
   QmitkAboutDialog/QmitkAboutDialog.h
   QmitkPropertyObservers/QmitkBasePropertyView.h
   QmitkPropertyObservers/QmitkBoolPropertyWidget.h
   QmitkPropertyObservers/QmitkColorPropertyEditor.h
   QmitkPropertyObservers/QmitkColorPropertyView.h
   QmitkPropertyObservers/QmitkEnumerationPropertyWidget.h
   QmitkPropertyObservers/QmitkNumberPropertyEditor.h
   QmitkPropertyObservers/QmitkNumberPropertySlider.h
   QmitkPropertyObservers/QmitkNumberPropertyView.h
   QmitkPropertyObservers/QmitkStringPropertyEditor.h
   QmitkPropertyObservers/QmitkStringPropertyOnDemandEdit.h
   QmitkPropertyObservers/QmitkStringPropertyView.h
   QmitkPropertyObservers/QmitkUGCombinedRepresentationPropertyWidget.h
   qclickablelabel.h
   QmitkBoundingObjectWidget.h
   QmitkCallbackFromGUIThread.h
   QmitkColorTransferFunctionCanvas.h
   QmitkCorrespondingPointSetsModel.h
   QmitkCorrespondingPointSetsView.h
   QmitkCorrespondingPointSetsWidget.h
   QmitkCrossWidget.h
   QmitkEditPointDialog.h
   QmitkFileChooser.h
   QmitkFloatingPointSpanSlider.h
   QmitkGnuplotWidget.h
   QmitkHistogramJSWidget.h
   QmitkHistogramWidget.h
   QmitkHotkeyLineEdit.h
   QmitkLineEdit.h
   QmitkPiecewiseFunctionCanvas.h
   QmitkPlotWidget.h
   QmitkPointListModel.h
   QmitkPointListView.h
   QmitkPointListViewWidget.h
   QmitkPointListWidget.h
   QmitkPrimitiveMovieNavigatorWidget.h
   QmitkSelectableGLWidget.h
   QmitkSliceWidget.h
   QmitkSliderNavigatorWidget.h
   QmitkStandardViews.h
   QmitkStepperAdapter.h
   QmitkTransferFunctionCanvas.h
   QmitkTransferFunctionGeneratorWidget.h
   QmitkTransferFunctionWidget.h
   QmitkVideoBackground.h
   QmitkWebPage.h
 )
 
 set(UI_FILES
   QmitkAboutDialog/QmitkAboutDialogGUI.ui
   QmitkGnuplotWidget.ui
   QmitkPrimitiveMovieNavigatorWidget.ui
   QmitkSelectableGLWidget.ui
   QmitkSliceWidget.ui
   QmitkSliderNavigator.ui
   QmitkTransferFunctionGeneratorWidget.ui
   QmitkTransferFunctionWidget.ui
 )
 
 set(QRC_FILES
   resources/QtWidgetsExt.qrc
 )
diff --git a/Plugins/org.mitk.gui.qt.ext/src/internal/QmitkCommonExtPlugin.cpp b/Plugins/org.mitk.gui.qt.ext/src/internal/QmitkCommonExtPlugin.cpp
index d4e116e005..4b5f8951d6 100644
--- a/Plugins/org.mitk.gui.qt.ext/src/internal/QmitkCommonExtPlugin.cpp
+++ b/Plugins/org.mitk.gui.qt.ext/src/internal/QmitkCommonExtPlugin.cpp
@@ -1,257 +1,257 @@
 /*===================================================================
 
 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.
 
 ===================================================================*/
 
 #include "QmitkCommonExtPlugin.h"
 
-#include <QmitkExtRegisterClasses.h>
+#include <QtWidgetsExtRegisterClasses.h>
 
 #include "QmitkAppInstancesPreferencePage.h"
 #include "QmitkExternalProgramsPreferencePage.h"
 #include "QmitkInputDevicesPrefPage.h"
 
 #include "QmitkModuleView.h"
 
 #include <mitkDataNodeFactory.h>
 #include <mitkIDataStorageService.h>
 #include <mitkSceneIO.h>
 #include <mitkProgressBar.h>
 #include <mitkRenderingManager.h>
 
 #include <berryPlatformUI.h>
 #include <berryIPreferencesService.h>
 
 #include <Poco/Util/OptionProcessor.h>
 
 #include <QProcess>
 #include <QMainWindow>
 #include <QtPlugin>
 #include <berryIPreferencesService.h>
 #include "berryPlatform.h"
 #include <QMessageBox>
 
 ctkPluginContext* QmitkCommonExtPlugin::_context = 0;
 
 void QmitkCommonExtPlugin::start(ctkPluginContext* context)
 {
   this->_context = context;
 
-  QmitkExtRegisterClasses();
+  QtWidgetsExtRegisterClasses();
 
   BERRY_REGISTER_EXTENSION_CLASS(QmitkAppInstancesPreferencePage, context)
   BERRY_REGISTER_EXTENSION_CLASS(QmitkExternalProgramsPreferencePage, context)
   BERRY_REGISTER_EXTENSION_CLASS(QmitkInputDevicesPrefPage, context)
 
   BERRY_REGISTER_EXTENSION_CLASS(QmitkModuleView, context)
 
   if (qApp->metaObject()->indexOfSignal("messageReceived(QByteArray)") > -1)
   {
     connect(qApp, SIGNAL(messageReceived(QByteArray)), this, SLOT(handleIPCMessage(QByteArray)));
   }
 
   std::vector<std::string> args = berry::Platform::GetApplicationArgs();
   QStringList qargs;
   for (std::vector<std::string>::const_iterator it = args.begin(); it != args.end(); ++it)
   {
     qargs << QString::fromStdString(*it);
   }
   // This is a potentially long running operation.
   loadDataFromDisk(qargs, true);
 }
 
 void QmitkCommonExtPlugin::stop(ctkPluginContext* context)
 {
   Q_UNUSED(context)
 
   this->_context = 0;
 }
 
 ctkPluginContext* QmitkCommonExtPlugin::getContext()
 {
   return _context;
 }
 
 void QmitkCommonExtPlugin::loadDataFromDisk(const QStringList &arguments, bool globalReinit)
 {
   if (!arguments.empty())
   {
     ctkServiceReference serviceRef = _context->getServiceReference<mitk::IDataStorageService>();
     if (serviceRef)
     {
        mitk::IDataStorageService* dataStorageService = _context->getService<mitk::IDataStorageService>(serviceRef);
        mitk::DataStorage::Pointer dataStorage = dataStorageService->GetDefaultDataStorage()->GetDataStorage();
 
        int argumentsAdded = 0;
        for (int i = 0; i < arguments.size(); ++i)
        {
          if (arguments[i].right(5) == ".mitk")
          {
            mitk::SceneIO::Pointer sceneIO = mitk::SceneIO::New();
 
            bool clearDataStorageFirst(false);
            mitk::ProgressBar::GetInstance()->AddStepsToDo(2);
            dataStorage = sceneIO->LoadScene( arguments[i].toLocal8Bit().constData(), dataStorage, clearDataStorageFirst );
            mitk::ProgressBar::GetInstance()->Progress(2);
            argumentsAdded++;
          }
          else
          {
            mitk::DataNodeFactory::Pointer nodeReader = mitk::DataNodeFactory::New();
            try
            {
              nodeReader->SetFileName(arguments[i].toStdString());
              nodeReader->Update();
              for (unsigned int j = 0 ; j < nodeReader->GetNumberOfOutputs( ); ++j)
              {
                mitk::DataNode::Pointer node = nodeReader->GetOutput(j);
                if (node->GetData() != 0)
                {
                  dataStorage->Add(node);
                  argumentsAdded++;
                }
              }
            }
            catch(...)
            {
              MITK_WARN << "Failed to load command line argument: " << arguments[i].toStdString();
            }
          }
        } // end for each command line argument
 
        if (argumentsAdded > 0 && globalReinit)
        {
          // calculate bounding geometry
          mitk::RenderingManager::GetInstance()->InitializeViews(dataStorage->ComputeBoundingGeometry3D());
        }
     }
     else
     {
       MITK_ERROR << "A service reference for mitk::IDataStorageService does not exist";
     }
   }
 }
 
 void QmitkCommonExtPlugin::startNewInstance(const QStringList &args, const QStringList& files)
 {
   QStringList newArgs(args);
 #ifdef Q_OS_UNIX
   newArgs << QString("--") + QString::fromStdString(berry::Platform::ARG_NEWINSTANCE);
 #else
   newArgs << QString("/") + QString::fromStdString(berry::Platform::ARG_NEWINSTANCE);
 #endif
   newArgs << files;
   QProcess::startDetached(qApp->applicationFilePath(), newArgs);
 }
 
 void QmitkCommonExtPlugin::handleIPCMessage(const QByteArray& msg)
 {
   QDataStream ds(msg);
   QString msgType;
   ds >> msgType;
 
   // we only handle messages containing command line arguments
   if (msgType != "$cmdLineArgs") return;
 
   // activate the current workbench window
   berry::IWorkbenchWindow::Pointer window =
       berry::PlatformUI::GetWorkbench()->GetActiveWorkbenchWindow();
 
   QMainWindow* mainWindow =
    static_cast<QMainWindow*> (window->GetShell()->GetControl());
 
   mainWindow->setWindowState(mainWindow->windowState() & ~Qt::WindowMinimized);
   mainWindow->raise();
   mainWindow->activateWindow();
 
   // Get the preferences for the instantiation behavior
   berry::IPreferencesService::Pointer prefService
       = berry::Platform::GetServiceRegistry()
       .GetServiceById<berry::IPreferencesService>(berry::IPreferencesService::ID);
   berry::IPreferences::Pointer prefs = prefService->GetSystemPreferences()->Node("/General");
   bool newInstanceAlways = prefs->GetBool("newInstance.always", false);
   bool newInstanceScene = prefs->GetBool("newInstance.scene", true);
 
   QStringList args;
   ds >> args;
 
   QStringList fileArgs;
   QStringList sceneArgs;
 
   Poco::Util::OptionSet os;
   berry::Platform::GetOptionSet(os);
   Poco::Util::OptionProcessor processor(os);
 #if !defined(POCO_OS_FAMILY_UNIX)
   processor.setUnixStyle(false);
 #endif
   args.pop_front();
   QStringList::Iterator it = args.begin();
   while (it != args.end())
   {
     std::string name;
     std::string value;
     if (processor.process(it->toStdString(), name, value))
     {
       ++it;
     }
     else
     {
       if (it->endsWith(".mitk"))
       {
         sceneArgs << *it;
       }
       else
       {
         fileArgs << *it;
       }
       it = args.erase(it);
     }
   }
 
   if (newInstanceAlways)
   {
     if (newInstanceScene)
     {
       startNewInstance(args, fileArgs);
 
       foreach(QString sceneFile, sceneArgs)
       {
         startNewInstance(args, QStringList(sceneFile));
       }
     }
     else
     {
       fileArgs.append(sceneArgs);
       startNewInstance(args, fileArgs);
     }
   }
   else
   {
     loadDataFromDisk(fileArgs, false);
     if (newInstanceScene)
     {
       foreach(QString sceneFile, sceneArgs)
       {
         startNewInstance(args, QStringList(sceneFile));
       }
     }
     else
     {
       loadDataFromDisk(sceneArgs, false);
     }
   }
 
 }
 
 Q_EXPORT_PLUGIN2(org_mitk_gui_qt_ext, QmitkCommonExtPlugin)