diff --git a/Plugins/org.mitk.gui.qt.segmentation/src/QmitkSegmentationPreferencePage.h b/Plugins/org.mitk.gui.qt.segmentation/src/QmitkSegmentationPreferencePage.h
index 111f398b8d..59a4eb922a 100644
--- a/Plugins/org.mitk.gui.qt.segmentation/src/QmitkSegmentationPreferencePage.h
+++ b/Plugins/org.mitk.gui.qt.segmentation/src/QmitkSegmentationPreferencePage.h
@@ -1,85 +1,85 @@
 /*===================================================================
 
 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 QmitkSegmentationPreferencePage_h_included
 #define QmitkSegmentationPreferencePage_h_included
 
-#include "berryIQtPreferencePage.h"
 #include "org_mitk_gui_qt_segmentation_Export.h"
 #include <berryIPreferences.h>
+#include "berryIQtPreferencePage.h"
 
 class QWidget;
 class QCheckBox;
 class QRadioButton;
 class QDoubleSpinBox;
 
 class MITK_QT_SEGMENTATION QmitkSegmentationPreferencePage : public QObject, public berry::IQtPreferencePage
 {
   Q_OBJECT
   Q_INTERFACES(berry::IPreferencePage)
 
 public:
 
   QmitkSegmentationPreferencePage();
   ~QmitkSegmentationPreferencePage();
 
   void Init(berry::IWorkbench::Pointer workbench);
 
   void CreateQtControl(QWidget* widget);
 
   QWidget* GetQtControl() const;
 
   ///
   /// \see IPreferencePage::PerformOk()
   ///
   virtual bool PerformOk();
 
   ///
   /// \see IPreferencePage::PerformCancel()
   ///
   virtual void PerformCancel();
 
   ///
   /// \see IPreferencePage::Update()
   ///
   virtual void Update();
 
 protected slots:
 
   void OnVolumeRenderingCheckboxChecked(int);
   void OnSmoothingCheckboxChecked(int);
 
 protected:
 
   QWidget* m_MainControl;
   QCheckBox* m_SlimViewCheckBox;
   QRadioButton* m_RadioOutline;
   QRadioButton* m_RadioOverlay;
   QCheckBox* m_VolumeRenderingCheckBox;
   QCheckBox* m_SmoothingCheckBox;
   QDoubleSpinBox* m_SmoothingSpinBox;
   QDoubleSpinBox* m_DecimationSpinBox;
   QDoubleSpinBox* m_ClosingSpinBox;
   QCheckBox* m_SelectionModeCheckBox;
 
   bool m_Initializing;
 
   berry::IPreferences::Pointer m_SegmentationPreferencesNode;
 };
 
 #endif /* QMITKDATAMANAGERPREFERENCEPAGE_H_ */
 
diff --git a/Plugins/org.mitk.gui.qt.segmentation/src/internal/QmitkDeformableClippingPlaneView.h b/Plugins/org.mitk.gui.qt.segmentation/src/internal/QmitkDeformableClippingPlaneView.h
index 8db2fcb2c8..cbd0f40258 100644
--- a/Plugins/org.mitk.gui.qt.segmentation/src/internal/QmitkDeformableClippingPlaneView.h
+++ b/Plugins/org.mitk.gui.qt.segmentation/src/internal/QmitkDeformableClippingPlaneView.h
@@ -1,102 +1,99 @@
 /*===================================================================
 
 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 _QMITKDEFORMABLECLIPPINGPLANEVIEW_H_INCLUDED
 #define _QMITKDEFORMABLECLIPPINGPLANEVIEW_H_INCLUDED
 
 
 #include "ui_QmitkDeformableClippingPlaneViewControls.h"
-
-#include <QmitkFunctionality.h>
-
-
 #include "mitkImage.h"
+#include <QmitkFunctionality.h>
 
 typedef itk::RGBPixel< float > Color;
 
 /*!
 * \ingroup org_mitk_gui_qt_deformableSurface
 *
 * \brief QmitkDeformableClippingPlaneView
 *
 * Document your class here.
 *
 * \sa QmitkFunctionality
 */
 class QmitkDeformableClippingPlaneView : public QmitkFunctionality
 {
 
   // this is needed for all Qt objects that should have a MOC object (everything that derives from QObject)
   Q_OBJECT
 
 public:
 
   static const std::string VIEW_ID;
 
   QmitkDeformableClippingPlaneView();
   virtual ~QmitkDeformableClippingPlaneView();
 
   virtual void CreateQtPartControl(QWidget *parent);
 
   /// \brief Creation of the connections of main and control widget
   virtual void CreateConnections();
 
   /// \brief Called when the functionality is activated
   virtual void Activated();
 
   /// \brief Called when the functionality is deactivated
   virtual void Deactivated();
 
   virtual void StdMultiWidgetAvailable (QmitkStdMultiWidget &stdMultiWidget);
   virtual void StdMultiWidgetNotAvailable();
 
 protected slots:
 
     /// \brief Called when the user clicks the GUI button/makes a selection
     void OnComboBoxSelectionChanged(const mitk::DataNode* node);
     void OnCreateNewClippingPlane();
     void OnCalculateClippingVolume();
 
     void OnTranslationMode(bool check);
     void OnRotationMode(bool check);
     void OnDeformationMode(bool check);
 
 protected:
 
   /*!
   \brief Invoked when the DataManager selection changed
   */
   virtual void OnSelectionChanged(mitk::DataNode* node);
   virtual void OnSelectionChanged(std::vector<mitk::DataNode*> nodes);
   virtual void NodeRemoved(const mitk::DataNode* node);
   virtual void NodeChanged(const mitk::DataNode* node);
 
   void UpdateView();
 
   QmitkStdMultiWidget* m_MultiWidget;
   Ui::QmitkDeformableClippingPlaneViewControls m_Controls;
 
 private:
   mitk::DataStorage::SetOfObjects::ConstPointer GetAllClippingPlanes();
   mitk::Color GetLabelColor(int label);
   void DeactivateInteractionButtons();
 
   mitk::DataNode::Pointer m_ReferenceNode;
   mitk::DataNode::Pointer m_WorkingNode;
 };
 
 #endif // _QMITKDEFORMABLECLIPPINGPLANEVIEW_H_INCLUDED