diff --git a/CoreUI/Bundles/org.mitk.core.services/src/internal/mitkPluginActivator.h b/CoreUI/Bundles/org.mitk.core.services/src/internal/mitkPluginActivator.h
index 85a5aabfd3..aad76afeff 100644
--- a/CoreUI/Bundles/org.mitk.core.services/src/internal/mitkPluginActivator.h
+++ b/CoreUI/Bundles/org.mitk.core.services/src/internal/mitkPluginActivator.h
@@ -1,52 +1,51 @@
 /*=========================================================================
 
 Program:   Medical Imaging & Interaction Toolkit
 Language:  C++
 Date:      $Date$
 Version:   $Revision$
 
 Copyright (c) German Cancer Research Center, Division of Medical and
 Biological Informatics. All rights reserved.
 See MITKCopyright.txt or http://www.mitk.org/copyright.html for details.
 
 This software is distributed WITHOUT ANY WARRANTY; without even
 the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
 PURPOSE.  See the above copyright notices for more information.
 
 =========================================================================*/
 
 #ifndef MITKCORESERVICESPLUGIN_H_
 #define MITKCORESERVICESPLUGIN_H_
 
 #include <berryPlugin.h>
 #include <berryIBundleContext.h>
 
-#include "mitkCoreServicesPluginDll.h"
 #include "mitkIDataStorageService.h"
 
 namespace mitk
 {
 
-class MITK_CORE_SERVICES_PLUGIN org_mitk_core_services_Activator : public QObject, public ctkPluginActivator
+class org_mitk_core_services_Activator : public QObject, public ctkPluginActivator
 {
   Q_OBJECT
   Q_INTERFACES(ctkPluginActivator)
 
 public:
   
   static const std::string PLUGIN_ID;
   
   void start(ctkPluginContext* context);
   void stop(ctkPluginContext* context);
 
 private:
 
   mitk::IDataStorageService::Pointer dataStorageService;
   
 };
 
 typedef org_mitk_core_services_Activator PluginActivator;
 
 }
 
 #endif /*MITKCORESERVICESPLUGIN_H_*/
diff --git a/CoreUI/Bundles/org.mitk.core.services/src/mitkCoreServicesPluginDll.h b/CoreUI/Bundles/org.mitk.core.services/src/mitkCoreServicesPluginDll.h
deleted file mode 100644
index f1fc12926f..0000000000
--- a/CoreUI/Bundles/org.mitk.core.services/src/mitkCoreServicesPluginDll.h
+++ /dev/null
@@ -1,43 +0,0 @@
-/*=========================================================================
- 
-Program:   Medical Imaging & Interaction Toolkit
-Language:  C++
-Date:      $Date$
-Version:   $Revision$
- 
-Copyright (c) German Cancer Research Center, Division of Medical and
-Biological Informatics. All rights reserved.
-See MITKCopyright.txt or http://www.mitk.org/copyright.html for details.
- 
-This software is distributed WITHOUT ANY WARRANTY; without even
-the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
-PURPOSE.  See the above copyright notices for more information.
- 
-=========================================================================*/
-
-#ifndef MITKCORESERVICESPLUGINDLL_H_
-#define MITKCORESERVICESPLUGINDLL_H_
-
-
-//
-// The following block is the standard way of creating macros which make exporting 
-// from a DLL simpler. All files within this DLL are compiled with the MITK_EXPORTS
-// symbol defined on the command line. this symbol should not be defined on any project
-// that uses this DLL. This way any other project whose source files include this file see 
-// MITK_API functions as being imported from a DLL, wheras this DLL sees symbols
-// defined with this macro as being exported.
-//
-#if defined(_WIN32)  // && !defined(MITK_STATIC)
-  #if defined(org_mitk_core_services_EXPORTS)
-    #define MITK_CORE_SERVICES_PLUGIN __declspec(dllexport)
-  #else
-    #define MITK_CORE_SERVICES_PLUGIN __declspec(dllimport)  
-  #endif
-#endif
-
-
-#if !defined(MITK_CORE_SERVICES_PLUGIN)
-  #define MITK_CORE_SERVICES_PLUGIN
-#endif
-
-#endif /*MITKCORESERVICESPLUGINDLL_H_*/
diff --git a/CoreUI/Bundles/org.mitk.core.services/src/mitkIDataStorageReference.h b/CoreUI/Bundles/org.mitk.core.services/src/mitkIDataStorageReference.h
index d1335f581c..73630284de 100644
--- a/CoreUI/Bundles/org.mitk.core.services/src/mitkIDataStorageReference.h
+++ b/CoreUI/Bundles/org.mitk.core.services/src/mitkIDataStorageReference.h
@@ -1,48 +1,48 @@
 /*=========================================================================
 
 Program:   Medical Imaging & Interaction Toolkit
 Language:  C++
 Date:      $Date$
 Version:   $Revision$
 
 Copyright (c) German Cancer Research Center, Division of Medical and
 Biological Informatics. All rights reserved.
 See MITKCopyright.txt or http://www.mitk.org/copyright.html for details.
 
 This software is distributed WITHOUT ANY WARRANTY; without even
 the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
 PURPOSE.  See the above copyright notices for more information.
 
 =========================================================================*/
 
 #ifndef MITKIDATASTORAGEREFERENCE_H_
 #define MITKIDATASTORAGEREFERENCE_H_
 
 #include <berryObject.h>
 #include <berryMacros.h>
 
-#include "mitkCoreServicesPluginDll.h"
+#include <org_mitk_core_services_Export.h>
 
 #include <mitkDataStorage.h>
 
 namespace mitk
 {
 
 struct MITK_CORE_SERVICES_PLUGIN IDataStorageReference : public berry::Object
 {
   berryInterfaceMacro(IDataStorageReference, mitk);
 
 
   virtual DataStorage::Pointer GetDataStorage() const = 0;
 
   virtual bool IsDefault() const = 0;
 
   virtual std::string GetLabel() const = 0;
   virtual void SetLabel(const std::string& label) = 0;
 
   virtual bool operator==(const IDataStorageReference* o) const = 0;
 };
 
 }
 
 #endif /*MITKIDATASTORAGEREFERENCE_H_*/
diff --git a/CoreUI/Bundles/org.mitk.core.services/src/mitkIDataStorageService.h b/CoreUI/Bundles/org.mitk.core.services/src/mitkIDataStorageService.h
index 01bcb01254..4bbfcc94ad 100644
--- a/CoreUI/Bundles/org.mitk.core.services/src/mitkIDataStorageService.h
+++ b/CoreUI/Bundles/org.mitk.core.services/src/mitkIDataStorageService.h
@@ -1,52 +1,52 @@
 /*=========================================================================
 
 Program:   Medical Imaging & Interaction Toolkit
 Language:  C++
 Date:      $Date$
 Version:   $Revision$
 
 Copyright (c) German Cancer Research Center, Division of Medical and
 Biological Informatics. All rights reserved.
 See MITKCopyright.txt or http://www.mitk.org/copyright.html for details.
 
 This software is distributed WITHOUT ANY WARRANTY; without even
 the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
 PURPOSE.  See the above copyright notices for more information.
 
 =========================================================================*/
 
 #ifndef MITKIDATASTORAGESERVICE_H_
 #define MITKIDATASTORAGESERVICE_H_
 
 #include <berryService.h>
 
-#include "mitkCoreServicesPluginDll.h"
+#include <org_mitk_core_services_Export.h>
 #include "mitkIDataStorageReference.h"
 
 #include <string>
 
 #include <QtPlugin>
 
 namespace mitk
 {
 
 struct MITK_CORE_SERVICES_PLUGIN IDataStorageService : public berry::Service
 {
   berryInterfaceMacro(IDataStorageService, berry);
 
   static const std::string ID;
 
   virtual IDataStorageReference::Pointer CreateDataStorage(const std::string& label) = 0;
   virtual std::vector<IDataStorageReference::Pointer> GetDataStorageReferences() const = 0;
 
   virtual IDataStorageReference::Pointer GetDefaultDataStorage() const = 0;
 
   virtual IDataStorageReference::Pointer GetActiveDataStorage() const = 0;
   virtual void SetActiveDataStorage(IDataStorageReference::Pointer dataStorageRef) = 0;
 };
 
 }
 
 Q_DECLARE_INTERFACE(mitk::IDataStorageService, "org.mitk.service.IDataStorageService")
 
 #endif /*MITKIDATASTORAGESERVICE_H_*/