diff --git a/BlueBerry/Bundles/org.blueberry.ui.qt/src/internal/util/berryAbstractTabItem.h b/BlueBerry/Bundles/org.blueberry.ui.qt/src/internal/util/berryAbstractTabItem.h
index 12c247afa0..d2295dd6d5 100755
--- a/BlueBerry/Bundles/org.blueberry.ui.qt/src/internal/util/berryAbstractTabItem.h
+++ b/BlueBerry/Bundles/org.blueberry.ui.qt/src/internal/util/berryAbstractTabItem.h
@@ -1,50 +1,52 @@
 /*=========================================================================
 
  Program:   BlueBerry Platform
  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 BERRYABSTRACTTABITEM_H_
 #define BERRYABSTRACTTABITEM_H_
 
 #include <QRect>
 #include <berryObject.h>
 
 #include "berryPartInfo.h"
 
+#include <org_blueberry_ui_qt_Export.h>
+
 namespace berry {
 
-struct AbstractTabItem {
+struct BERRY_UI_QT AbstractTabItem {
 
     virtual ~AbstractTabItem();
 
     virtual QRect GetBounds() = 0;
     virtual void SetInfo(const PartInfo& info) = 0;
     virtual void Dispose() = 0;
 
     virtual void SetBusy(bool  /*busy*/) {}
     virtual void SetBold(bool  /*bold*/) {}
 
     virtual Object::Pointer GetData() = 0;
     virtual void SetData(Object::Pointer data) = 0;
 
     virtual bool IsShowing() { return true; }
 
 };
 
 }
 
 
 #endif /* BERRYABSTRACTTABITEM_H_ */
diff --git a/BlueBerry/Bundles/org.blueberry.ui.qt/src/internal/util/berryIPresentablePartList.h b/BlueBerry/Bundles/org.blueberry.ui.qt/src/internal/util/berryIPresentablePartList.h
index ea244b52ed..5613f956bb 100755
--- a/BlueBerry/Bundles/org.blueberry.ui.qt/src/internal/util/berryIPresentablePartList.h
+++ b/BlueBerry/Bundles/org.blueberry.ui.qt/src/internal/util/berryIPresentablePartList.h
@@ -1,47 +1,49 @@
 /*=========================================================================
 
  Program:   BlueBerry Platform
  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 BERRYIPRESENTABLEPARTLIST_H_
 #define BERRYIPRESENTABLEPARTLIST_H_
 
 #include <berryIPresentablePart.h>
 #include <vector>
 
+#include <org_blueberry_ui_qt_Export.h>
+
 namespace berry
 {
 
-struct IPresentablePartList
+struct BERRY_UI_QT IPresentablePartList
 {
 
   virtual ~IPresentablePartList();
 
   virtual void Insert(IPresentablePart::Pointer part, int idx) = 0;
 
   virtual void Remove(IPresentablePart::Pointer part) = 0;
 
   virtual void Move(IPresentablePart::Pointer part, int newIndex) = 0;
 
   virtual std::size_t Size() = 0;
 
   virtual void Select(IPresentablePart::Pointer part) = 0;
 
   virtual std::vector<IPresentablePart::Pointer> GetPartList() = 0;
 };
 
 }
 
 #endif /* BERRYIPRESENTABLEPARTLIST_H_ */
diff --git a/BlueBerry/Bundles/org.blueberry.ui.qt/src/internal/util/berryTabDragHandler.h b/BlueBerry/Bundles/org.blueberry.ui.qt/src/internal/util/berryTabDragHandler.h
index 35d72a9dc2..ba6076a73d 100755
--- a/BlueBerry/Bundles/org.blueberry.ui.qt/src/internal/util/berryTabDragHandler.h
+++ b/BlueBerry/Bundles/org.blueberry.ui.qt/src/internal/util/berryTabDragHandler.h
@@ -1,50 +1,52 @@
 /*=========================================================================
 
  Program:   BlueBerry Platform
  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 BERRYTABDRAGHANDLER_H_
 #define BERRYTABDRAGHANDLER_H_
 
 #include <berryStackDropResult.h>
 
 #include <QWidget>
 #include <QPoint>
 
+#include <org_blueberry_ui_qt_Export.h>
+
 namespace berry {
 
-struct TabDragHandler {
+struct BERRY_UI_QT TabDragHandler {
 
     virtual ~TabDragHandler();
 
     /**
      * Returns the StackDropResult for the location being dragged over.
      *
      * @param currentControl control being dragged over
      * @param location mouse position (display coordinates)
      * @param initialTab the index of the tab in this stack being dragged,
      *      or -1 if dragging a tab from another stack.
      * @return the StackDropResult for this drag location
      */
     virtual StackDropResult::Pointer DragOver(QWidget* currentControl,
             const Point& location, int initialTab) = 0;
 
     virtual int GetInsertionPosition(Object::Pointer cookie) = 0;
 };
 
 }
 
 #endif /* BERRYTABDRAGHANDLER_H_ */
diff --git a/BlueBerry/Bundles/org.blueberry.ui.qt/src/internal/util/berryTabOrder.h b/BlueBerry/Bundles/org.blueberry.ui.qt/src/internal/util/berryTabOrder.h
index 0f1d11f6ef..df2de93a44 100755
--- a/BlueBerry/Bundles/org.blueberry.ui.qt/src/internal/util/berryTabOrder.h
+++ b/BlueBerry/Bundles/org.blueberry.ui.qt/src/internal/util/berryTabOrder.h
@@ -1,82 +1,84 @@
 /*=========================================================================
 
  Program:   BlueBerry Platform
  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 = 0; without even
  the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
  PURPOSE.  See the above copyright notices for more information.
 
  =========================================================================*/
 
 
 #ifndef BERRYTABORDER_H_
 #define BERRYTABORDER_H_
 
 #include <berryIPresentablePart.h>
 #include <berryIPresentationSerializer.h>
 #include <berryIMemento.h>
 
+#include <org_blueberry_ui_qt_Export.h>
+
 namespace berry {
 
-struct TabOrder {
+struct BERRY_UI_QT TabOrder {
 
     virtual ~TabOrder();
   
     /**
      * Adds a part due to a user action that opened a part
      *
      * @param newPart part being added
      */
     virtual void Add(IPresentablePart::Pointer newPart) = 0;
 
     /**
      * Adds a part at initialization-time (the part was added as
      * part of a perspective, rather than by a user action)
      *
      * @param newPart the part being added
      */
     virtual void AddInitial(IPresentablePart::Pointer newPart) = 0;
 
     virtual void RestoreState(IPresentationSerializer* serializer,
             IMemento::Pointer savedState) = 0;
 
     virtual void SaveState(IPresentationSerializer* serializer, IMemento::Pointer memento) = 0;
 
     /**
      * Adds a part at a particular index due to a drag/drop operation.
      *
      * @param added part being added
      * @param index index where the part is added at
      */
     virtual void Insert(IPresentablePart::Pointer added, int index) = 0;
 
     virtual void Move(IPresentablePart::Pointer toMove, int newIndex) = 0;
 
     /**
      * Removes a part
      *
      * @param removed part being removed
      */
     virtual void Remove(IPresentablePart::Pointer removed) = 0;
 
     /**
      * Selects a part
      *
      * @param selected part being selected
      */
     virtual void Select(IPresentablePart::Pointer selected) = 0;
 
     virtual std::vector<IPresentablePart::Pointer> GetPartList() = 0;
 };
 
 }
 
 
 #endif /* BERRYTABORDER_H_ */
diff --git a/BlueBerry/Bundles/org.blueberry.ui/files.cmake b/BlueBerry/Bundles/org.blueberry.ui/files.cmake
index 48db465ead..433eb9869e 100644
--- a/BlueBerry/Bundles/org.blueberry.ui/files.cmake
+++ b/BlueBerry/Bundles/org.blueberry.ui/files.cmake
@@ -1,304 +1,305 @@
 set(MOC_H_FILES
   src/internal/berryWorkbenchPlugin.h
   src/internal/intro/berryEditorIntroAdapterPart.h
   src/berryWorkbenchPart.h
   src/berryEditorPart.h
   src/berryViewPart.h
   src/intro/berryIntroPart.h
 )
 
 set(CACHED_RESOURCE_FILES
   plugin.xml
 )
 
 set(SRC_CPP_FILES
   berryAbstractSourceProvider.cpp
   berryAbstractUIPlugin.cpp
   berryAbstractUICTKPlugin.cpp
   berryConstants.cpp
   berryDisplay.cpp
   berryEditorPart.cpp
   berryFileEditorInput.cpp
   berryGeometry.cpp
   berryIDropTargetListener.cpp
   berryIEditorDescriptor.cpp
   berryIEditorInput.cpp
   berryIEditorMatchingStrategy.cpp
   berryIEditorPart.cpp
   berryIEditorReference.cpp
   berryIEditorRegistry.cpp
   berryIEditorSite.cpp
   berryIFileEditorMapping.cpp
   berryIFolderLayout.cpp
   berryImageDescriptor.cpp
   berryIMemento.cpp
   berryINullSelectionListener.cpp
   berryIPageLayout.cpp
   berryIPartListener.cpp
   berryIPageService.cpp
   berryIPartService.cpp
   berryIPathEditorInput.cpp
   berryIPerspectiveDescriptor.cpp
   berryIPerspectiveFactory.cpp
   berryIPerspectiveListener.cpp
   berryIPerspectiveRegistry.cpp
   berryIPlaceholderFolderLayout.cpp
   berryIPostSelectionProvider.cpp
   berryIPreferencePage.cpp
   berryIPropertyChangeListener.cpp
   berryIReusableEditor.cpp
   berryISaveablePart.cpp
   berryISaveablesLifecycleListener.cpp
   berryISaveablesSource.cpp
   berryISelection.cpp
   berryISelectionChangedListener.cpp
   berryISelectionListener.cpp
   berryISelectionProvider.cpp
   berryISelectionService.cpp
   berryIShellListener.cpp
   berryIShellProvider.cpp
   berryISizeProvider.cpp
   berryISourceProvider.cpp
   berryISourceProviderListener.cpp
   berryISources.cpp
   berryIStickyViewDescriptor.cpp
   berryIStructuredSelection.cpp
   berryIViewCategory.cpp
   berryIViewDescriptor.cpp
   berryIViewLayout.cpp
   berryIViewPart.cpp
   berryIViewReference.cpp
   berryIViewRegistry.cpp
   berryIViewSite.cpp
   berryIWindowListener.cpp
   berryIWorkbench.cpp
   berryIWorkbenchListener.cpp
   berryIWorkbenchPage.cpp
   berryIWorkbenchPart.cpp
   berryIWorkbenchPartConstants.cpp
   berryIWorkbenchPartDescriptor.cpp
   berryIWorkbenchPartReference.cpp
   berryIWorkbenchPartSite.cpp
   berryIWorkbenchSite.cpp
   berryIWorkbenchWindow.cpp
   berryPlatformUI.cpp
   berryPoint.cpp
   berryPropertyChangeEvent.cpp
   berryRectangle.cpp
   berrySameShellProvider.cpp
   berrySaveable.cpp
   berrySaveablesLifecycleEvent.cpp
   berrySelectionChangedEvent.cpp
   berryShell.cpp
   berryShellEvent.cpp
   berryUIException.cpp
   berryViewPart.cpp
   berryWindow.cpp
   berryWorkbenchPart.cpp
   berryWorkbenchPreferenceConstants.cpp
   berryXMLMemento.cpp
   
   #application
   application/berryActionBarAdvisor.cpp
   application/berryIActionBarConfigurer.cpp
   application/berryIWorkbenchConfigurer.cpp
   application/berryIWorkbenchWindowConfigurer.cpp
   application/berryWorkbenchAdvisor.cpp
   application/berryWorkbenchWindowAdvisor.cpp
   
   #commands
   #commands/berryAbstractContributionFactory.cpp
   #commands/berryCommandContributionItem.cpp
   #commands/berryCommandContributionItemParameter.cpp
   #commands/berryContributionItem.cpp
   #commands/berryContributionManager.cpp
   #commands/berryICommandImageService.cpp
   #commands/berryICommandService.cpp
   #commands/berryIContributionManagerOverrides.cpp
   #commands/berryIMenuItem.cpp
   #commands/berryIMenuItemListener.cpp
   #commands/berryIMenuListener.cpp
   #commands/berryIToolItemListener.cpp
   #commands/berryIUIElementListener.cpp
   #commands/berryMenuManager.cpp
   #commands/berrySubContributionItem.cpp
   #commands/berryUIElement.cpp
   
   #dialogs
   dialogs/berryIDialog.cpp
   dialogs/berryIShowViewDialog.cpp
   dialogs/berryMessageDialog.cpp
   
   #guitk
   guitk/berryGuiTkControlEvent.cpp
   guitk/berryGuiTkEvent.cpp
   guitk/berryGuiTkIControlListener.cpp
   guitk/berryGuiTkIMenuListener.cpp
   guitk/berryGuiTkISelectionListener.cpp
   guitk/berryGuiTkSelectionEvent.cpp
   
   #handlers
   handlers/berryHandlerUtil.cpp
   handlers/berryIHandlerActivation.cpp
+  handlers/berryIHandlerService.cpp
   handlers/berryShowViewHandler.cpp
   
   #src
   intro/berryIIntroManager.cpp
   intro/berryIntroPart.cpp
   intro/berryIIntroPart.cpp
   intro/berryIIntroSite.cpp
 
   #services
   services/berryIDisposable.cpp
   services/berryINestable.cpp
   services/berryIServiceFactory.cpp
   services/berryIServiceLocator.cpp
   services/berryIServiceWithSources.cpp
   
   #tweaklets
   tweaklets/berryDnDTweaklet.cpp
   tweaklets/berryGuiWidgetsTweaklet.cpp
   tweaklets/berryImageTweaklet.cpp
   tweaklets/berryMessageDialogTweaklet.cpp
   tweaklets/berryITracker.cpp
   tweaklets/berryWorkbenchPageTweaklet.cpp
   tweaklets/berryWorkbenchTweaklet.cpp
   
   #presentations
   presentations/berryIPresentablePart.cpp
   presentations/berryIPresentationFactory.cpp
   presentations/berryIPresentationSerializer.cpp
   presentations/berryIStackPresentationSite.cpp
   presentations/berryStackDropResult.cpp
   presentations/berryStackPresentation.cpp
   
   #testing
   testing/berryTestableObject.cpp
   
   #util
   util/berryISafeRunnableRunner.cpp
   util/berrySafeRunnable.cpp
   
 )
 
 
 set(INTERNAL_CPP_FILES
 
   #intro
   intro/berryEditorIntroAdapterPart.cpp
   intro/berryIIntroDescriptor.cpp
   intro/berryIIntroRegistry.cpp
   intro/berryIntroConstants.cpp
   intro/berryIntroDescriptor.cpp
   intro/berryIntroPartAdapterSite.cpp
   intro/berryIntroRegistry.cpp
   intro/berryViewIntroAdapterPart.cpp
   intro/berryWorkbenchIntroManager.cpp
   
   berryAbstractPartSelectionTracker.cpp
   berryAbstractSelectionService.cpp
   berryBundleUtility.cpp
   berryContainerPlaceholder.cpp
   berryDetachedPlaceHolder.cpp
   berryDefaultSaveable.cpp
   berryDefaultStackPresentationSite.cpp
   berryDetachedWindow.cpp
   berryDragUtil.cpp
   berryEditorAreaHelper.cpp
   berryEditorDescriptor.cpp
   berryEditorManager.cpp
   berryEditorReference.cpp
   berryEditorRegistry.cpp
   berryEditorRegistryReader.cpp
   berryEditorSashContainer.cpp
   berryEditorSite.cpp
   berryErrorViewPart.cpp
   berryFileEditorMapping.cpp
   berryFolderLayout.cpp
   berryIDragOverListener.cpp
   berryIDropTarget.cpp
   berryIEvaluationResultCache.cpp
   berryIEvaluationResultCache.cpp
   berryILayoutContainer.cpp
   berryILayoutContainer.cpp
   berryIServiceLocatorCreator.cpp
   berryIStackableContainer.cpp
   berryIStickyViewManager.cpp
   berryIWorkbenchLocationService.cpp
   berryIWorkbenchLocationService.cpp
   berryLayoutHelper.cpp
   berryLayoutPart.cpp
   berryLayoutPartSash.cpp
   berryLayoutTree.cpp
   berryLayoutTreeNode.cpp
   berryNullEditorInput.cpp
   berryPageLayout.cpp
   berryPagePartSelectionTracker.cpp
   berryPageSelectionService.cpp
   berryPartList.cpp
   berryPartPane.cpp
   berryPartPlaceholder.cpp
   berryPartSashContainer.cpp
   berryPartService.cpp
   berryPartSite.cpp
   berryPartStack.cpp
   berryPartTester.cpp
   berryPerspective.cpp
   berryPerspectiveDescriptor.cpp
   berryPerspectiveExtensionReader.cpp
   berryPerspectiveHelper.cpp
   berryPerspectiveRegistry.cpp
   berryPerspectiveRegistryReader.cpp
   berryPlaceholderFolderLayout.cpp
   berryPreferenceConstants.cpp
   berryPresentablePart.cpp
   berryPresentationFactoryUtil.cpp
   berryPresentationSerializer.cpp
   berryQtControlWidget.cpp
   berryQtDnDControlWidget.cpp
   berryQtWidgetController.cpp
   berryRegistryReader.cpp
   berrySaveablesList.cpp
   berryServiceLocator.cpp
   berryServiceLocatorCreator.cpp
   berryShellPool.cpp
   berrySourcePriorityNameMapping.cpp
   berryStackablePart.cpp
   berryStickyViewDescriptor.cpp
   berryStickyViewManager.cpp
   berryTweaklets.cpp
   berryViewDescriptor.cpp
   berryViewFactory.cpp
   berryViewLayout.cpp
   berryViewReference.cpp
   berryViewRegistry.cpp
   berryViewRegistryReader.cpp
   berryViewSashContainer.cpp
   berryViewSite.cpp
   berryWorkbenchPage.cpp
   berryWindowManager.cpp
   berryWindowPartSelectionTracker.cpp
   berryWindowSelectionService.cpp
   berryWorkbench.cpp
   berryWorkbenchConfigurer.cpp
   berryWorkbenchConstants.cpp
   berryWorkbenchPagePartList.cpp
   berryWorkbenchPartReference.cpp
   berryWorkbenchPlugin.cpp
   berryWorkbenchRegistryConstants.cpp
   berryWorkbenchServiceRegistry.cpp
   berryWorkbenchTestable.cpp
   berryWorkbenchWindow.cpp
   berryWorkbenchWindowConfigurer.cpp
   berryWWinPartService.cpp
 )
 
 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/BlueBerry/Bundles/org.blueberry.ui/src/berryINullSelectionListener.h b/BlueBerry/Bundles/org.blueberry.ui/src/berryINullSelectionListener.h
index 07cef5753d..819d979bd9 100644
--- a/BlueBerry/Bundles/org.blueberry.ui/src/berryINullSelectionListener.h
+++ b/BlueBerry/Bundles/org.blueberry.ui/src/berryINullSelectionListener.h
@@ -1,102 +1,102 @@
 /*=========================================================================
  
  Program:   BlueBerry Platform
  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 BERRYINULLSELECTIONLISTENER_H_
 #define BERRYINULLSELECTIONLISTENER_H_
 
 #include "berryISelectionListener.h"
 
 namespace berry
 {
 
 /**
  * Interface for listening to <code>null</code> selection changes.
  * <p>
  * This interface should be implemented by selection listeners
  * that want to be notified when the selection becomes <code>null</code>.
  * It has no methods. It simply indicates the desire to receive
  * <code>null</code> selection events through the existing
  * <code>SelectionChanged()</code> method. Either the part or the
  * selection may be <code>null</code>.
  * </p>
  *
  * @see ISelectionListener#SelectionChanged()
  * @see IActionDelegate#SelectionChanged()
  * @see ISelectionListener
  *
  */
-struct INullSelectionListener : public ISelectionListener {
+struct BERRY_UI INullSelectionListener : public ISelectionListener {
   berryInterfaceMacro(INullSelectionListener, berry)
 
   ~INullSelectionListener();
 };
 
 /**
  * \ingroup org_blueberry_ui
  *
  * This template can be used like this:
  *
  * <code>
  * class MyClass {
  *
  *   private:
  *     void HandleSelectionChanged(berry::IWorkbenchPart::Pointer part, berry::ISelection::ConstPointer selection)
  *     { // do something }
  *
  *     berry::INullSelectionListener::Pointer m_SelectionListener;
  *
  *   public:
  *     MyClass()
  *     : m_SelectionListener(new berry::NullSelectionChangedAdapter<MyClass>(this, &MyClass::HandleSelectionChanged))
  *     {
  *       // get the selection service
  *       // ...
  *       service->AddPostSelectionListener(m_SelectionListener);
  *     }
  * };
  * </code>
  */
 template<typename R>
 struct NullSelectionChangedAdapter: public INullSelectionListener
 {
 
   typedef R Listener;
   typedef void
       (R::*Callback)(IWorkbenchPart::Pointer, ISelection::ConstPointer);
 
   NullSelectionChangedAdapter(R* l, Callback c) :
     listener(l), callback(c)
   {
     poco_assert(listener);
     poco_assert(callback);
   }
 
   void SelectionChanged(IWorkbenchPart::Pointer part, ISelection::ConstPointer selection)
   {
     (listener->*callback)(part, selection);
   }
 
 private:
 
   Listener* listener;
   Callback callback;
 };
 
 }
 
 #endif /* BERRYINULLSELECTIONLISTENER_H_ */
diff --git a/BlueBerry/Bundles/org.blueberry.ui/src/berryIPerspectiveRegistry.h b/BlueBerry/Bundles/org.blueberry.ui/src/berryIPerspectiveRegistry.h
index 24f4d266b8..d32b44af34 100644
--- a/BlueBerry/Bundles/org.blueberry.ui/src/berryIPerspectiveRegistry.h
+++ b/BlueBerry/Bundles/org.blueberry.ui/src/berryIPerspectiveRegistry.h
@@ -1,131 +1,131 @@
 /*=========================================================================
  
 Program:   BlueBerry Platform
 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 BERRYIPERSPECTIVEREGISTRY_H_
 #define BERRYIPERSPECTIVEREGISTRY_H_
 
 #include "berryIPerspectiveDescriptor.h"
 
 #include <vector>
 
 namespace berry {
 
 /**
  * \ingroup org_blueberry_ui
  * 
  * The workbench's global registry of perspectives. 
  * <p>
  * This registry contains a descriptor for each perspectives in the workbench.
  * It is initially populated with stock perspectives from the workbench's 
  * perspective extension point (<code>"org.blueberry.ui.perspectives"</code>) and 
  * with custom perspectives defined by the user.
  * </p><p>
  * This interface is not intended to be implemented by clients.
  * </p>
  * @see IWorkbench#getPerspectiveRegistry
  * @noimplement This interface is not intended to be implemented by clients.
  */
-struct IPerspectiveRegistry {
+struct BERRY_UI IPerspectiveRegistry {
 
     virtual ~IPerspectiveRegistry();
   
     /**
      * Clones an existing perspective.
      * 
      * @param id the id for the cloned perspective, which must not already be used by 
      *   any registered perspective
      * @param label the label assigned to the cloned perspective
      * @param desc the perspective to clone
      * @return the cloned perspective descriptor
      * @throws IllegalArgumentException if there is already a perspective with the given id 
      * 
      * @since 3.0
      */
     virtual IPerspectiveDescriptor::Pointer ClonePerspective(const std::string& id, const std::string& label,
             IPerspectiveDescriptor::Pointer desc) = 0;
 
   /**
    * Deletes a perspective. Has no effect if the perspective is defined in an
    * extension.
    * 
    * @param persp the perspective to delete
    * @since 3.2
    */
   virtual void DeletePerspective(IPerspectiveDescriptor::Pointer persp) = 0;
     
     /**
      * Finds and returns the registered perspective with the given perspective id.
      *
      * @param perspectiveId the perspective id 
      * @return the perspective, or <code>null</code> if none
      * @see IPerspectiveDescriptor#getId
      */
     virtual IPerspectiveDescriptor::Pointer FindPerspectiveWithId(const std::string& perspectiveId) = 0;
 
     /**
      * Finds and returns the registered perspective with the given label.
      *
      * @param label the label
      * @return the perspective, or <code>null</code> if none
      * @see IPerspectiveDescriptor#getLabel
      */
     virtual IPerspectiveDescriptor::Pointer FindPerspectiveWithLabel(const std::string& label) = 0;
 
     /**
      * Returns the id of the default perspective for the workbench.  This identifies one
      * perspective extension within the workbench's perspective registry.
      * <p>
      * Returns <code>null</code> if there is no default perspective.
      * </p> 
      *
      * @return the default perspective id, or <code>null</code>
      */
     virtual std::string GetDefaultPerspective() = 0;
 
     /**
      * Returns a list of the perspectives known to the workbench.
      *
      * @return a list of perspectives
      */
     virtual std::vector<IPerspectiveDescriptor::Pointer> GetPerspectives() = 0;
 
     /**
      * Sets the default perspective for the workbench to the given perspective id.
      * If non-<code>null</code>, the id must correspond to a perspective extension 
      * within the workbench's perspective registry.
      * <p>
      * A <code>null</code> id indicates no default perspective.
      * </p>
      *
      * @param id a perspective id, or <code>null</code>
      */
     virtual void SetDefaultPerspective(const std::string& id) = 0;
 
     /**
      * Reverts a perspective back to its original definition
      * as specified in the plug-in manifest.
      * 
      * @param perspToRevert the perspective to revert  
      * 
      * @since 3.0
      */
     virtual void RevertPerspective(IPerspectiveDescriptor::Pointer perspToRevert) = 0;
 };
 
 }
 
 #endif /*BERRYIPERSPECTIVEREGISTRY_H_*/
diff --git a/BlueBerry/Bundles/org.blueberry.ui/src/berryIPreferencePage.h b/BlueBerry/Bundles/org.blueberry.ui/src/berryIPreferencePage.h
index 5b773400c9..6b7001393a 100644
--- a/BlueBerry/Bundles/org.blueberry.ui/src/berryIPreferencePage.h
+++ b/BlueBerry/Bundles/org.blueberry.ui/src/berryIPreferencePage.h
@@ -1,110 +1,110 @@
 /*=========================================================================
 
  Program:   BlueBerry Platform
  Language:  C++
  Date:      $Date: 2009-01-23 09:44:29 +0100 (Fr, 23 Jan 2009) $
  Version:   $Revision: 16084 $
 
  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 BERRYIPREFERENCEPAGE_H_
 #define BERRYIPREFERENCEPAGE_H_
 
 #include "berryObject.h"
 #include "berryIPreferences.h"
 #include "berryIWorkbench.h"
 
 #include <QObject>
 
 namespace berry
 {
 
 /**
  * \ingroup org_blueberry_ui
  *
  * Interface for workbench preference pages.
  * <p>
  * Clients should implement this interface and include the name of their class
  * in an extension contributed to the workbench's preference extension point
  * (named <code>"org.blueberry.ui.preferencePages"</code>).
  * For example, the plug-in's XML markup might contain:
  * <pre>
  * &LT;extension point="org.blueberry.ui.preferencePages"&GT;
  *      &LT;page id="com.example.myplugin.prefs"
  *         name="Knobs"
  *         class="ns::MyPreferencePage" /&GT;
  * &LT;/extension&GT;
  * </pre>
  * </p>
  */
-struct IPreferencePage: virtual public Object
+struct BERRY_UI IPreferencePage: virtual public Object
 {
 
   berryInterfaceMacro(IPreferencePage, berry)
 
   ~IPreferencePage();
 
   /**
      * Initializes this preference page for the given workbench.
      * <p>
      * This method is called automatically as the preference page is being created
      * and initialized. Clients must not call this method.
      * </p>
      *
      * @param workbench the workbench
      */
    virtual void Init(IWorkbench::Pointer workbench) = 0;
 
   /**
    * Creates the top level control for this preference
    * page under the given parent widget.
    * <p>
    * Implementors are responsible for ensuring that
    * the created control can be accessed via <code>GetControl</code>
    * </p>
    *
    * @param parent the parent widget
    */
   virtual void CreateControl(void* parent) = 0;
 
   /**
    * Returns the top level control for this dialog page.
    * <p>
    * May return <code>null</code> if the control
    * has not been created yet.
    * </p>
    *
    * @return the top level control or <code>null</code>
    */
   virtual void* GetControl() const = 0;
 
   ///
   /// Invoked when the OK button was clicked in the preferences dialog
   ///
   virtual bool PerformOk() = 0;
 
   ///
   /// Invoked when the Cancel button was clicked in the preferences dialog
   ///
   virtual void PerformCancel() = 0;
 
   ///
   /// Invoked when the user performed an import. As the values of the preferences may have changed
   /// you should read all values again from the preferences service.
   ///
   virtual void Update() = 0;
 };
 
 }
 
 Q_DECLARE_INTERFACE(berry::IPreferencePage, "org.blueberry.IPreferencePage")
 
 #endif /*BERRYIPREFERENCEPAGE_H_*/
diff --git a/BlueBerry/Bundles/org.blueberry.ui/src/berryISelection.h b/BlueBerry/Bundles/org.blueberry.ui/src/berryISelection.h
index 8d86a2535f..f1ee8d015c 100644
--- a/BlueBerry/Bundles/org.blueberry.ui/src/berryISelection.h
+++ b/BlueBerry/Bundles/org.blueberry.ui/src/berryISelection.h
@@ -1,56 +1,56 @@
 /*=========================================================================
 
 Program:   BlueBerry Platform
 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 BERRYISELECTION_H_
 #define BERRYISELECTION_H_
 
 #include <berryMacros.h>
 #include <berryObject.h>
 
 #include <org_blueberry_ui_Export.h>
 
 namespace berry {
 
 /**
  * \ingroup org_blueberry_ui
  *
  * Interface for a selection.
  *
  * @see ISelectionProvider
  * @see ISelectionChangedListener
  * @see SelectionChangedEvent
  *
  **/
-struct ISelection : public Object
+struct BERRY_UI ISelection : public Object
 {
   berryInterfaceMacro(ISelection, berry)
 
   ~ISelection();
 
   /**
    * Returns whether this selection is empty.
    *
    * @return <code>true</code> if this selection is empty,
    *   and <code>false</code> otherwise
    */
   virtual bool IsEmpty() const = 0;
 
 };
 
 }
 
 #endif /*BERRYISELECTION_H_*/
diff --git a/BlueBerry/Bundles/org.blueberry.ui/src/internal/berryIDropTarget.h b/BlueBerry/Bundles/org.blueberry.ui/src/internal/berryIDropTarget.h
index 9c2b0f7056..3fd9aab7c5 100755
--- a/BlueBerry/Bundles/org.blueberry.ui/src/internal/berryIDropTarget.h
+++ b/BlueBerry/Bundles/org.blueberry.ui/src/internal/berryIDropTarget.h
@@ -1,72 +1,72 @@
 /*=========================================================================
 
  Program:   BlueBerry Platform
  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 BERRYIDROPTARGET_H_
 #define BERRYIDROPTARGET_H_
 
 #include <berryMacros.h>
 
 #include "berryRectangle.h"
 #include "tweaklets/berryDnDTweaklet.h"
 
 namespace berry {
 
 /**
  * This interface is used to drop objects. It knows how to drop a particular object
  * in a particular location. IDropTargets are typically created by IDragOverListeners, and
  * it is the job of the IDragOverListener to supply the drop target with information about
  * the object currently being dragged.
  *
  * @see IDragOverListener
  */
-struct IDropTarget : public Object {
+struct BERRY_UI IDropTarget : public Object {
 
   berryObjectMacro(IDropTarget);
 
   ~IDropTarget();
 
   /**
    * Drops the object in this position
    */
   virtual void Drop() = 0;
 
   /**
    * Returns a cursor id describing this drop operation
    *
    * @return a cursor id describing this drop operation
    */
   virtual DnDTweaklet::CursorType GetCursor() = 0;
 
   /**
    * Returns a rectangle (screen coordinates) describing the target location
    * for this drop operation.
    *
    * @return a snap rectangle or null if this drop target does not have a specific snap
    * location.
    */
   virtual Rectangle GetSnapRectangle() = 0;
 
   /**
    * This is called whenever a drag operation is cancelled
    */
   virtual void DragFinished(bool dropPerformed) = 0;
 };
 
 }
 
 #endif /* BERRYIDROPTARGET_H_ */
diff --git a/BlueBerry/Bundles/org.blueberry.ui/src/internal/berryIEvaluationResultCache.h b/BlueBerry/Bundles/org.blueberry.ui/src/internal/berryIEvaluationResultCache.h
index a9c7428c9f..dd4e233193 100755
--- a/BlueBerry/Bundles/org.blueberry.ui/src/internal/berryIEvaluationResultCache.h
+++ b/BlueBerry/Bundles/org.blueberry.ui/src/internal/berryIEvaluationResultCache.h
@@ -1,100 +1,101 @@
 /*=========================================================================
 
  Program:   BlueBerry Platform
  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 BERRYIEVALUATIONRESULTCACHE_H_
 #define BERRYIEVALUATIONRESULTCACHE_H_
 
 #include <berryObject.h>
 #include <berryMacros.h>
+#include <org_blueberry_ui_Export.h>
 
 namespace berry {
 
 struct IEvaluationContext;
 class Expression;
 
 /**
  * <p>
  * A cache of the result of an expression. This also provides the source
  * priority for the expression.
  * </p>
  * <p>
  * This interface is not intended to be implemented or extended by clients.
  * </p>
  *
  * @since 3.2
  * @see org.eclipse.ui.ISources
  * @see org.eclipse.ui.ISourceProvider
  */
-struct IEvaluationResultCache : public Object {
+struct BERRY_UI IEvaluationResultCache : public Object {
 
   berryInterfaceMacro(IEvaluationResultCache, berry)
 
   ~IEvaluationResultCache();
 
   /**
    * Clears the cached computation of the <code>evaluate</code> method, if
    * any. This method is only intended for internal use. It provides a
    * mechanism by which <code>ISourceProvider</code> events can invalidate
    * state on a <code>IEvaluationResultCache</code> instance.
    */
   virtual void ClearResult() = 0;
 
   /**
    * Returns the expression controlling the activation or visibility of this
    * item.
    *
    * @return The expression associated with this item; may be
    *         <code>null</code>.
    */
   virtual SmartPointer<Expression> GetExpression() = 0;
 
   /**
    * Returns the priority that has been given to this expression.
    *
    * @return The priority.
    * @see ISources
    */
   virtual int GetSourcePriority() const = 0;
 
   /**
    * Evaluates the expression -- given the current state of the workbench.
    * This method should cache its computation. The cache will be cleared by a
    * call to <code>clearResult</code>.
    *
    * @param context
    *            The context in which this state should be evaluated; must not
    *            be <code>null</code>.
    * @return <code>true</code> if the expression currently evaluates to
    *         <code>true</code>; <code>false</code> otherwise.
    */
   virtual bool Evaluate(SmartPointer<IEvaluationContext> context) = 0;
 
   /**
    * Forces the cached result to be a particular value. This will <b>not</b>
    * notify any users of the cache that it has changed.
    *
    * @param result
    *            The cached result to use.
    * @since 3.3
    */
   virtual void SetResult(bool result) = 0;
 };
 
 }
 
 #endif /* BERRYIEVALUATIONRESULTCACHE_H_ */
diff --git a/BlueBerry/Bundles/org.blueberry.ui/src/internal/berryILayoutContainer.h b/BlueBerry/Bundles/org.blueberry.ui/src/internal/berryILayoutContainer.h
index 1fb87139b4..3d599e0a3d 100644
--- a/BlueBerry/Bundles/org.blueberry.ui/src/internal/berryILayoutContainer.h
+++ b/BlueBerry/Bundles/org.blueberry.ui/src/internal/berryILayoutContainer.h
@@ -1,123 +1,123 @@
 /*=========================================================================
 
 Program:   BlueBerry Platform
 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 BERRYILAYOUTCONTAINER_H_
 #define BERRYILAYOUTCONTAINER_H_
 
 #include "berryLayoutPart.h"
 
 #include "berryPartPane.h"
 
 #include <list>
 
 namespace berry {
 
 
 /**
  * \ingroup org_blueberry_ui_internal
  *
  */
-struct ILayoutContainer : virtual public Object {
+struct BERRY_UI ILayoutContainer : virtual public Object {
 
   berryObjectMacro(ILayoutContainer);
 
   ~ILayoutContainer();
 
   typedef std::list<LayoutPart::Pointer> ChildrenType;
 
   virtual bool AllowsAdd(LayoutPart::Pointer toAdd) = 0;
 
     /**
      * Add a child to the container.
      */
   virtual void Add(LayoutPart::Pointer newPart) = 0;
 
     /**
      * Returns a list of layout children.
      */
   virtual ChildrenType GetChildren() = 0;
 
     /**
      * Remove a child from the container.
      */
   virtual void Remove(LayoutPart::Pointer part) = 0;
 
     /**
      * Replace one child with another
      */
   virtual void Replace(LayoutPart::Pointer oldPart, LayoutPart::Pointer newPart) = 0;
 
   virtual void FindSashes(LayoutPart::Pointer toFind, PartPane::Sashes& result) = 0;
 
     /**
      * When a layout part closes, focus will return to the previously active part.
      * This method determines whether the parts in this container should participate
      * in this behavior. If this method returns true, its parts may automatically be
      * given focus when another part is closed.
      *
      * @return true iff the parts in this container may be given focus when the active
      * part is closed
      */
   virtual bool AllowsAutoFocus() = 0;
 
     /**
      * Called by child parts to request a zoom in, given an immediate child
      *
      * @param toZoom
      * @since 3.1
      */
     //public void childRequestZoomIn(LayoutPart toZoom);
 
     /**
      * Called by child parts to request a zoom out
      *
      * @since 3.1
      */
     //public void childRequestZoomOut();
 
     /**
      * Returns true iff the given child is obscured due to the fact that the container is zoomed into
      * another part.
      *
      * @param toTest
      * @return
      * @since 3.1
      */
     //public boolean childObscuredByZoom(LayoutPart toTest);
 
     /**
      * Returns true iff we are zoomed into the given part, given an immediate child of this container.
      *
      * @param toTest
      * @return
      * @since 3.1
      */
     //public boolean childIsZoomed(LayoutPart toTest);
 
     /**
      * Called when the preferred size of the given child has changed, requiring a
      * layout to be triggered.
      *
      * @param childThatChanged the child that triggered the new layout
      */
     virtual void ResizeChild(LayoutPart::Pointer childThatChanged) = 0;
 
 };
 
 }
 
 #endif /*BERRYILAYOUTCONTAINER_H_*/
diff --git a/BlueBerry/Bundles/org.blueberry.ui/src/internal/berryIServiceLocatorCreator.h b/BlueBerry/Bundles/org.blueberry.ui/src/internal/berryIServiceLocatorCreator.h
index ee4cdbf4b9..c2d963bbb1 100755
--- a/BlueBerry/Bundles/org.blueberry.ui/src/internal/berryIServiceLocatorCreator.h
+++ b/BlueBerry/Bundles/org.blueberry.ui/src/internal/berryIServiceLocatorCreator.h
@@ -1,88 +1,90 @@
 /*=========================================================================
 
  Program:   BlueBerry Platform
  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 BERRYISERVICELOCATORCREATOR_H_
 #define BERRYISERVICELOCATORCREATOR_H_
 
 #include <berryObject.h>
 #include <berryMacros.h>
 
+#include <org_blueberry_ui_Export.h>
+
 
 namespace berry {
 
 struct IServiceLocator;
 struct IServiceFactory;
 struct IDisposable;
 
 /**
  * When creating components this service can be used to create the appropriate
  * service locator for the new component. For use with the component framework.
  * <p>
  * <b>Note:</b> Must not be implemented or extended by clients.
  * <p>
  * <p>
  * <strong>PROVISIONAL</strong>. This class or interface has been added as part
  * of a work in progress. There is a guarantee neither that this API will work
  * nor that it will remain the same. Please do not use this API without
  * consulting with the Platform/UI team.  This might disappear in 3.4 M5.
  * </p>
  *
  *
  * @since 3.4
  */
-struct IServiceLocatorCreator : public virtual Object {
+struct BERRY_UI IServiceLocatorCreator : public virtual Object {
 
   berryInterfaceMacro(IServiceLocatorCreator, berry);
 
   ~IServiceLocatorCreator();
 
   /**
    * Creates a service locator that can be used for hosting a new service
    * context. It will have the appropriate child services created as needed,
    * and can be used with the Dependency Injection framework to reuse
    * components (by simply providing your own implementation for certain
    * services).
    *
    * @param parent
    *            the parent locator
    * @param factory
    *            a factory that can lazily provide services if requested. This
    *            may be <code>null</code>
    * @param owner
    *            an object whose {@link IDisposable#dispose()} method will be
    *            called on the UI thread if the created service locator needs
    *            to be disposed (typically, because a plug-in contributing
    *            services to the service locator via an
    *            {@link AbstractServiceFactory} is no longer available). The
    *            owner can be any object that implements {@link IDisposable}.
    *            The recommended implementation of the owner's dispose method
    *            is to do whatever is necessary to stop using the created
    *            service locator, and then to call
    *            {@link IDisposable#dispose()} on the service locator.
    * @return the created service locator. The returned service locator will be
    *         an instance of {@link IDisposable}.
    */
   virtual SmartPointer<IServiceLocator> CreateServiceLocator(
       const WeakPointer<IServiceLocator> parent,
       const SmartPointer<const IServiceFactory> factory,
       WeakPointer<IDisposable> owner) = 0;
 };
 
 }
 
 #endif /* BERRYISERVICELOCATORCREATOR_H_ */
diff --git a/BlueBerry/Bundles/org.blueberry.ui/src/internal/berryIStackableContainer.h b/BlueBerry/Bundles/org.blueberry.ui/src/internal/berryIStackableContainer.h
index e54f1f2b75..786a9df795 100755
--- a/BlueBerry/Bundles/org.blueberry.ui/src/internal/berryIStackableContainer.h
+++ b/BlueBerry/Bundles/org.blueberry.ui/src/internal/berryIStackableContainer.h
@@ -1,128 +1,128 @@
 /*=========================================================================
 
  Program:   BlueBerry Platform
  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 BERRYISTACKABLECONTAINER_H_
 #define BERRYISTACKABLECONTAINER_H_
 
 #include "berryStackablePart.h"
 
 #include "berryPartPane.h"
 
 #include <list>
 
 namespace berry {
 
 /**
  * \ingroup org_blueberry_ui_internal
  *
  */
-struct IStackableContainer : virtual public Object {
+struct BERRY_UI IStackableContainer : virtual public Object {
 
   berryObjectMacro(IStackableContainer);
 
   typedef std::list<StackablePart::Pointer> ChildrenType;
 
   ~IStackableContainer();
 
   virtual bool AllowsAdd(StackablePart::Pointer toAdd) = 0;
 
     /**
      * Add a child to the container.
      */
   virtual void Add(StackablePart::Pointer newPart) = 0;
 
   /**
    * Returnd the id for this stackable container
    */
   virtual std::string GetID() const = 0;
 
     /**
      * Returns a list of layout children.
      */
   virtual ChildrenType GetChildren() const = 0;
 
     /**
      * Remove a child from the container.
      */
   virtual void Remove(StackablePart::Pointer part) = 0;
 
     /**
      * Replace one child with another
      */
   virtual void Replace(StackablePart::Pointer oldPart, StackablePart::Pointer newPart) = 0;
 
   virtual void FindSashes(PartPane::Sashes& result) = 0;
 
     /**
      * When a layout part closes, focus will return to the previously active part.
      * This method determines whether the parts in this container should participate
      * in this behavior. If this method returns true, its parts may automatically be
      * given focus when another part is closed.
      *
      * @return true iff the parts in this container may be given focus when the active
      * part is closed
      */
   virtual bool AllowsAutoFocus() = 0;
 
     /**
      * Called by child parts to request a zoom in, given an immediate child
      *
      * @param toZoom
      * @since 3.1
      */
     //public void childRequestZoomIn(LayoutPart toZoom);
 
     /**
      * Called by child parts to request a zoom out
      *
      * @since 3.1
      */
     //public void childRequestZoomOut();
 
     /**
      * Returns true iff the given child is obscured due to the fact that the container is zoomed into
      * another part.
      *
      * @param toTest
      * @return
      * @since 3.1
      */
     //public boolean childObscuredByZoom(LayoutPart toTest);
 
     /**
      * Returns true iff we are zoomed into the given part, given an immediate child of this container.
      *
      * @param toTest
      * @return
      * @since 3.1
      */
     //public boolean childIsZoomed(LayoutPart toTest);
 
     /**
      * Called when the preferred size of the given child has changed, requiring a
      * layout to be triggered.
      *
      * @param childThatChanged the child that triggered the new layout
      */
     virtual void ResizeChild(StackablePart::Pointer childThatChanged) = 0;
 
 };
 
 }
 
 #endif /* BERRYISTACKABLECONTAINER_H_ */
diff --git a/BlueBerry/Bundles/org.blueberry.ui/src/internal/berryIStickyViewManager.h b/BlueBerry/Bundles/org.blueberry.ui/src/internal/berryIStickyViewManager.h
index 88e388e141..a0b20d2cb8 100644
--- a/BlueBerry/Bundles/org.blueberry.ui/src/internal/berryIStickyViewManager.h
+++ b/BlueBerry/Bundles/org.blueberry.ui/src/internal/berryIStickyViewManager.h
@@ -1,55 +1,55 @@
 /*=========================================================================
  
  Program:   BlueBerry Platform
  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 BERRYISTICKYVIEWMANAGER_H_
 #define BERRYISTICKYVIEWMANAGER_H_
 
 #include <berryObject.h>
 #include <berryMacros.h>
 
 #include <berryIMemento.h>
 
 #include <set>
 
 namespace berry {
 
 class Perspective;
 
-struct IStickyViewManager : public Object {
+struct BERRY_UI IStickyViewManager : public Object {
 
   berryInterfaceMacro(IStickyViewManager, berry)
 
   ~IStickyViewManager();
 
   virtual void Remove(const std::string& perspectiveId) = 0;
 
   virtual void Add(const std::string& perspectiveId, const std::set<std::string>& stickyViewSet) = 0;
 
   virtual void Clear() = 0;
 
   virtual void Update(SmartPointer<Perspective> oldPersp, SmartPointer<Perspective> newPersp) = 0;
 
   virtual void Save(IMemento::Pointer memento) = 0;
 
   virtual void Restore(IMemento::Pointer memento) = 0;
 
 };
 
 }
 
 #endif /* BERRYISTICKYVIEWMANAGER_H_ */
diff --git a/BlueBerry/Bundles/org.blueberry.ui/src/internal/berryIWorkbenchLocationService.h b/BlueBerry/Bundles/org.blueberry.ui/src/internal/berryIWorkbenchLocationService.h
index 9a84bb99fc..6fcc4cc274 100755
--- a/BlueBerry/Bundles/org.blueberry.ui/src/internal/berryIWorkbenchLocationService.h
+++ b/BlueBerry/Bundles/org.blueberry.ui/src/internal/berryIWorkbenchLocationService.h
@@ -1,85 +1,86 @@
 /*=========================================================================
 
  Program:   BlueBerry Platform
  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 BERRYIWORKBENCHLOCATIONSERVICE_H_
 #define BERRYIWORKBENCHLOCATIONSERVICE_H_
 
 #include <berryObject.h>
 #include <berryMacros.h>
+#include <org_blueberry_ui_Export.h>
 
 namespace berry {
 
 struct IWorkbench;
 struct IWorkbenchWindow;
 struct IWorkbenchPartSite;
 struct IPageSite;
 
 /**
  * Query where you are in the workbench hierarchy.
  *
  * @since 3.4
  */
-struct IWorkbenchLocationService : public Object {
+struct BERRY_UI IWorkbenchLocationService : public Object {
 
   berryInterfaceMacro(IWorkbenchLocationService, berry)
 
   ~IWorkbenchLocationService();
 
   /**
    * Get the service scope.
    *
    * @return the service scope. May return <code>null</code>.
    * @see IServiceScopes#PARTSITE_SCOPE
    */
   virtual std::string GetServiceScope() const = 0;
 
   /**
    * A more numeric representation of the service level.
    *
    * @return the level - 0==workbench, 1==workbench window, etc
    */
   virtual int GetServiceLevel() const = 0;
 
   /**
    * @return the workbench. May return <code>null</code>.
    */
   virtual IWorkbench* GetWorkbench() const = 0;
 
   /**
    * @return the workbench window in this service locator hierarchy. May
    *  return <code>null</code>.
    */
   virtual SmartPointer<IWorkbenchWindow> GetWorkbenchWindow() const = 0;
 
   /**
    * @return the part site in this service locator hierarchy. May return
    *  <code>null</code>.
    */
   virtual SmartPointer<IWorkbenchPartSite> GetPartSite() const = 0;
 
   /**
    * @return the inner page site for a page based view in this service locator
    *  hierarchy. May return <code>null</code>.
    * @see PageBookView
    */
   virtual SmartPointer<IPageSite> GetPageSite() const = 0;
 };
 
 }
 
 #endif /* BERRYIWORKBENCHLOCATIONSERVICE_H_ */
diff --git a/BlueBerry/Bundles/org.blueberry.ui/src/internal/intro/berryIIntroDescriptor.h b/BlueBerry/Bundles/org.blueberry.ui/src/internal/intro/berryIIntroDescriptor.h
index f0c76f467d..f43a2e4d7e 100644
--- a/BlueBerry/Bundles/org.blueberry.ui/src/internal/intro/berryIIntroDescriptor.h
+++ b/BlueBerry/Bundles/org.blueberry.ui/src/internal/intro/berryIIntroDescriptor.h
@@ -1,79 +1,79 @@
 /*=========================================================================
  
  Program:   BlueBerry Platform
  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 BERRYIINTRODESCRIPTOR_H_
 #define BERRYIINTRODESCRIPTOR_H_
 
 #include <berryObject.h>
 #include <berryMacros.h>
 
 #include "intro/berryIIntroPart.h"
 
 #include <berryPlatformException.h>
 #include <berryImageDescriptor.h>
 
 namespace berry {
 
 /**
  * Describes an introduction extension.
  *
  * @since 3.0
  */
-struct IIntroDescriptor : public Object {
+struct BERRY_UI IIntroDescriptor : public Object {
 
   berryInterfaceMacro(IIntroDescriptor, berry)
 
   ~IIntroDescriptor();
 
   /**
    * Creates an instance of the intro part defined in the descriptor.
    */
   virtual IIntroPart::Pointer CreateIntro() throw(CoreException) = 0;
 
   /**
    * Returns the role of the intro part (view or editor)
    * @return the role of the part
    */
   virtual int GetRole() const = 0;
 
   /**
    * Returns the part id.
    *
    * @return the id of the part
    */
   virtual std::string GetId() const = 0;
 
   /**
    * Returns the descriptor of the image for this part.
    *
    * @return the descriptor of the image to display next to this part
    */
   virtual ImageDescriptor::Pointer GetImageDescriptor() const = 0;
 
   /**
    * Return the label override string for this part.
    *
    * @return the label override string or the empty string if one has not
    *         been specified
    */
   virtual std::string GetLabelOverride() const = 0;
 };
 
 }
 
 #endif /* BERRYIINTRODESCRIPTOR_H_ */
diff --git a/BlueBerry/Bundles/org.blueberry.ui/src/internal/intro/berryIIntroRegistry.h b/BlueBerry/Bundles/org.blueberry.ui/src/internal/intro/berryIIntroRegistry.h
index e204b95e2c..d9d8f14cea 100644
--- a/BlueBerry/Bundles/org.blueberry.ui/src/internal/intro/berryIIntroRegistry.h
+++ b/BlueBerry/Bundles/org.blueberry.ui/src/internal/intro/berryIIntroRegistry.h
@@ -1,70 +1,70 @@
 /*=========================================================================
  
  Program:   BlueBerry Platform
  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 BERRYIINTROREGISTRY_H_
 #define BERRYIINTROREGISTRY_H_
 
 #include "berryIIntroDescriptor.h"
 
 #include <vector>
 
 namespace berry {
 
 /**
  * Registry for introduction elements.
  *
  * @since 3.0
  */
-struct IIntroRegistry {
+struct BERRY_UI IIntroRegistry {
 
     virtual ~IIntroRegistry();
     /**
      * Return the number of introduction extensions known by this registry.
      *
      * @return the number of introduction extensions known by this registry
      */
     virtual int GetIntroCount() const = 0;
 
     /**
      * Return the introduction extensions known by this registry.
      *
      * @return the introduction extensions known by this registry
      */
     virtual std::vector<IIntroDescriptor::Pointer> GetIntros() const = 0;
 
     /**
      * Return the introduction extension that is bound to the given product.
      *
      * @param productId the product identifier
      * @return the introduction extension that is bound to the given product,
      * or <code>null</code> if there is no such binding
      */
     virtual IIntroDescriptor::Pointer GetIntroForProduct(const std::string& productId) const = 0;
 
     /**
      * Find an intro descriptor with the given identifier.
      *
      * @param id the id
      * @return the intro descriptor, or <code>null</code>
      */
     virtual IIntroDescriptor::Pointer GetIntro(const std::string& id) const = 0;
 };
 
 }
 
 #endif /* BERRYIINTROREGISTRY_H_ */
diff --git a/BlueBerry/Bundles/org.blueberry.ui/src/presentations/berryIPresentationSerializer.h b/BlueBerry/Bundles/org.blueberry.ui/src/presentations/berryIPresentationSerializer.h
index 60bf5f99bc..7a6595ebd2 100755
--- a/BlueBerry/Bundles/org.blueberry.ui/src/presentations/berryIPresentationSerializer.h
+++ b/BlueBerry/Bundles/org.blueberry.ui/src/presentations/berryIPresentationSerializer.h
@@ -1,67 +1,67 @@
 /*=========================================================================
 
  Program:   BlueBerry Platform
  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 BERRYIPRESENTATIONSERIALIZER_H_
 #define BERRYIPRESENTATIONSERIALIZER_H_
 
 #include "berryIPresentablePart.h"
 
 #include <string>
 
 namespace berry {
 
 /**
  * This interface is given to a StackPresentation when it is loading or saving
  * its state.
  *
  * Not intended to be implemented by clients
  *
  * @since 3.0
  * @noimplement This interface is not intended to be implemented by clients.
  */
-struct IPresentationSerializer {
+struct BERRY_UI IPresentationSerializer {
     /**
      * Returns a unique identifier for the given part. The identifier can later
      * be used to restore the original part by calling getPart(...). This identifier
      * is guaranteed to be unique within a particular StackPresentation. However,
      * the same part may be assigned a different ID each time the presentation is saved.
      *
      * @param part a part to be identified (not null)
      * @return a unique identifier for the part (not null)
      */
     virtual std::string GetId(IPresentablePart::Pointer part) = 0;
 
     /**
      * Returns a presentable part, given an id that was generated when the presentation
      * was saved.
      *
      * @param id an ID that was generated by getId(IPresentablePart) when the presentation
      * was saved
      * @return the presentable part associated with the given id, or null if none. Note
      * that even if the ID was valid when the presentation was saved, it may not
      * be valid when the presentation is restored. Callers must be prepared
      * to handle a null result.
      */
     virtual IPresentablePart::Pointer GetPart(const std::string& id) = 0;
 
     virtual ~IPresentationSerializer();
 };
 
 }
 
 #endif /* BERRYIPRESENTATIONSERIALIZER_H_ */
diff --git a/BlueBerry/Bundles/org.blueberry.ui/src/tweaklets/berryITracker.h b/BlueBerry/Bundles/org.blueberry.ui/src/tweaklets/berryITracker.h
index 0909ee6599..9e90f74041 100755
--- a/BlueBerry/Bundles/org.blueberry.ui/src/tweaklets/berryITracker.h
+++ b/BlueBerry/Bundles/org.blueberry.ui/src/tweaklets/berryITracker.h
@@ -1,56 +1,56 @@
 /*=========================================================================
 
  Program:   BlueBerry Platform
  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 BERRYITRACKER_H_
 #define BERRYITRACKER_H_
 
 #include "berryDnDTweaklet.h"
 
 #include "berryRectangle.h"
 #include "guitk/berryGuiTkIControlListener.h"
 
 namespace berry {
 
 /**
  *  Instances of this class implement a rubber banding rectangle that is
  *  drawn onto a parent control or display.
  *  These rectangles can be specified to respond to mouse and key events
  *  by either moving or resizing themselves accordingly.  Trackers are
  *  typically used to represent window geometries in a lightweight manner.
  *
  */
-struct ITracker
+struct BERRY_UI ITracker
 {
 
   virtual ~ITracker();
   
   virtual Rectangle GetRectangle() = 0;
   virtual void SetRectangle(const Rectangle& rectangle) = 0;
 
   virtual void SetCursor(DnDTweaklet::CursorType cursor) = 0;
 
   virtual bool Open() = 0;
 
   virtual void AddControlListener(GuiTk::IControlListener::Pointer listener) = 0;
   virtual void RemoveControlListener(GuiTk::IControlListener::Pointer listener) = 0;
 
 };
 
 }
 
 #endif /* BERRYITRACKER_H_ */