diff --git a/modules/bindings/pymod/msms.py b/modules/bindings/pymod/msms.py
index e41bd5c1d563280f3d9e5cc0d66a044f0c4c1758..dc3b8590626aad471534d47ce660220d616800d9 100644
--- a/modules/bindings/pymod/msms.py
+++ b/modules/bindings/pymod/msms.py
@@ -24,6 +24,20 @@ from ost import mol
 from ost import settings
 from ost import geom
 
+
+
+## \brief custom exception that substitutes CalledProcessError
+#
+# Python 2.4 does not include the CalledProcessError exception.
+# This one substitutes it 
+class MsmsProcessError(Exception):
+  def __init__(self, returncode,command):
+    self.returncode = returncode
+    self.command = command
+  def __str__(self):
+    return repr(self.returncode)
+
+
 ## \brief Method to check if MSMS executable is present
 #
 # \param msms_exe Explicit path to msms executable
@@ -106,7 +120,7 @@ def _RunMSMS(command):
   #check for successful completion of msms
   if proc.returncode!=0:
     print "WARNING: msms error\n", stdout_value
-    raise subprocess.CalledProcessError(proc.returncode, command)
+    raise subprocess.MsmsProcessError(proc.returncode, command)
 
   return stdout_value
   
diff --git a/modules/gui/pymod/CMakeLists.txt b/modules/gui/pymod/CMakeLists.txt
index a9b6470837777f5691e75bc7b4b075a660f9557d..d4661d360c1ba770af5f67e884a4e9c1072f091a 100644
--- a/modules/gui/pymod/CMakeLists.txt
+++ b/modules/gui/pymod/CMakeLists.txt
@@ -3,7 +3,6 @@ set(OST_GUI_PYMOD_SOURCES
   export_alignment_view.cc
   export_message_widget.cc  
   export_gl_win.cc
-  export_plot.cc
   export_tool.cc
   export_py_shell.cc
   export_gosty.cc
diff --git a/modules/gui/pymod/export_scene_win.cc b/modules/gui/pymod/export_scene_win.cc
index 38056d017e315fff4711db72434ecfd8657adf4d..6db3578c74e4e5535787d65ee0f04c839aa21833 100644
--- a/modules/gui/pymod/export_scene_win.cc
+++ b/modules/gui/pymod/export_scene_win.cc
@@ -16,7 +16,6 @@
 // along with this library; if not, write to the Free Software Foundation, Inc.,
 // 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
 //------------------------------------------------------------------------------
-#include <QAction>
 
 #include <boost/python.hpp>
 
@@ -25,6 +24,7 @@
 
 #include "sip_handler.hh"
 
+#include <QAction>
 
 using namespace boost::python;
 using namespace ost;
diff --git a/modules/gui/pymod/init_context_menu.py b/modules/gui/pymod/init_context_menu.py
index 0f8c82e7beb5c7ddfc9c863fde1cb5b3b192bdc0..bddcda7fd2533e347ae910e7c5f361f680043cc4 100644
--- a/modules/gui/pymod/init_context_menu.py
+++ b/modules/gui/pymod/init_context_menu.py
@@ -4,8 +4,6 @@ from PyQt4 import QtCore, QtGui
 
 import sip
 
-from subprocess import CalledProcessError
-
 from ost import geom, gfx, gui, seq
 from ost import settings
 from ost import LogError, mol
@@ -229,7 +227,7 @@ class SurfaceContextMenu(QtCore.QObject):
                                   no_hetatoms=nohet,
                                   no_waters=nowat)[0]
           gfx.Scene().Add(gfx.Surface("%s_%s"%(entity.GetName(),name),s))
-        except (RuntimeError, CalledProcessError):
+        except (RuntimeError, msms.MsmsProcessError):
           LogError("WARNING: Surface could not be calculated")
           return
         except UserWarning:
diff --git a/modules/gui/pymod/scene/immutable_gradient_info_handler.py b/modules/gui/pymod/scene/immutable_gradient_info_handler.py
index ddf5de046f2b7980b6691d9f938dcf7a85f1777f..e1fbb49c3fc4afd18e8a6426f3ad88fedf0b13a7 100644
--- a/modules/gui/pymod/scene/immutable_gradient_info_handler.py
+++ b/modules/gui/pymod/scene/immutable_gradient_info_handler.py
@@ -24,7 +24,7 @@ from ost import info
 from PyQt4 import QtCore, QtGui
 
 #Gradient Editor
-class ImmutableGradientInfoHandler():
+class ImmutableGradientInfoHandler:
   def __init__(self, fileName):
     
     self.FILE_NAME = fileName    
@@ -79,4 +79,4 @@ class ImmutableGradientInfoHandler():
       rel=s[0]
       color=s[1]
       gfx_gradient.SetColorAt(s[0], gfx.Color(s[1].redF(), s[1].greenF(), s[1].blueF()));
-    return gfx_gradient;
\ No newline at end of file
+    return gfx_gradient;
diff --git a/modules/gui/pymod/scene/immutable_info_handler.py b/modules/gui/pymod/scene/immutable_info_handler.py
index 4c2c0332d9c6fb4e20c37d7073872d005779cf1d..cbebc45867c044facf16bc478eab82d3a3c83f04 100644
--- a/modules/gui/pymod/scene/immutable_info_handler.py
+++ b/modules/gui/pymod/scene/immutable_info_handler.py
@@ -24,7 +24,7 @@ from ost import info
 from PyQt4 import QtCore, QtGui
 
 #Gradient Editor
-class ImmutableInfoHandler():
+class ImmutableInfoHandler:
   def __init__(self, fileName):
     
     self.FILE_NAME = fileName    
diff --git a/modules/gui/pymod/scene/immutable_loader_info_handler.py b/modules/gui/pymod/scene/immutable_loader_info_handler.py
index 03ada4036488ca5cf6dfd16ee653d8c4945fc0ed..fc21986074fa1f516918215cf4628707d6d39c7a 100644
--- a/modules/gui/pymod/scene/immutable_loader_info_handler.py
+++ b/modules/gui/pymod/scene/immutable_loader_info_handler.py
@@ -25,7 +25,7 @@ from PyQt4 import QtCore, QtGui
 
 from file_loader import GenericLoader
 
-class ImmutableLoaderInfoHandler():
+class ImmutableLoaderInfoHandler:
   LOADERS_GROUP_NAME = "GenericLoaders"
   LOADER_GROUP_NAME = "GenericLoader"
   NAME_ATTRIBUTE_NAME = "Name"
diff --git a/modules/gui/pymod/scene/immutable_preset_info_handler.py b/modules/gui/pymod/scene/immutable_preset_info_handler.py
index 1ae6d34b573cda9243a5fb34b558c66091c85743..131b0e1bcbb1ab108918e0e0d4315e89dd675210 100644
--- a/modules/gui/pymod/scene/immutable_preset_info_handler.py
+++ b/modules/gui/pymod/scene/immutable_preset_info_handler.py
@@ -25,7 +25,7 @@ from PyQt4 import QtCore, QtGui
 from ost.gui.scene.preset import Preset
 
 #Gradient Editor
-class ImmutablePresetInfoHandler():
+class ImmutablePresetInfoHandler:
   PRESETS_GROUP_NAME = "Presets"
   PRESET_GROUP_NAME = "Preset"
   NAME_ATTRIBUTE_NAME = "Name"
diff --git a/modules/gui/pymod/scene/preset.py b/modules/gui/pymod/scene/preset.py
index f46c3cd07dbd007b14bd0cff495568fa919bb26c..2b4f41ba0454d85e49a71a52c653b6b485bda2e3 100644
--- a/modules/gui/pymod/scene/preset.py
+++ b/modules/gui/pymod/scene/preset.py
@@ -25,7 +25,7 @@ from PyQt4 import QtGui
 from ost.gfx import ColorOp
 
 #Rendering Preset
-class Preset():
+class Preset:
   NAME_ATTRIBUTE_NAME = "Name"
   OP_GROUP_NAME = "Op"
   CLASS_NAME_ATTRIBUTE_NAME = "ClassName"
diff --git a/modules/gui/pymod/scene/render_op.py b/modules/gui/pymod/scene/render_op.py
index 53a82b8f785cc45c2bc0137b5272762a138f6ae8..f161eff2f18937416735f04d0ea622a4ad5765c8 100644
--- a/modules/gui/pymod/scene/render_op.py
+++ b/modules/gui/pymod/scene/render_op.py
@@ -22,7 +22,7 @@ from ost import info
 from ost import gfx
 from PyQt4 import QtGui
 
-class RenderOp():
+class RenderOp:
   RENDERMODE_ATTRIBUTE_NAME = "RenderMode"
   KEEP_ATTRIBUTE_NAME = "Keep"
   FLAGS_ATTRIBUTE_NAME = "Flags"
diff --git a/modules/gui/pymod/scene/scene_selection_helper.py b/modules/gui/pymod/scene/scene_selection_helper.py
index 0dc43312ca21b96752ebf56718aaa9eb12c6a692..96d9cc9ff3e5802dcffadca7f215c86434c111b0 100644
--- a/modules/gui/pymod/scene/scene_selection_helper.py
+++ b/modules/gui/pymod/scene/scene_selection_helper.py
@@ -30,7 +30,7 @@ except ImportError:
   _img_present=False
   pass
 
-class SelHelper():
+class SelHelper:
   __shared_state = {}
   
   NO_SELECTION = 0
diff --git a/modules/gui/pymod/scene/visibility_op.py b/modules/gui/pymod/scene/visibility_op.py
index 82ba8a2e4d882e55eb303aad9002554acc0e45da..6a377b5fc47ec48199f8050808fd4693142e9536 100644
--- a/modules/gui/pymod/scene/visibility_op.py
+++ b/modules/gui/pymod/scene/visibility_op.py
@@ -22,7 +22,7 @@ from ost import info
 from ost import gfx
 from PyQt4 import QtGui
 
-class VisibilityOp():
+class VisibilityOp:
   VISIBLE_ATTRIBUTE_NAME = "Visible"
   FLAGS_ATTRIBUTE_NAME = "Flags"
     
diff --git a/modules/gui/pymod/wrap_gui.cc b/modules/gui/pymod/wrap_gui.cc
index d0cd95bd2116cfc8fffb16cc4663322f24571558..09f24fe82ea3fde760f14da2138af50963d97bac 100644
--- a/modules/gui/pymod/wrap_gui.cc
+++ b/modules/gui/pymod/wrap_gui.cc
@@ -26,7 +26,6 @@ using namespace boost::python;
 
 void export_AlignmentView();
 void export_Tool();
-void export_Plot();
 void export_GLWin();
 void export_MessageWidget();
 void export_Gosty();
@@ -109,7 +108,6 @@ BOOST_PYTHON_MODULE(_gui)
   export_Gosty();
   export_AlignmentView();
   export_Tool();
-  export_Plot();
   export_MessageWidget();
   export_GLWin();
   export_MainArea();
diff --git a/modules/gui/src/CMakeLists.txt b/modules/gui/src/CMakeLists.txt
index 2119c8ace88bfab9b180875cb2502f49aa7d62bf..1a5104a0ae28d8670eb8887fa8c3c85f4567c1ae 100644
--- a/modules/gui/src/CMakeLists.txt
+++ b/modules/gui/src/CMakeLists.txt
@@ -130,10 +130,6 @@ plot_legend_panel.hh
 plot_ticker.hh
 plot_ticker_fw.hh
 plot_types.hh
-plot_viewer.hh
-plot_viewer_panel.hh
-plot_viewer_proxy.hh
-plot_viewer_proxy_fw.hh
 )
 
 if (ENABLE_IMG)
@@ -265,30 +261,6 @@ tools/tool_options_widget.cc
 tools/tool_bar.cc
 tools/selection_tool.cc
 tools/measure_tool.cc
-plot_viewer/plot_axis_base.cc
-plot_viewer/plot_axis_vertical.cc
-plot_viewer/plot_axis_horizontal.cc
-plot_viewer/plot_data_graphics_item.cc
-plot_viewer/plot_data_graphics_item_base.cc
-plot_viewer/plot_graphics_ellipse_item.cc
-plot_viewer/plot_graphics_rectangle_item.cc
-plot_viewer/plot_graphics_diagonal_cross_item.cc
-plot_viewer/plot_graphics_cross_item.cc
-plot_viewer/plot_data.cc
-plot_viewer/plot_data_base.cc
-plot_viewer/plot_data_info.cc
-plot_viewer/plot_function.cc
-plot_viewer/plot_function_graphics_item.cc
-plot_viewer/plot_function_info.cc
-plot_viewer/plot_info_base.cc
-plot_viewer/plot_group.cc
-plot_viewer/plot_group_info.cc
-plot_viewer/plot_group_graphics_item.cc
-plot_viewer/plot_ticker.cc
-plot_viewer/plot_viewer.cc
-plot_viewer/plot_viewer_proxy.cc
-plot_viewer/plot_viewer_panel.cc
-plot_viewer/plot_legend_panel.cc
 python_shell/gutter.cc
 python_shell/main_thread_runner.cc
 python_shell/output_redirector.cc
@@ -369,12 +341,6 @@ sequence_viewer/title_row.hh
 sequence_viewer/alignment_view_object.hh
 sequence_viewer/base_view_object.hh
 sequence_viewer/sequence_view_object.hh
-plot_viewer/plot_axis_base.hh
-plot_viewer/plot_data_graphics_item_base.hh
-plot_viewer/plot_function_info.hh
-plot_viewer/plot_info_base.hh
-plot_viewer/plot_viewer_panel.hh
-plot_viewer/plot_legend_panel.hh
 python_shell/main_thread_runner.hh
 python_shell/completer_base.hh
 python_shell/gutter.hh
@@ -477,7 +443,6 @@ include(${QT_USE_FILE})
 qt4_wrap_cpp(OST_GUI_MOCS "${HEADERS_TO_BE_MOCCED}")
 module(NAME gui SOURCES ${OST_GUI_MOCS} ${OST_GUI_SOURCES}
        HEADERS ${OST_GUI_TOOLS_HEADERS} IN_DIR tools
-               ${OST_GUI_PLOT_VIEWER_HEADERS} IN_DIR plot_viewer
                ${OST_GUI_SEQUENCE_VIEWER_HEADERS} IN_DIR sequence_viewer
                ${OST_GUI_PYTHON_SHELL_HEADERS} IN_DIR python_shell
                ${OST_GUI_PANEL_BAR_HEADERS} IN_DIR panels
diff --git a/modules/gui/src/data_viewer/argand.cc b/modules/gui/src/data_viewer/argand.cc
index 7c536a36001b22584a63936f6c790a30d62e36e3..e9d65dee8ab5f0dcdf0a14ae59499688211d5a40 100644
--- a/modules/gui/src/data_viewer/argand.cc
+++ b/modules/gui/src/data_viewer/argand.cc
@@ -22,13 +22,13 @@
   Authors: Ansgar Philippsen, Andreas Schenk
 */
 
-#include <QPainter>
-#include <QResizeEvent>
 
 #include <ost/base.hh>
 
 #include "argand.hh"
 
+#include <QPainter>
+#include <QResizeEvent>
 namespace ost { namespace img { namespace gui {
 
 Argand::Argand(const Data& data, QWidget* p):
diff --git a/modules/gui/src/data_viewer/argand.hh b/modules/gui/src/data_viewer/argand.hh
index cc337c661eb88f1283b63c75ba2ee5bb6becdaf0..346cee3b0ac4101d2a7c59bcd0f4921a836f4733 100644
--- a/modules/gui/src/data_viewer/argand.hh
+++ b/modules/gui/src/data_viewer/argand.hh
@@ -25,8 +25,6 @@
 #ifndef OST_GUI_ARGAND_H
 #define OST_GUI_ARGAND_H
 
-#include <QWidget>
-#include <QPixmap>
 
 #include <ost/base.hh>
 #include <ost/img/data.hh>
@@ -35,6 +33,8 @@
 
 #include <ost/gui/module_config.hh>
 
+#include <QWidget>
+#include <QPixmap>
 namespace ost { namespace img { namespace gui {
 
 class DLLEXPORT_OST_GUI Argand: public QWidget, public DataObserver 
diff --git a/modules/gui/src/data_viewer/data_viewer.cc b/modules/gui/src/data_viewer/data_viewer.cc
index 4cb4cc3d8fdcbb6c385568f72d828e4971532f70..11edbf9daa95c400b85c99fd2b48a439e2954112 100644
--- a/modules/gui/src/data_viewer/data_viewer.cc
+++ b/modules/gui/src/data_viewer/data_viewer.cc
@@ -28,14 +28,6 @@
 //#include <cstring>
 //#include <sstream>
 
-#include <QLabel>
-#include <QStatusBar>
-#include <QMouseEvent>
-#include <QVariant>
-#include <QMenu>
-#include <QMenuBar>
-#include <QApplication>
-#include <QDesktopWidget>
 
 //#include <ost/img/io/io_manager.hh>
 #include <ost/message.hh>
@@ -48,6 +40,14 @@
 #include "overlay_base.hh"
 #include "overlay_manager.hh"
 
+#include <QLabel>
+#include <QStatusBar>
+#include <QMouseEvent>
+#include <QVariant>
+#include <QMenu>
+#include <QMenuBar>
+#include <QApplication>
+#include <QDesktopWidget>
 namespace ost { namespace img { namespace gui {
 
 namespace {
diff --git a/modules/gui/src/data_viewer/data_viewer_panel_base.cc b/modules/gui/src/data_viewer/data_viewer_panel_base.cc
index 98b38d71173742f894c29f06b2de7dfd5336a50d..7a098921db753ca1e7fbe596281536ee71947f42 100644
--- a/modules/gui/src/data_viewer/data_viewer_panel_base.cc
+++ b/modules/gui/src/data_viewer/data_viewer_panel_base.cc
@@ -30,6 +30,9 @@
 //#include "bitmaps/rotate.xpm"
 //#include "bitmaps/arrowmove.xpm"
 
+#include "img2qt.hh"
+#include "data_viewer_panel_base.hh"
+
 #include <QResizeEvent>
 #include <QPainter>
 #include <QColor>
@@ -37,8 +40,6 @@
 #include <QPixmapCache>
 #include <ost/message.hh>
 
-#include "img2qt.hh"
-#include "data_viewer_panel_base.hh"
 
 #define USE_PIXMAP_CACHE
 
diff --git a/modules/gui/src/data_viewer/data_viewer_panel_base.hh b/modules/gui/src/data_viewer/data_viewer_panel_base.hh
index d3a6b01d0c282ff611f59d97cf0661217391d8b1..16339e55f66ae13a120d2b31891d95426fcb1ba1 100644
--- a/modules/gui/src/data_viewer/data_viewer_panel_base.hh
+++ b/modules/gui/src/data_viewer/data_viewer_panel_base.hh
@@ -28,12 +28,6 @@
 #include <map>    
 #include <boost/shared_ptr.hpp>
 
-#include <QWidget>
-#include <QCursor>
-#include <QMenu>
-#include <QPen>
-#include <QBrush>
-#include <QRubberBand>
 
 
 #include <ost/base.hh>
@@ -46,6 +40,12 @@
 
 #include <ost/img/normalizer_impl.hh>
 
+#include <QWidget>
+#include <QCursor>
+#include <QMenu>
+#include <QPen>
+#include <QBrush>
+#include <QRubberBand>
 
 namespace ost { namespace img { namespace gui {
 
diff --git a/modules/gui/src/data_viewer/drawing_functions.hh b/modules/gui/src/data_viewer/drawing_functions.hh
index c27e66345bf8287afee3c2ed3330ddbbd85026cf..b3374a12df5cf73aaf5822d8e069de46d5758b7d 100644
--- a/modules/gui/src/data_viewer/drawing_functions.hh
+++ b/modules/gui/src/data_viewer/drawing_functions.hh
@@ -25,11 +25,11 @@
 #ifndef IMG_GUI_DRAWING_FUNCTIONS_HH_
 #define IMG_GUI_DRAWING_FUNCTIONS_HH_
 
+#include <ost/geom/geom.hh>
 #include <QPainter>
 #include <QPoint>
 #include <QSize>
 
-#include <ost/geom/geom.hh>
 
 namespace ost { namespace img { namespace gui {
 
diff --git a/modules/gui/src/data_viewer/fft_panel.cc b/modules/gui/src/data_viewer/fft_panel.cc
index d764d5f9c110ec6820982725b285e3ad07c14ec4..6b14752a05242e5efe461f7cd01e4d784721d9fd 100644
--- a/modules/gui/src/data_viewer/fft_panel.cc
+++ b/modules/gui/src/data_viewer/fft_panel.cc
@@ -22,11 +22,11 @@
   Author: Andreas Schenk
 */
 
-#include <QInputDialog>
 #include <ost/img/alg/fft.hh>   
 #include "fft_panel.hh"
 
 
+#include <QInputDialog>
 
 
 namespace ost { namespace img { namespace gui {
diff --git a/modules/gui/src/data_viewer/img2qt.cc b/modules/gui/src/data_viewer/img2qt.cc
index d89a24c4699893718b6d0c418b2e1c7c5205fa18..9d0defcc4018f37f6b44a913805572bdede1581a 100644
--- a/modules/gui/src/data_viewer/img2qt.cc
+++ b/modules/gui/src/data_viewer/img2qt.cc
@@ -17,7 +17,6 @@
 // along with this library; if not, write to the Free Software Foundation, Inc.,
 // 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
 //------------------------------------------------------------------------------
-#include <QImage>
 
 #include <ost/img/data.hh>
 #include <ost/img/algorithm.hh>
@@ -25,6 +24,7 @@
 #include <ost/stdint.hh>
 #include "img2qt.hh"
 
+#include <QImage>
 using namespace ost::img;
 
 
diff --git a/modules/gui/src/data_viewer/info_panel.cc b/modules/gui/src/data_viewer/info_panel.cc
index 7bdf2a514df7ca43215126c027d81b4eb3f18182..4ebd0b53e7788015b53e0ab20858ecc3045af735 100644
--- a/modules/gui/src/data_viewer/info_panel.cc
+++ b/modules/gui/src/data_viewer/info_panel.cc
@@ -24,14 +24,14 @@
 */
 #include <boost/format.hpp>
 
-#include <QHBoxLayout>
-#include <QVBoxLayout>
-#include <QGroupBox>
 
 #include <ost/img/image.hh>
 
 #include "info_panel.hh"
 
+#include <QHBoxLayout>
+#include <QVBoxLayout>
+#include <QGroupBox>
 namespace ost { namespace img { namespace gui {
 
 InfoPanelLabel::InfoPanelLabel(const QString& t, QWidget* parent):
diff --git a/modules/gui/src/data_viewer/info_panel.hh b/modules/gui/src/data_viewer/info_panel.hh
index 388248dabacfb1f2d2467bec2f6819add3e429cf..d229555065146f9fcf9963d9917eb3dd1fdd2e55 100644
--- a/modules/gui/src/data_viewer/info_panel.hh
+++ b/modules/gui/src/data_viewer/info_panel.hh
@@ -25,9 +25,6 @@
 #ifndef IMG_GUI_DATAVIEWER_INFO_PANEL_H_
 #define IMG_GUI_DATAVIEWER_INFO_PANEL_H_
 
-#include <QWidget>
-#include <QLabel>
-#include <QMenu>
 
 #include <ost/img/data_types.hh>
 #include <ost/img/extent.hh>
@@ -35,6 +32,9 @@
 
 #include <ost/gui/module_config.hh>
 
+#include <QWidget>
+#include <QLabel>
+#include <QMenu>
 namespace ost { namespace img { namespace gui {
 
 class DLLEXPORT_OST_GUI InfoPanelLabel: public QLabel
diff --git a/modules/gui/src/data_viewer/overlay_base.hh b/modules/gui/src/data_viewer/overlay_base.hh
index edef14985af6d488413334b98837c37ab90de75b..05c3d6d08f263f1986c49176e2f434bb26c5259b 100644
--- a/modules/gui/src/data_viewer/overlay_base.hh
+++ b/modules/gui/src/data_viewer/overlay_base.hh
@@ -25,18 +25,18 @@
 #ifndef IMG_GUI_OVERLAY_BASE_H
 #define IMG_GUI_OVERLAY_BASE_H
 
-#include <QObject>
-#include <QEvent>
-#include <QPainter>
-#include <QMenu>
-#include <QMouseEvent>
-#include <QKeyEvent>
 
 #include <ost/base.hh>
 
 #include <ost/gui/module_config.hh>
 #include "overlay_base_fw.hh"
 
+#include <QObject>
+#include <QEvent>
+#include <QPainter>
+#include <QMenu>
+#include <QMouseEvent>
+#include <QKeyEvent>
 namespace ost { namespace img { namespace gui {
 
 // fw decl
diff --git a/modules/gui/src/data_viewer/overlay_manager.hh b/modules/gui/src/data_viewer/overlay_manager.hh
index 033d78663ce99f5fa37a26f87cc022716f8a03cf..cef91ac91201ae46c87ded349b8ed95069debdef 100644
--- a/modules/gui/src/data_viewer/overlay_manager.hh
+++ b/modules/gui/src/data_viewer/overlay_manager.hh
@@ -28,9 +28,6 @@
 #include <vector>
 #include <list>
 
-#include <QWidget>
-#include <QPainter>
-#include <QEvent>
 
 
 #include <ost/base.hh>
@@ -41,6 +38,9 @@
 #include "overlay_manager_fw.hh"
 #include "overlay_manager_observer.hh"
 
+#include <QWidget>
+#include <QPainter>
+#include <QEvent>
 namespace ost { namespace img { namespace gui {
 
 class DataViewerPanel;
diff --git a/modules/gui/src/data_viewer/overlay_manager_gui.cc b/modules/gui/src/data_viewer/overlay_manager_gui.cc
index c947d50cd1454a49bede8558efd6c9e020407c18..1944c42f6b7552be0bc5f215ff2f08d0f2007425 100644
--- a/modules/gui/src/data_viewer/overlay_manager_gui.cc
+++ b/modules/gui/src/data_viewer/overlay_manager_gui.cc
@@ -22,7 +22,6 @@
   Authors: Ansgar Philippsen, Andreas Schenk
 */
 
-#include <QScrollArea>
 
 #include <ost/message.hh>
 
@@ -30,6 +29,7 @@
 #include "overlay_manager.hh"
 #include "overlay.hh"
 
+#include <QScrollArea>
 namespace ost { namespace img { namespace gui {
 
 ////////////////////////////
diff --git a/modules/gui/src/data_viewer/overlay_manager_gui.hh b/modules/gui/src/data_viewer/overlay_manager_gui.hh
index b12adca5a74c99a32ccbdd79ccadff8dfbdb1595..a601832e061a30e0d8f03c166a36b2cd88c30c06 100644
--- a/modules/gui/src/data_viewer/overlay_manager_gui.hh
+++ b/modules/gui/src/data_viewer/overlay_manager_gui.hh
@@ -26,6 +26,11 @@
 #ifndef IMG_OV_GUI_OVDIALOG_H
 #define IMG_OV_GUI_OVDIALOG_H
 
+
+#include <vector>
+#include <map>
+#include "overlay_manager_observer.hh"
+
 #include <QWidget>
 #include <QRadioButton>
 #include <QCheckBox>
@@ -34,11 +39,6 @@
 #include <QLabel>
 #include <QPushButton>
 #include <QButtonGroup>
-
-#include <vector>
-#include <map>
-#include "overlay_manager_observer.hh"
-
 namespace ost { namespace img { namespace gui {
 
 class OverlayCustomActCheckBox: public QRadioButton
diff --git a/modules/gui/src/data_viewer/pointlist_overlay_base.cc b/modules/gui/src/data_viewer/pointlist_overlay_base.cc
index 65b0e3a3258ead910f6a65aed05cbe1af9a9c7ed..13392d28df7ab4d967f244e9b00a82f05146a925 100644
--- a/modules/gui/src/data_viewer/pointlist_overlay_base.cc
+++ b/modules/gui/src/data_viewer/pointlist_overlay_base.cc
@@ -21,6 +21,9 @@
 /*
   Authors: Ansgar Philippsen, Andreas Schenk
 */
+#include "data_viewer_panel.hh"
+#include "pointlist_overlay_base.hh"
+#include "strategies.hh"
 
 #include <QActionGroup>
 #include <QGridLayout>
@@ -33,9 +36,6 @@
 #include <QIcon>
 #include <QColorDialog>
 
-#include "data_viewer_panel.hh"
-#include "pointlist_overlay_base.hh"
-#include "strategies.hh"
 
 namespace ost { namespace img { namespace gui {
 
diff --git a/modules/gui/src/data_viewer/pointlist_overlay_base.hh b/modules/gui/src/data_viewer/pointlist_overlay_base.hh
index d80c1d8794773d0f055903ac0b9e776d1b9e9a1e..3c0f709d837e068c08e9223a2b4b0a54215beb5c 100644
--- a/modules/gui/src/data_viewer/pointlist_overlay_base.hh
+++ b/modules/gui/src/data_viewer/pointlist_overlay_base.hh
@@ -26,13 +26,6 @@
 #ifndef IMG_POINTLIST_OVERLAY_BASE_HH
 #define IMG_POINTLIST_OVERLAY_BASE_HH
 
-#include <QColor>
-#include <QAction>
-#include <QDialog>
-#include <QLineEdit>
-#include <QColorDialog>
-#include <QPushButton>
-#include <QVBoxLayout>
 
 
 #include <ost/img/point.hh>
@@ -43,6 +36,13 @@
 
 #include "strategies_fw.hh"
 
+#include <QColor>
+#include <QAction>
+#include <QDialog>
+#include <QLineEdit>
+#include <QColorDialog>
+#include <QPushButton>
+#include <QVBoxLayout>
 
 
 namespace ost { namespace img { namespace gui {
diff --git a/modules/gui/src/data_viewer/strategies.hh b/modules/gui/src/data_viewer/strategies.hh
index a6abb3d3866c843b53e0dfe5f658e8fe633d0f63..0989492c877aebc916016c919b43db3b540de640 100644
--- a/modules/gui/src/data_viewer/strategies.hh
+++ b/modules/gui/src/data_viewer/strategies.hh
@@ -25,16 +25,16 @@
 #ifndef IMG_GUI_STRATEGIES_HH_
 #define IMG_GUI_STRATEGIES_HH_
 
-#include <QPainter>
-#include <QPoint>
-#include <QColor>
-#include <QPen>
-#include <QBrush>
 
 #include <ost/geom/geom.hh>
 
 #include "strategies_fw.hh"
 
+#include <QPainter>
+#include <QPoint>
+#include <QColor>
+#include <QPen>
+#include <QBrush>
 namespace ost { namespace img { namespace gui {
 
 
diff --git a/modules/gui/src/dock_widget.hh b/modules/gui/src/dock_widget.hh
index eefecd21db62df3116ca96d76141fad5a78ce051..6668b50aae12ddfc2b686e0bd6322c4c0fb3e218 100644
--- a/modules/gui/src/dock_widget.hh
+++ b/modules/gui/src/dock_widget.hh
@@ -25,10 +25,10 @@
 #ifndef OST_GUI_DOCK_WIDGET_HH
 #define OST_GUI_DOCK_WIDGET_HH
 
-#include <QDockWidget>
 
 #include <ost/gui/module_config.hh>
 
+#include <QDockWidget>
 namespace ost { namespace gui {
 
 class DLLEXPORT_OST_GUI DockWidget: public QDockWidget
diff --git a/modules/gui/src/entity_explorer/entity_explorer_model.hh b/modules/gui/src/entity_explorer/entity_explorer_model.hh
index 51545794268157494efa0fa8154bb7881c32ef38..8071a7c8748887b2562aa333a80ab341cf806d60 100644
--- a/modules/gui/src/entity_explorer/entity_explorer_model.hh
+++ b/modules/gui/src/entity_explorer/entity_explorer_model.hh
@@ -24,11 +24,11 @@
 
 #include <ost/gfx/scene_observer.hh>
 #include <ost/gfx/gfx_object.hh>
+#include <ost/gui/module_config.hh>
 
 // Qt includes must come last
 #include <QAbstractItemModel>
 
-#include <ost/gui/module_config.hh>
 
 namespace ost { namespace gui {
 
diff --git a/modules/gui/src/file_browser.cc b/modules/gui/src/file_browser.cc
index 3510e95e554105622a70c9e8c296408f4f6f8bf8..ca7092684382517d25fdc7128b215e05f147ee4f 100644
--- a/modules/gui/src/file_browser.cc
+++ b/modules/gui/src/file_browser.cc
@@ -16,14 +16,8 @@
 // along with this library; if not, write to the Free Software Foundation, Inc.,
 // 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
 //------------------------------------------------------------------------------
-#include <QCoreApplication>
-#include <QCursor>
-#include <QVBoxLayout>
-#include <QDesktopServices>
-#include <QDir>
-#include <QFileInfo>
-#include <QUrl>
 
+#include <ost/gui/gosty_app.hh>
 #include <ost/platform.hh>
 #include <ost/config.hh>
 #include <ost/mol/mol.hh>
@@ -35,7 +29,6 @@
 #include <ost/gfx/entity.hh>
 #include <ost/gfx/scene.hh>
 
-#include <ost/gui/gosty_app.hh>
 #include <ost/gui/perspective.hh>
 #include <ost/gui/panels/panel_manager.hh>
 #include <ost/gui/file_loader.hh>
@@ -52,6 +45,14 @@
 #include "widget_registry.hh"
 #include "file_browser.hh"
 
+#include <QCoreApplication>
+#include <QCursor>
+#include <QVBoxLayout>
+#include <QDesktopServices>
+#include <QDir>
+#include <QFileInfo>
+#include <QUrl>
+
 namespace ost { namespace gui {
 
 FileBrowser::FileBrowser(QWidget* parent):
diff --git a/modules/gui/src/file_browser.hh b/modules/gui/src/file_browser.hh
index fadaf69a9d3ff30dcd5d68eec536ae1de3d06d51..902291746cb23d08703ec670b33eedd8a10f78aa 100644
--- a/modules/gui/src/file_browser.hh
+++ b/modules/gui/src/file_browser.hh
@@ -19,14 +19,14 @@
 #ifndef OST_GUI_FILE_BROWSER_HH
 #define OST_GUI_FILE_BROWSER_HH
 
-#include <QDirModel>
-#include <QListView>
-#include <QComboBox>
 
 #include <ost/gfx/gfx_object.hh>
 #include <ost/gui/module_config.hh>
 #include <ost/gui/widget.hh>
 
+#include <QDirModel>
+#include <QListView>
+#include <QComboBox>
 namespace ost { namespace gui {
 
 
diff --git a/modules/gui/src/file_loader.cc b/modules/gui/src/file_loader.cc
index d7061b3ebf3e30e67e06e12c01c26d7acee0b3b6..6f56900d36e5961aa5516c842bcfdf6e06004ada 100644
--- a/modules/gui/src/file_loader.cc
+++ b/modules/gui/src/file_loader.cc
@@ -16,16 +16,9 @@
 // along with this library; if not, write to the Free Software Foundation, Inc.,
 // 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
 //------------------------------------------------------------------------------
+#include <ost/gui/gosty_app.hh>
 #include "file_loader.hh"
 
-#include <QDir>
-#include <QAction>
-#include <QMenu>
-#include <QFileInfo>
-#include <QMessageBox>
-#include <QMenuBar>
-
-
 #include <ost/config.hh>
 #include <ost/mol/mol.hh>
 #include <ost/mol/surface.hh>
@@ -45,7 +38,6 @@
 #include <ost/gfx/surface.hh>
 #include <ost/gfx/scene.hh>
 
-#include <ost/gui/gosty_app.hh>
 #include <ost/gui/perspective.hh>
 #include <ost/gui/python_shell/python_interpreter.hh>
 #include <ost/gui/main_area.hh>
@@ -58,6 +50,12 @@
   #include <ost/img/extent.hh>
 #endif
 
+#include <QDir>
+#include <QAction>
+#include <QMenu>
+#include <QFileInfo>
+#include <QMessageBox>
+#include <QMenuBar>
 namespace ost { namespace gui {
 
 LoaderManagerPtr FileLoader::loader_manager_ = LoaderManagerPtr();
diff --git a/modules/gui/src/file_loader.hh b/modules/gui/src/file_loader.hh
index 26d77cd49d98b34ee4b40655089a451eb6a7a4e4..c9f7fbc533b8493068d5168250443526fe03f565 100644
--- a/modules/gui/src/file_loader.hh
+++ b/modules/gui/src/file_loader.hh
@@ -20,9 +20,6 @@
 #define OST_GUI_FILE_LOADER_HH
 #include <vector>
 
-#include <QString>
-#include <QList>
-#include <QMap>
 
 #include <ost/gfx/gfx_object.hh>
 
@@ -38,6 +35,9 @@
 #include <ost/io/map_io_handler.hh>
 #endif
 
+#include <QString>
+#include <QList>
+#include <QMap>
 namespace ost { namespace gui {
 
 class DLLEXPORT_OST_GUI FileLoader {
diff --git a/modules/gui/src/file_type_dialog.cc b/modules/gui/src/file_type_dialog.cc
index 320e101865094d3f91e8e0033ebc3a2d68a8fe5d..caf11bc83b38de6232557828feb57da9cd1e93cb 100644
--- a/modules/gui/src/file_type_dialog.cc
+++ b/modules/gui/src/file_type_dialog.cc
@@ -18,15 +18,15 @@
 //------------------------------------------------------------------------------
 #include "file_type_dialog.hh"
 
+
+#include <ost/io/io_manager.hh>
+#include <ost/io/io_exception.hh>
+
 #include <QPushButton>
 #include <QVBoxLayout>
 #include <QHBoxLayout>
 #include <QTableWidgetItem>
 #include <QHeaderView>
-
-#include <ost/io/io_manager.hh>
-#include <ost/io/io_exception.hh>
-
 namespace ost { namespace gui {
 
 FileTypeDialog::FileTypeDialog(const QString& file_name, QWidget* parent):
diff --git a/modules/gui/src/file_type_dialog.hh b/modules/gui/src/file_type_dialog.hh
index b0d6e44338a655ab80d08b4ffd3b8568cc498f20..2ce157556ddd2a9623b80417e9d2e48f1fc48d58 100644
--- a/modules/gui/src/file_type_dialog.hh
+++ b/modules/gui/src/file_type_dialog.hh
@@ -26,9 +26,6 @@
 #include <ost/gui/module_config.hh>
 
 
-#include <QDialog>
-#include <QTableWidget>
-#include <QLabel>
 
 #include <ost/io/entity_io_handler.hh>
 #include <ost/io/sequence_io_handler.hh>
@@ -37,6 +34,10 @@
 #include <ost/io/map_io_handler.hh>
 #endif
 
+#include <QDialog>
+#include <QTableWidget>
+#include <QLabel>
+
 namespace ost { namespace gui {
 
 /// \brief dialog to select a file type
diff --git a/modules/gui/src/file_viewer.cc b/modules/gui/src/file_viewer.cc
index f9ba0153e94d5b4c6b0f28259b5c7c8a2db52fd5..4d284702ecac7fda249237f7dfb3a5c00cdd6ebe 100644
--- a/modules/gui/src/file_viewer.cc
+++ b/modules/gui/src/file_viewer.cc
@@ -16,12 +16,12 @@
 // along with this library; if not, write to the Free Software Foundation, Inc.,
 // 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
 //------------------------------------------------------------------------------
-#include <QtGui>
 
 #include <ost/gui/python_shell/python_syntax_highlighter.hh>
 
 #include "file_viewer.hh"
 
+#include <QtGui>
 namespace ost { namespace gui {
 
 FileViewer::FileViewer(const QString& path, QWidget* parent):
diff --git a/modules/gui/src/file_viewer.hh b/modules/gui/src/file_viewer.hh
index 2896d2b1071dc15d02cfec514c1ab2d1306be2c3..48f927a5cd3fb516b3e1fc95cd786a3a53dc87c9 100644
--- a/modules/gui/src/file_viewer.hh
+++ b/modules/gui/src/file_viewer.hh
@@ -19,12 +19,12 @@
 #ifndef OST_GUI_FILE_VIEWER_HH
 #define OST_GUI_FILE_VIEWER_HH
 
-#include <QMainWindow>
-#include <QSyntaxHighlighter>
-#include <QTextEdit>
 
 #include <ost/gui/module_config.hh>
 
+#include <QMainWindow>
+#include <QSyntaxHighlighter>
+#include <QTextEdit>
 namespace ost { namespace gui {
 
 /// \brief a simplistic file viewer
diff --git a/modules/gui/src/gl_canvas.cc b/modules/gui/src/gl_canvas.cc
index 320cc3d0f129f046c9f52aa5ed775cee31a6d7d4..2b7d93f1f4f1be95ba1b603f99041a3bcd196fb1 100644
--- a/modules/gui/src/gl_canvas.cc
+++ b/modules/gui/src/gl_canvas.cc
@@ -20,26 +20,26 @@
 #include <sys/time.h>
 #endif
 
+#include <ost/gui/python_shell/python_interpreter.hh>
 #include "gl_canvas.hh"
 #include "gl_win.hh"
 
 #include <ost/log.hh>
 #include <ost/dyn_cast.hh>
 #include <ost/mol/view_op.hh>
-#include <ost/gfx/scene.hh>
-#include <ost/gfx/entity.hh>
 
 #include <ost/seq/alignment_handle.hh>
 
-#include <ost/gui/python_shell/python_interpreter.hh>
 
-#include "tools/tool_manager.hh"
 
+#include <ost/gfx/scene.hh>
+#include <ost/gfx/entity.hh>
 #include <QTimer>
 #include <QStatusBar>
 #include <QApplication>
 #include <QClipboard>
 #include <QMenu>
+#include "tools/tool_manager.hh"
 
 namespace ost { namespace gui {
 
diff --git a/modules/gui/src/gl_canvas.hh b/modules/gui/src/gl_canvas.hh
index 631aa624d9cffc8fd68e20da0477728a5dd7e8fe..82e25436c772644347cc28d834bfe4da41256504 100644
--- a/modules/gui/src/gl_canvas.hh
+++ b/modules/gui/src/gl_canvas.hh
@@ -19,21 +19,21 @@
 #ifndef OST_GUI_GL_CANVAS_HH
 #define OST_GUI_GL_CANVAS_HH
 
-#include <ost/gfx/glwin_base.hh>
-#include <ost/gfx/input.hh>
 
 // must come before QGLWidget
 #include <ost/mol/mol.hh>
-#include <ost/gfx/gfx_object_fw.hh>
 
-#include <ost/gui/tools/tool.hh>
-#include <ost/gui/scene_menu.hh>
 
 // Qt includes must come last
 #include <QGLWidget>
 #include <QTime>
 #include <QBasicTimer>
 #include <QMouseEvent>
+#include <ost/gui/tools/tool.hh>
+#include <ost/gui/scene_menu.hh>
+#include <ost/gfx/glwin_base.hh>
+#include <ost/gfx/input.hh>
+#include <ost/gfx/gfx_object_fw.hh>
 
 class QMenu;
 
diff --git a/modules/gui/src/gl_win.cc b/modules/gui/src/gl_win.cc
index 693a9197a821b10e5d9d69d0fc0dd1f755ffa99c..15c89284688c62713497320b66119bd7de0171d3 100644
--- a/modules/gui/src/gl_win.cc
+++ b/modules/gui/src/gl_win.cc
@@ -16,6 +16,7 @@
 // along with this library; if not, write to the Free Software Foundation, Inc.,
 // 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
 //------------------------------------------------------------------------------
+#include <ost/gui/gosty_app.hh>
 #include <ost/log.hh>
 #include <ost/config.hh>
 #include <ost/gfx/scene.hh>
@@ -25,7 +26,6 @@
 #include <ost/gui/tools/selection_tool.hh>
 #include <ost/gui/tools/manipulator.hh>
 #include <ost/gui/tools/measure_tool.hh>
-#include <ost/gui/gosty_app.hh>
 #include <ost/gui/perspective.hh>
 
 #if OST_IMG_ENABLED
diff --git a/modules/gui/src/gl_win.hh b/modules/gui/src/gl_win.hh
index c5d0efb2d46a65f1154384ba3af21bf45b28f25b..d634e37f41e2756dabe6e498ecd25b958d6f3763 100644
--- a/modules/gui/src/gl_win.hh
+++ b/modules/gui/src/gl_win.hh
@@ -19,11 +19,6 @@
 #ifndef OST_GUI_GL_WIN_HH
 #define OST_GUI_GL_WIN_HH
 
-#include <QMainWindow>
-#include <QAction>
-
-#include <QActionGroup>
-#include <QStatusBar>
 
 #include <ost/gfx/scene_observer.hh>
 
@@ -34,6 +29,12 @@
 #include <ost/gui/tools/tool.hh>
 #include <ost/gui/tools/tool_bar.hh>
 
+#include <QMainWindow>
+#include <QAction>
+
+#include <QActionGroup>
+#include <QStatusBar>
+
 /*
   Authors: Ansgar Philippsen, Marco Biasini
  */
diff --git a/modules/gui/src/gosty.cc b/modules/gui/src/gosty.cc
index d8ce0bc86839cf9bdf3abd212cb9a5dd4f744e4c..8409eecd58cf057ef57d74d045a3de54a4a7cce8 100644
--- a/modules/gui/src/gosty.cc
+++ b/modules/gui/src/gosty.cc
@@ -23,8 +23,6 @@
 #include <sstream>
 #include <ctime>
 
-#include <QDir>
-#include <QTimer>
 #include <ost/gui/module_config.hh>
 #include <ost/log.hh>
 #include <ost/platform.hh>
@@ -39,6 +37,8 @@
 #include <QApplication>
 #include <QResource>
 #include <QFileInfo>
+#include <QDir>
+#include <QTimer>
 
 using namespace ost;
 using namespace ost::gui;
diff --git a/modules/gui/src/gosty.hh b/modules/gui/src/gosty.hh
index 6f2b6bd56ee082c353852eb6fe7a191f6d9c488c..fe1d881f9a1cba9c0cd07e87f7b4b144d6c1801b 100644
--- a/modules/gui/src/gosty.hh
+++ b/modules/gui/src/gosty.hh
@@ -19,10 +19,10 @@
 #ifndef OST_GUI_GOSTY_HH
 #define OST_GUI_GOSTY_HH
 
-#include <QObject>
 
 #include <ost/gui/module_config.hh>
 
+#include <QObject>
 namespace ost { namespace gui { namespace detail {
 
 /// \brief helper class for delayed script execution
diff --git a/modules/gui/src/gosty_app.cc b/modules/gui/src/gosty_app.cc
index 4a05387b9c167d3bce76869379112417bd93487f..f162d57ffbffa6db3cd319a53c2b317f7dbd5273 100644
--- a/modules/gui/src/gosty_app.cc
+++ b/modules/gui/src/gosty_app.cc
@@ -16,13 +16,9 @@
 // along with this library; if not, write to the Free Software Foundation, Inc.,
 // 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
 //------------------------------------------------------------------------------
+#include "gosty_app.hh"
 #include <iostream>
 
-#include <QApplication>
-#include <QMainWindow>
-
-#include <QMenuBar>
-#include <QDesktopWidget>
 
 #include <ost/gui/python_shell/python_shell.hh>
 #include <ost/gui/gl_win.hh>
@@ -30,8 +26,12 @@
 #include <ost/gui/perspective.hh>
 #include <ost/gui/main_area.hh>
 
-#include "gosty_app.hh"
 
+#include <QApplication>
+#include <QMainWindow>
+
+#include <QMenuBar>
+#include <QDesktopWidget>
 /*
   Author: Marco Biasini, Andreas Schenk, Stefan Scheuber
  */
diff --git a/modules/gui/src/gosty_app.hh b/modules/gui/src/gosty_app.hh
index d3acd17af434940161b4b896a216c7fdd237428d..fd9b9d2234083ec0102c5333fbc37c14c0de54c6 100644
--- a/modules/gui/src/gosty_app.hh
+++ b/modules/gui/src/gosty_app.hh
@@ -23,9 +23,6 @@
   Author: Marco Biasini, Andreas Schenk
  */
 
-#include <QObject>
-#include <QString>
-#include <QMap>
 
 #include <ost/config.hh>
 #include <ost/gui/module_config.hh>
@@ -40,6 +37,9 @@
 #endif
 
 
+#include <QObject>
+#include <QString>
+#include <QMap>
 
 
 class QMainWindow;
diff --git a/modules/gui/src/input/spnav_input.hh b/modules/gui/src/input/spnav_input.hh
index 776fd5de425179ab59bb39c9fa144ae12bee4b81..557934967aba609e1f8f86f76315e770486d9b2c 100644
--- a/modules/gui/src/input/spnav_input.hh
+++ b/modules/gui/src/input/spnav_input.hh
@@ -23,12 +23,12 @@
 #ifndef OST_GUI_SPNAV_INPUT_HH
 #define OST_GUI_SPNAV_INPUT_HH
 
-#include <QThread>
-#include <QMetaType>
 
 #include <ost/geom/geom.hh>
 #include <ost/gui/module_config.hh>
 
+#include <QThread>
+#include <QMetaType>
 Q_DECLARE_METATYPE(geom::Mat4);
 
 namespace ost { namespace gui {
diff --git a/modules/gui/src/loader_manager.cc b/modules/gui/src/loader_manager.cc
index 7ea2f661c8bbe3a4a9bef06bbb16de714559f43b..30a80a7a8940fac7789f1da29f1ab520ac93e58d 100644
--- a/modules/gui/src/loader_manager.cc
+++ b/modules/gui/src/loader_manager.cc
@@ -16,7 +16,10 @@
 // along with this library; if not, write to the Free Software Foundation, Inc.,
 // 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
 //------------------------------------------------------------------------------
+#include <ost/gui/gosty_app.hh>
 #include "loader_manager.hh"
+
+#include <ost/gui/perspective.hh>
 #include <QDir>
 #include <QAction>
 #include <QMenu>
@@ -24,9 +27,6 @@
 #include <QMessageBox>
 #include <QMenuBar>
 
-#include <ost/gui/gosty_app.hh>
-#include <ost/gui/perspective.hh>
-
 
 namespace ost { namespace gui {
 
diff --git a/modules/gui/src/main.cc b/modules/gui/src/main.cc
index 9e6df4405fa04f04804006f81256a94b4a0abff9..ba2dc6f3cd19a3892e044629149a301d03ab63fe 100644
--- a/modules/gui/src/main.cc
+++ b/modules/gui/src/main.cc
@@ -16,10 +16,21 @@
 // along with this library; if not, write to the Free Software Foundation, Inc.,
 // 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
 //------------------------------------------------------------------------------
+#include <ost/gui/gosty_app.hh>
 #include "main.hh"
 
 #include <sstream>
 
+
+#include <ost/log.hh>
+#include <ost/gui/python_shell/python_shell.hh>
+#include <ost/gui/file_loader.hh>
+
+#include "gl_win.hh"
+//#include "entity_explorer/entity_explorer.hh"
+#include "tools/tool_options_win.hh"
+
+
 #include <QApplication>
 #include <QDesktopWidget>
 #include <QAction>
@@ -34,19 +45,6 @@
 #include <QDragEnterEvent>
 #include <QList>
 #include <QUrl>
-
-#include <ost/log.hh>
-#include <ost/gui/python_shell/python_shell.hh>
-#include <ost/gui/gosty_app.hh>
-#include <ost/gui/file_loader.hh>
-
-#include "gl_win.hh"
-//#include "entity_explorer/entity_explorer.hh"
-#include "tools/tool_options_win.hh"
-#include "plot_viewer/plot_viewer_proxy.hh"
-#include "plot_viewer/plot_viewer.hh"
-
-
 //#include "xpm/ost_small.xpm"
 
 namespace ost { namespace gui {
diff --git a/modules/gui/src/main.hh b/modules/gui/src/main.hh
index 8d718cfe43047f4c37fb1d55772fb505b5dc6a00..67f204518eaa7fe2066b821f4569d11e97b7e59b 100644
--- a/modules/gui/src/main.hh
+++ b/modules/gui/src/main.hh
@@ -27,7 +27,6 @@
 
 #include "widget_state_saver.hh"
 
-#include "plot_viewer/plot_viewer_proxy_fw.hh"
 
 // Qt headers must come last
 #include <QMainWindow>
diff --git a/modules/gui/src/main_area.cc b/modules/gui/src/main_area.cc
index 38717e46d800cc4b045ad11cae480be64a921f47..82ced876c696b2695f91ea01c5c0f54c0ff0cd3a 100644
--- a/modules/gui/src/main_area.cc
+++ b/modules/gui/src/main_area.cc
@@ -17,12 +17,12 @@
 // 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
 //------------------------------------------------------------------------------
 #include <cassert>
-#include <QMdiSubWindow>
-#include <QSettings>
 
 #include <ost/gui/widget_geom_handler.hh>
 #include "main_area.hh"
 
+#include <QMdiSubWindow>
+#include <QSettings>
 /*
   Author: Marco Biasini
  */
diff --git a/modules/gui/src/main_area.hh b/modules/gui/src/main_area.hh
index 9616340b065209748c984fd7543d98661e2e5966..535b7465d7336c492d5865ef2bac2d9bdeca9550 100644
--- a/modules/gui/src/main_area.hh
+++ b/modules/gui/src/main_area.hh
@@ -19,10 +19,10 @@
 #ifndef OST_GUI_MAIN_AREA_HH
 #define OST_GUI_MAIN_AREA_HH
 
-#include <QMdiArea>
 
 #include <ost/gui/module_config.hh>
 
+#include <QMdiArea>
 /*
   Author: Marco Biasini
  */
diff --git a/modules/gui/src/main_window.hh b/modules/gui/src/main_window.hh
index 3d34956b261168491e2c703ea46dfd610d9e173a..4f0796e29877454cc727573c805f6f9193b125e3 100644
--- a/modules/gui/src/main_window.hh
+++ b/modules/gui/src/main_window.hh
@@ -27,13 +27,13 @@
 
 #include <map>
 
-#include <QMainWindow>
-#include <QMenu>
 
 #include <ost/base.hh>
 #include <ost/gui/module_config.hh>
 
 
+#include <QMainWindow>
+#include <QMenu>
 
 namespace ost { namespace gui {
 
diff --git a/modules/gui/src/messages/log_reader.hh b/modules/gui/src/messages/log_reader.hh
index cd16ca3b4be1b9baff12f40c68bc1ded8ec9d0f1..e64565117f5c3758da5531935cef1e42057dc391 100644
--- a/modules/gui/src/messages/log_reader.hh
+++ b/modules/gui/src/messages/log_reader.hh
@@ -19,14 +19,14 @@
 #ifndef OST_GUI_MESSAGES_LOG_READER_HH
 #define OST_GUI_MESSAGES_LOG_READER_HH
 
-#include <QObject>
-#include <QMap>
-#include <QMessageBox>
 
 #include <ost/log_sink.hh>
 
 #include <ost/gui/module_config.hh>
 
+#include <QObject>
+#include <QMap>
+#include <QMessageBox>
 /*
   Author: Stefan Scheuber
 */
diff --git a/modules/gui/src/messages/message_box_widget.cc b/modules/gui/src/messages/message_box_widget.cc
index 6d6f5b4e1c1c02d82374f025a7b08cb73724c8cc..1be4b817c57fb7353ae094475993eb534721819e 100644
--- a/modules/gui/src/messages/message_box_widget.cc
+++ b/modules/gui/src/messages/message_box_widget.cc
@@ -19,14 +19,10 @@
 /*
  Author: Stefan Scheuber
  */
-#include <QDir>
-#include <QLabel>
-#include <QMenu>
-#include <QVBoxLayout>
 
+#include <ost/gui/gosty_app.hh>
 #include <ost/platform.hh>
 
-#include <ost/gui/gosty_app.hh>
 #include <ost/gui/perspective.hh>
 #include <ost/gui/widget_registry.hh>
 
@@ -35,6 +31,10 @@
 #include "log_reader.hh"
 #include "message_box_widget.hh"
 
+#include <QDir>
+#include <QLabel>
+#include <QMenu>
+#include <QVBoxLayout>
 namespace ost {namespace gui {
 
 MessageLevel::MessageLevel(QPixmap icon, QWidget* parent): QWidget(parent), message_count_(0), count_label_(new QLabel(QString::number(message_count_)+"  ",this)){
diff --git a/modules/gui/src/messages/message_box_widget.hh b/modules/gui/src/messages/message_box_widget.hh
index fbd5c954566b71b874072fbb0c7aacdbbddba26c..5088397d05349f6b131622e5e6106bb8b3aa8c75 100644
--- a/modules/gui/src/messages/message_box_widget.hh
+++ b/modules/gui/src/messages/message_box_widget.hh
@@ -19,12 +19,12 @@
 #ifndef OST_GUI_MESSAGES_BOX_MESSAGE_WIDGET_HH
 #define OST_GUI_MESSAGES_BOX_MESSAGE_WIDGET_HH
 
-#include <QWidget>
-#include <QMap>
-#include <QMessageBox>
 
 #include <ost/gui/module_config.hh>
 
+#include <QWidget>
+#include <QMap>
+#include <QMessageBox>
 /*
   Author: Stefan Scheuber
 */
diff --git a/modules/gui/src/messages/message_widget.cc b/modules/gui/src/messages/message_widget.cc
index 5e4363397eb77c423823a45d181b7cb7894fb359..8a87b06c789e9c6f1e9ccf229ab594465e523045 100644
--- a/modules/gui/src/messages/message_widget.cc
+++ b/modules/gui/src/messages/message_widget.cc
@@ -19,19 +19,20 @@
 /*
  Author: Stefan Scheuber
  */
-#include <QApplication>
-#include <QDir>
-#include <QMenu>
-#include <QVBoxLayout>
 
+#include <ost/gui/gosty_app.hh>
 #include <ost/platform.hh>
 
 #include <ost/gui/widget_registry.hh>
-#include <ost/gui/gosty_app.hh>
 
 #include "log_reader.hh"
 #include "message_widget.hh"
 
+#include <QApplication>
+#include <QDir>
+#include <QMenu>
+#include <QVBoxLayout>
+
 namespace ost {namespace gui {
 
 class MessageWidgetFactory: public WidgetFactory {
diff --git a/modules/gui/src/messages/message_widget.hh b/modules/gui/src/messages/message_widget.hh
index 3aae2a3787c463c9a6b094203d693903b4624f20..f126e0929944089b8dc5832d809fd45f88ea446f 100644
--- a/modules/gui/src/messages/message_widget.hh
+++ b/modules/gui/src/messages/message_widget.hh
@@ -19,13 +19,14 @@
 #ifndef OST_GUI_MESSAGES_MESSAGE_WIDGET_HH
 #define OST_GUI_MESSAGES_MESSAGE_WIDGET_HH
 
-#include <QListView>
-#include <QMessageBox>
-#include <QStandardItemModel>
 
 #include <ost/gui/widget.hh>
 #include <ost/gui/module_config.hh>
 
+#include <QListView>
+#include <QMessageBox>
+#include <QStandardItemModel>
+
 /*
   Author: Stefan Scheuber
 */
diff --git a/modules/gui/src/panels/bottom_bar.cc b/modules/gui/src/panels/bottom_bar.cc
index e5bf3a423fc651d479c66fd0c7e4def320c353db..f3b643aec2a1db820220a8927c2183be901ad618 100644
--- a/modules/gui/src/panels/bottom_bar.cc
+++ b/modules/gui/src/panels/bottom_bar.cc
@@ -17,13 +17,13 @@
 // 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
 //------------------------------------------------------------------------------
 
-#include <QAction>
 
 #include "bottom_bar.hh"
 
 #include "splitter_panel_bar.hh"
 #include "tabbed_panel_bar.hh"
 
+#include <QAction>
 namespace ost { namespace gui {
 
 BottomBar::BottomBar(QWidget* parent):
diff --git a/modules/gui/src/panels/button_bar.hh b/modules/gui/src/panels/button_bar.hh
index 578769349be20124f66b77b3a7ba2ff2fdb93017..ab36d0570cef9b04d48e2130e1afcd9c338e9be5 100644
--- a/modules/gui/src/panels/button_bar.hh
+++ b/modules/gui/src/panels/button_bar.hh
@@ -19,10 +19,6 @@
 #ifndef OST_GUI_BOTTOM_BAR_BUTTON_BAR
 #define OST_GUI_BOTTOM_BAR_BUTTON_BAR
 
-#include <QWidget>
-#include <QString>
-#include <QHBoxLayout>
-#include <QList>
 
 #include <ost/gui/module_config.hh>
 #include <ost/gui/widget.hh>
@@ -30,6 +26,10 @@
 #include "button_box.hh"
 #include "event_button.hh"
 
+#include <QWidget>
+#include <QString>
+#include <QHBoxLayout>
+#include <QList>
 namespace ost { namespace gui {
 
 /// \brief button box
diff --git a/modules/gui/src/panels/button_box.hh b/modules/gui/src/panels/button_box.hh
index a04931aa62662c2ce613a7a53eac088f278f5812..f6525e609b359e97bcc2c462d3fc17f4c969b0ba 100644
--- a/modules/gui/src/panels/button_box.hh
+++ b/modules/gui/src/panels/button_box.hh
@@ -19,17 +19,17 @@
 #ifndef OST_GUI_BOTTOM_BAR_BUTTON_BOX
 #define OST_GUI_BOTTOM_BAR_BUTTON_BOX
 
-#include <QWidget>
-#include <QString>
-#include <QGridLayout>
-#include <QList>
-#include <QLabel>
 
 #include <ost/gui/module_config.hh>
 #include <ost/gui/widget.hh>
 
 #include "event_button.hh"
 
+#include <QWidget>
+#include <QString>
+#include <QGridLayout>
+#include <QList>
+#include <QLabel>
 namespace ost { namespace gui {
 
 /// \brief button box
diff --git a/modules/gui/src/panels/drop_box.cc b/modules/gui/src/panels/drop_box.cc
index a65dfa2c5df5b6f6bb1b7f552b800e9c52ec63d8..149e0a1a4f1f301071c2275b11b465b018c931ea 100644
--- a/modules/gui/src/panels/drop_box.cc
+++ b/modules/gui/src/panels/drop_box.cc
@@ -17,11 +17,11 @@
 // 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
 //------------------------------------------------------------------------------
 
-#include <QHBoxLayout>
-#include <QLabel>
 
 #include "drop_box.hh"
 
+#include <QHBoxLayout>
+#include <QLabel>
 namespace ost { namespace gui {
 
 DropBox::DropBox(QWidget* parent):
diff --git a/modules/gui/src/panels/event_button.hh b/modules/gui/src/panels/event_button.hh
index f1c6d034f7d0b7cf63daf86dd50c5ce87d01a664..0063e5d116db050d67b541f6ffb5dfbe61ace3f9 100644
--- a/modules/gui/src/panels/event_button.hh
+++ b/modules/gui/src/panels/event_button.hh
@@ -19,16 +19,16 @@
 #ifndef OST_GUI_BOTTOM_BAR_EVENT_BUTTON
 #define OST_GUI_BOTTOM_BAR_EVENT_BUTTON
 
+
+#include <ost/gui/module_config.hh>
+#include <ost/gui/widget.hh>
+
 #include <QToolButton>
 #include <QMouseEvent>
 #include <QDragEnterEvent>
 #include <QDropEvent>
 #include <QWidget>
 #include <QString>
-
-#include <ost/gui/module_config.hh>
-#include <ost/gui/widget.hh>
-
 namespace ost { namespace gui {
 
 /// \brief button box
diff --git a/modules/gui/src/panels/panel_bar.cc b/modules/gui/src/panels/panel_bar.cc
index d4e5145eb959a8b24588e8772575954389de0656..291acc925014285f75b985aa7b77bea865262e13 100644
--- a/modules/gui/src/panels/panel_bar.cc
+++ b/modules/gui/src/panels/panel_bar.cc
@@ -17,8 +17,6 @@
 // 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
 //------------------------------------------------------------------------------
 
-#include <QSettings>
-#include <QVariant>
 
 #include <ost/gui/gosty_app.hh>
 #include <ost/gui/perspective.hh>
@@ -31,6 +29,8 @@
 #include "splitter_panel_bar.hh"
 #include "tabbed_panel_bar.hh"
 
+#include <QSettings>
+#include <QVariant>
 namespace ost {
 namespace gui {
 
diff --git a/modules/gui/src/panels/panel_bar.hh b/modules/gui/src/panels/panel_bar.hh
index 277d4207813579ae30e532601f68233faf9b4aa5..ecf930b1c8b3635f19806431294cb211d6ec446a 100644
--- a/modules/gui/src/panels/panel_bar.hh
+++ b/modules/gui/src/panels/panel_bar.hh
@@ -19,11 +19,6 @@
 #ifndef OST_GUI_PANEL_BAR_PANEL_BAR
 #define OST_GUI_PANEL_BAR_PANEL_BAR
 
-#include <QStackedLayout>
-#include <QWidget>
-#include <QString>
-#include <QAction>
-#include <QActionGroup>
 
 #include <ost/gui/module_config.hh>
 #include <ost/gui/widget_pool.hh>
@@ -33,6 +28,11 @@
 #include "button_box.hh"
 
 
+#include <QStackedLayout>
+#include <QWidget>
+#include <QString>
+#include <QAction>
+#include <QActionGroup>
 namespace ost { namespace gui {
 
 class PanelWidgetContainer;
diff --git a/modules/gui/src/panels/panel_bar_widget_holder.cc b/modules/gui/src/panels/panel_bar_widget_holder.cc
index 523aba3ce37fd9ce88b9daf37d5a88a5cd0fdf97..02fc9d181d92207caa82364cb2cc8b118c42016f 100644
--- a/modules/gui/src/panels/panel_bar_widget_holder.cc
+++ b/modules/gui/src/panels/panel_bar_widget_holder.cc
@@ -18,6 +18,18 @@
 //------------------------------------------------------------------------------
 #include <cassert>
 
+
+#include <ost/gui/gosty_app.hh>
+#include <ost/platform.hh>
+
+#include <ost/gui/widget.hh>
+#include <ost/gui/widget_registry.hh>
+#include <ost/gui/perspective.hh>
+
+#include "panel_manager.hh"
+#include "panel_bar.hh"
+#include "panel_bar_widget_holder.hh"
+
 #include <QApplication>
 #include <QMenu>
 #include <QHBoxLayout>
@@ -30,18 +42,6 @@
 #include <QAction>
 #include <QComboBox>
 #include <QDebug>
-
-#include <ost/platform.hh>
-
-#include <ost/gui/widget.hh>
-#include <ost/gui/widget_registry.hh>
-#include <ost/gui/gosty_app.hh>
-#include <ost/gui/perspective.hh>
-
-#include "panel_manager.hh"
-#include "panel_bar.hh"
-#include "panel_bar_widget_holder.hh"
-
 /*
   Author: Marco Biasini, Stefan Scheuber
  */
diff --git a/modules/gui/src/panels/panel_bar_widget_holder.hh b/modules/gui/src/panels/panel_bar_widget_holder.hh
index e06d6ccec0e137f52fabe4c4c6b2c24c2fc155c3..0b3aca1e81d074c3584fedba2fe2547230571d61 100644
--- a/modules/gui/src/panels/panel_bar_widget_holder.hh
+++ b/modules/gui/src/panels/panel_bar_widget_holder.hh
@@ -19,13 +19,13 @@
 #ifndef OST_GUI_PANEL_BAR_WIDGET_HOLDER_HH
 #define OST_GUI_PANEL_BAR_WIDGET_HOLDER_HH
 
-#include <QWidget>
-#include <QMouseEvent>
 
 #include <ost/gui/module_config.hh>
 
 #include "panel_bar.hh"
 
+#include <QWidget>
+#include <QMouseEvent>
 class QToolBar;
 class QAction;
 
diff --git a/modules/gui/src/panels/panel_manager.cc b/modules/gui/src/panels/panel_manager.cc
index 695890c28df1f9b25f97c799cb1ef1093c5c449c..5a5e3cf6c018f4cbc2005477016c32d4559b5cec 100644
--- a/modules/gui/src/panels/panel_manager.cc
+++ b/modules/gui/src/panels/panel_manager.cc
@@ -17,9 +17,6 @@
 // 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
 //------------------------------------------------------------------------------
 
-#include <QSettings>
-#include <QMenu>
-#include <QDebug>
 
 #include <ost/gui/widget_registry.hh>
 
@@ -29,6 +26,9 @@
 #include "tabbed_panel_bar.hh"
 #include "splitter_panel_bar.hh"
 
+#include <QSettings>
+#include <QMenu>
+#include <QDebug>
 namespace ost { namespace gui {
 
 class ExternalWidgetFactory: public WidgetFactory {
diff --git a/modules/gui/src/panels/panel_manager.hh b/modules/gui/src/panels/panel_manager.hh
index 23edf3ecf0e678972122482e1d9fa1c59df1fb5f..d4d505517932134fe957fb53ccd10178ce5504b5 100644
--- a/modules/gui/src/panels/panel_manager.hh
+++ b/modules/gui/src/panels/panel_manager.hh
@@ -19,11 +19,6 @@
 #ifndef OST_GUI_PANEL_BAR_PANEL_MANAGER
 #define OST_GUI_PANEL_BAR_PANEL_MANAGER
 
-#include <QWidget>
-#include <QString>
-#include <QList>
-#include <QMenu>
-#include <QDragEnterEvent>
 
 #include <ost/gui/widget.hh>
 #include <ost/gui/widget_pool.hh>
@@ -32,6 +27,11 @@
 #include "panel_widget_container.hh"
 #include "button_box.hh"
 
+#include <QWidget>
+#include <QString>
+#include <QList>
+#include <QMenu>
+#include <QDragEnterEvent>
 namespace ost { namespace gui {
 
 enum PanelPosition
diff --git a/modules/gui/src/panels/panel_widget_container.hh b/modules/gui/src/panels/panel_widget_container.hh
index ead27c6ebf51f86fbf4537306ede8cd499a83ddc..e46ae504421dd6209960175253044542062e29c4 100644
--- a/modules/gui/src/panels/panel_widget_container.hh
+++ b/modules/gui/src/panels/panel_widget_container.hh
@@ -19,17 +19,17 @@
 #ifndef OST_GUI_PANEL_BAR_PANEL_WIDGET_CONTAINER
 #define OST_GUI_PANEL_BAR_PANEL_WIDGET_CONTAINER
 
-#include <QHBoxLayout>
-#include <QWidget>
-#include <QString>
-#include <QAction>
-#include <QMap>
 
 #include <ost/gui/module_config.hh>
 #include <ost/gui/widget.hh>
 
 #include "panel_bar.hh"
 
+#include <QHBoxLayout>
+#include <QWidget>
+#include <QString>
+#include <QAction>
+#include <QMap>
 namespace ost { namespace gui {
 
 /// \brief A PanelWidgetContainer can display various widgets
diff --git a/modules/gui/src/panels/side_bar.cc b/modules/gui/src/panels/side_bar.cc
index 425a8bb37a3b19fbf09527c6c11cf02a676e2c46..460e8a5641b5bf1658417b00cb17b65dee36d243 100644
--- a/modules/gui/src/panels/side_bar.cc
+++ b/modules/gui/src/panels/side_bar.cc
@@ -17,13 +17,13 @@
 // 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
 //------------------------------------------------------------------------------
 
-#include <QAction>
 
 #include "side_bar.hh"
 
 #include "splitter_panel_bar.hh"
 #include "tabbed_panel_bar.hh"
 
+#include <QAction>
 namespace ost { namespace gui {
 
 SideBar::SideBar(QWidget* parent):
diff --git a/modules/gui/src/panels/splitter_panel_bar.cc b/modules/gui/src/panels/splitter_panel_bar.cc
index 480d9780e98a42cc1546da5adf7bcb9883893c3f..bfd59c5948d2693717f64cf317ce3daa250ceda4 100644
--- a/modules/gui/src/panels/splitter_panel_bar.cc
+++ b/modules/gui/src/panels/splitter_panel_bar.cc
@@ -17,14 +17,14 @@
 // 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
 //------------------------------------------------------------------------------
 
-#include <QSettings>
-
-#include <QPalette>
 #include <ost/gui/widget_registry.hh>
 
 #include "panel_widget_container.hh"
 #include "splitter_panel_bar.hh"
 
+#include <QSettings>
+
+#include <QPalette>
 namespace ost { namespace gui {
 
 SplitterPanelBar::SplitterPanelBar(PanelBar* parent,Qt::Orientation orientation):
diff --git a/modules/gui/src/panels/splitter_panel_bar.hh b/modules/gui/src/panels/splitter_panel_bar.hh
index e8d6ae256a4fb5fab58b50bc2dc321356000525e..b283c9cbfacb429ea83fcbe98f2d5d9bc9e4da22 100644
--- a/modules/gui/src/panels/splitter_panel_bar.hh
+++ b/modules/gui/src/panels/splitter_panel_bar.hh
@@ -19,10 +19,6 @@
 #ifndef OST_GUI_SPLITTER_PANEL_BAR
 #define OST_GUI_SPLITTER_PANEL_BAR
 
-#include <QHBoxLayout>
-#include <QWidget>
-#include <QString>
-#include <QAction>
 
 #include <ost/gui/module_config.hh>
 #include <ost/gui/widget_pool.hh>
@@ -32,6 +28,10 @@
 #include "panel_widget_container.hh"
 #include "panel_bar_widget_holder.hh"
 
+#include <QHBoxLayout>
+#include <QWidget>
+#include <QString>
+#include <QAction>
 namespace ost { namespace gui {
 
 /// \brief bottom Bar
diff --git a/modules/gui/src/panels/tabbed_panel_bar.cc b/modules/gui/src/panels/tabbed_panel_bar.cc
index 3535372e0419883c1954ba1f7cef020a7aa258c7..36ec6e2bc5f75db9eec0968ffc8a1c81cb968756 100644
--- a/modules/gui/src/panels/tabbed_panel_bar.cc
+++ b/modules/gui/src/panels/tabbed_panel_bar.cc
@@ -17,9 +17,6 @@
 // 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
 //------------------------------------------------------------------------------
 
-#include <QApplication>
-#include <QSettings>
-#include <QDir>
 
 #include <ost/gui/gosty_app.hh>
 #include <ost/gui/perspective.hh>
@@ -27,6 +24,9 @@
 
 #include "tabbed_panel_bar.hh"
 
+#include <QApplication>
+#include <QSettings>
+#include <QDir>
 namespace ost { namespace gui {
 
 TabbedPanelBar::TabbedPanelBar(PanelBar* parent):
diff --git a/modules/gui/src/panels/tabbed_panel_bar.hh b/modules/gui/src/panels/tabbed_panel_bar.hh
index 167b4d4a3735942534f947d3c3667c1c1d9fb208..78fb2ab40db4d3920beed0ac4dc03f912451a369 100644
--- a/modules/gui/src/panels/tabbed_panel_bar.hh
+++ b/modules/gui/src/panels/tabbed_panel_bar.hh
@@ -19,13 +19,6 @@
 #ifndef OST_GUI_TABBED_PANEL_BAR
 #define OST_GUI_TABBED_PANEL_BAR
 
-#include <QHBoxLayout>
-#include <QWidget>
-#include <QString>
-#include <QAction>
-#include <QTabBar>
-#include <QTabWidget>
-#include <QToolBar>
 
 #include <ost/gui/module_config.hh>
 #include <ost/gui/widget_pool.hh>
@@ -34,6 +27,13 @@
 #include "panel_widget_container.hh"
 #include "button_box.hh"
 
+#include <QHBoxLayout>
+#include <QWidget>
+#include <QString>
+#include <QAction>
+#include <QTabBar>
+#include <QTabWidget>
+#include <QToolBar>
 namespace ost { namespace gui {
 
 /// \brief tabbed drag widget
diff --git a/modules/gui/src/perspective.cc b/modules/gui/src/perspective.cc
index 6d047e353a98324a8c8cccf2581616714870f4b9..6af76c48090d1bc09529b97906290c34d7fd0272 100644
--- a/modules/gui/src/perspective.cc
+++ b/modules/gui/src/perspective.cc
@@ -16,6 +16,15 @@
 // along with this library; if not, write to the Free Software Foundation, Inc.,
 // 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
 //------------------------------------------------------------------------------
+
+#include <ost/platform.hh>
+
+#include <ost/gui/widget_registry.hh>
+#include <ost/gui/perspective.hh>
+#include <ost/gui/file_browser.hh>
+#include <ost/gui/main_area.hh>
+#include <ost/gui/messages/message_box_widget.hh>
+
 #include <QTextEdit>
 #include <QSizeGrip>
 #include <QMainWindow>
@@ -28,15 +37,6 @@
 #include <QKeySequence>
 #include <QStatusBar>
 #include <QPushButton>
-
-#include <ost/platform.hh>
-
-#include <ost/gui/widget_registry.hh>
-#include <ost/gui/perspective.hh>
-#include <ost/gui/file_browser.hh>
-#include <ost/gui/main_area.hh>
-#include <ost/gui/messages/message_box_widget.hh>
-
 /*
   Author: Marco Biasini
  */
diff --git a/modules/gui/src/perspective.hh b/modules/gui/src/perspective.hh
index d5aa97f97abc36b4308236594ca25d67723a16b9..b52a7c8f0414fc5b759e82300e8fe5c30228a031 100644
--- a/modules/gui/src/perspective.hh
+++ b/modules/gui/src/perspective.hh
@@ -19,12 +19,6 @@
 #ifndef OST_GUI_PERSPECTIVE_HH
 #define OST_GUI_PERSPECTIVE_HH
 
-#include <QObject>
-#include <QMenuBar>
-#include <QMap>
-#include <QString>
-#include <QMenu>
-#include <QStatusBar>
 
 class QMainWindow;
 class QTextEdit;
@@ -34,6 +28,12 @@ class QTextEdit;
 #include <ost/gui/panels/panel_bar.hh>
 #include <ost/gui/module_config.hh>
 
+#include <QObject>
+#include <QMenuBar>
+#include <QMap>
+#include <QString>
+#include <QMenu>
+#include <QStatusBar>
 /*
   Author: Marco Biasini, Stefan Scheuber
  */
diff --git a/modules/gui/src/plot_viewer/plot_axis_base.cc b/modules/gui/src/plot_viewer/plot_axis_base.cc
index 95a75cdb5bba3d34a258e3d7f8ccc804b77c96f1..5bee2b9081889e08bffcb89226d3dab2c013ea6d 100644
--- a/modules/gui/src/plot_viewer/plot_axis_base.cc
+++ b/modules/gui/src/plot_viewer/plot_axis_base.cc
@@ -20,10 +20,10 @@
   Author: Andreas Schenk
 */
 
-#include <QWheelEvent>
-#include <QMouseEvent>
 #include "plot_axis_base.hh"
 
+#include <QWheelEvent>
+#include <QMouseEvent>
 namespace ost{namespace gui{
 
 PlotAxisBase::PlotAxisBase(QWidget * parent):
diff --git a/modules/gui/src/plot_viewer/plot_axis_base.hh b/modules/gui/src/plot_viewer/plot_axis_base.hh
index f16b703d1174710e6bacbd060263260954376138..61d621219ad928c72b25ef0b17ac375b8540a046 100644
--- a/modules/gui/src/plot_viewer/plot_axis_base.hh
+++ b/modules/gui/src/plot_viewer/plot_axis_base.hh
@@ -23,9 +23,9 @@
   Author: Andreas Schenk
 */
 
+#include "plot_ticker.hh"
 #include <QWidget>
 
-#include "plot_ticker.hh"
 
 namespace ost { namespace gui {
 
diff --git a/modules/gui/src/plot_viewer/plot_axis_horizontal.cc b/modules/gui/src/plot_viewer/plot_axis_horizontal.cc
index 05b13f5519734df82c2681e51134f6921353cdf9..3279221386c7951ba749ca810cf99dab5ca36500 100644
--- a/modules/gui/src/plot_viewer/plot_axis_horizontal.cc
+++ b/modules/gui/src/plot_viewer/plot_axis_horizontal.cc
@@ -19,11 +19,11 @@
 /*
   Author: Andreas Schenk
 */
-#include <QPainter>
-#include <QMouseEvent>
 
 #include "plot_axis_horizontal.hh"
 
+#include <QPainter>
+#include <QMouseEvent>
 namespace ost{namespace gui{
 
 PlotAxisHorizontal::PlotAxisHorizontal(QWidget * parent):
diff --git a/modules/gui/src/plot_viewer/plot_axis_vertical.cc b/modules/gui/src/plot_viewer/plot_axis_vertical.cc
index f6bf01a2c5f772da187f027523f83cb2a6be1418..f276953dd1603051b5f701e8c9b0cfb90027943c 100644
--- a/modules/gui/src/plot_viewer/plot_axis_vertical.cc
+++ b/modules/gui/src/plot_viewer/plot_axis_vertical.cc
@@ -20,11 +20,11 @@
   Author: Andreas Schenk
 */
 
-#include <QMouseEvent>
-#include <QPainter>
 
 #include "plot_axis_vertical.hh"
 
+#include <QMouseEvent>
+#include <QPainter>
 namespace ost{namespace gui{
 
 PlotAxisVertical::PlotAxisVertical(QWidget * parent):
diff --git a/modules/gui/src/plot_viewer/plot_data_entry.hh b/modules/gui/src/plot_viewer/plot_data_entry.hh
index f6d443eaed51d07ebf22ed4671508273bee20d09..5fed0c683392c89ce7d476a5f4c9a7ede022f889 100644
--- a/modules/gui/src/plot_viewer/plot_data_entry.hh
+++ b/modules/gui/src/plot_viewer/plot_data_entry.hh
@@ -24,8 +24,8 @@
   Author: Andreas Schenk
 */
 
-#include <QString>
 #include <ost/gui/module_config.hh>
+#include <QString>
 
 namespace ost{namespace gui{
 
diff --git a/modules/gui/src/plot_viewer/plot_data_graphics_item.cc b/modules/gui/src/plot_viewer/plot_data_graphics_item.cc
index 81a0b78c7a26f92b1c125a87a595b255c96b7aa9..098f06bca2f4ab55048c125821a8695c49ad7742 100644
--- a/modules/gui/src/plot_viewer/plot_data_graphics_item.cc
+++ b/modules/gui/src/plot_viewer/plot_data_graphics_item.cc
@@ -20,10 +20,9 @@
   Author: Andreas Schenk
 */
 
-#include <QtAlgorithms>
 
-#include <ost/dyn_cast.hh>
 #include <ost/gui/python_shell/python_interpreter.hh>
+#include <ost/dyn_cast.hh>
 #include "plot_data_info.hh"
 #include "plot_graphics_ellipse_item.hh"
 #include "plot_graphics_rectangle_item.hh"
@@ -31,6 +30,7 @@
 #include "plot_graphics_diagonal_cross_item.hh"
 #include "plot_data_graphics_item.hh"
 
+#include <QtAlgorithms>
 
 namespace ost{namespace gui{
 
diff --git a/modules/gui/src/plot_viewer/plot_data_graphics_item_base.hh b/modules/gui/src/plot_viewer/plot_data_graphics_item_base.hh
index 050bcca2f51f5be23f62077c30ff9cd7ff2d7822..0a08efb05e343f283e1d9a5b87b0001d22ddf5be 100644
--- a/modules/gui/src/plot_viewer/plot_data_graphics_item_base.hh
+++ b/modules/gui/src/plot_viewer/plot_data_graphics_item_base.hh
@@ -23,12 +23,12 @@
   Author: Andreas Schenk
 */
 
-#include <QGraphicsItem>
-#include <QObject>
 
 #include <ost/gui/module_config.hh>
 #include "plot_info_base.hh"
 
+#include <QGraphicsItem>
+#include <QObject>
 namespace ost{namespace gui{
 
 class DLLEXPORT_OST_GUI PlotDataGraphicsItemBase: public QObject, public QGraphicsItem
diff --git a/modules/gui/src/plot_viewer/plot_data_info.hh b/modules/gui/src/plot_viewer/plot_data_info.hh
index d1babc2f966efe66791371a80010462f3a435229..5e5f4767a1316a4865724475c3f77b8adee01285 100644
--- a/modules/gui/src/plot_viewer/plot_data_info.hh
+++ b/modules/gui/src/plot_viewer/plot_data_info.hh
@@ -24,9 +24,9 @@
   Author: Andreas Schenk
 */
 
+#include <boost/python.hpp>
 #include <ost/gui/module_config.hh>
 #include <ost/gui/plot_viewer/plot_data_info_fw.hh>
-#include <boost/python.hpp>
 #include <vector>
 
 #include "plot_info_base.hh"
diff --git a/modules/gui/src/plot_viewer/plot_function_graphics_item.hh b/modules/gui/src/plot_viewer/plot_function_graphics_item.hh
index 2c43be23bf5644dbdcb481249fb208242c7d83cf..84da4314b12db9038d0fc62cf0e4be3a1993ac45 100644
--- a/modules/gui/src/plot_viewer/plot_function_graphics_item.hh
+++ b/modules/gui/src/plot_viewer/plot_function_graphics_item.hh
@@ -23,11 +23,11 @@
   Author: Andreas Schenk
 */
 
-#include <QGraphicsItem>
 #include "plot_data_graphics_item_base.hh"
 #include "plot_function.hh"
 #include "plot_function_info.hh"
 
+#include <QGraphicsItem>
 namespace ost{namespace gui{
 
 class DLLEXPORT_OST_GUI PlotFunctionGraphicsItem: public PlotDataGraphicsItemBase
diff --git a/modules/gui/src/plot_viewer/plot_graphics_cross_item.cc b/modules/gui/src/plot_viewer/plot_graphics_cross_item.cc
index 23ebd6cbcc644a51886933a7bb5f63e5c0d8311d..52f70067a58e30715bddbf8524e5a87b66a238a0 100644
--- a/modules/gui/src/plot_viewer/plot_graphics_cross_item.cc
+++ b/modules/gui/src/plot_viewer/plot_graphics_cross_item.cc
@@ -20,11 +20,11 @@
   Author: Andreas Schenk
 */
 
-#include <QCursor>
-#include <QToolTip>
 #include "plot_data_info.hh"
 #include "plot_data_graphics_item.hh"
 #include "plot_graphics_cross_item.hh"
+#include <QCursor>
+#include <QToolTip>
 
 namespace ost {namespace gui {
 
diff --git a/modules/gui/src/plot_viewer/plot_graphics_cross_item.hh b/modules/gui/src/plot_viewer/plot_graphics_cross_item.hh
index d423d1339ee0a424a15b576ed0c0516b41127aa5..ce89659df2e5a4d22bf0d1f2514415d899b08eb8 100644
--- a/modules/gui/src/plot_viewer/plot_graphics_cross_item.hh
+++ b/modules/gui/src/plot_viewer/plot_graphics_cross_item.hh
@@ -23,10 +23,10 @@
   Author: Andreas Schenk
 */
 
-#include <QGraphicsItem>
-#include <QGraphicsSceneHoverEvent>
 #include "plot_data_entry.hh"
 #include "plot_data_info_fw.hh"
+#include <QGraphicsItem>
+#include <QGraphicsSceneHoverEvent>
 
 namespace ost {namespace gui {
 
diff --git a/modules/gui/src/plot_viewer/plot_graphics_diagonal_cross_item.cc b/modules/gui/src/plot_viewer/plot_graphics_diagonal_cross_item.cc
index 88e92852ec7c867e1e54ce3f4b3887e19019fdc4..a60ded4cecb8e5646f69853c3249972b29f4e75d 100644
--- a/modules/gui/src/plot_viewer/plot_graphics_diagonal_cross_item.cc
+++ b/modules/gui/src/plot_viewer/plot_graphics_diagonal_cross_item.cc
@@ -19,11 +19,11 @@
 /*
   Author: Andreas Schenk
 */
-#include <QCursor>
-#include <QToolTip>
 #include "plot_data_info.hh"
 #include "plot_data_graphics_item.hh"
 #include "plot_graphics_diagonal_cross_item.hh"
+#include <QCursor>
+#include <QToolTip>
 
 namespace ost {namespace gui {
 
diff --git a/modules/gui/src/plot_viewer/plot_graphics_diagonal_cross_item.hh b/modules/gui/src/plot_viewer/plot_graphics_diagonal_cross_item.hh
index 01cf3b5643b5a35e097ca0d0e4640b45f3d36a3d..4b185b8371df0a91454d3ccabf50405341dba99a 100644
--- a/modules/gui/src/plot_viewer/plot_graphics_diagonal_cross_item.hh
+++ b/modules/gui/src/plot_viewer/plot_graphics_diagonal_cross_item.hh
@@ -23,10 +23,10 @@
   Author: Andreas Schenk
 */
 
-#include <QGraphicsItem>
-#include <QGraphicsSceneHoverEvent>
 #include "plot_data_entry.hh"
 #include "plot_data_info_fw.hh"
+#include <QGraphicsItem>
+#include <QGraphicsSceneHoverEvent>
 
 namespace ost {namespace gui {
 
diff --git a/modules/gui/src/plot_viewer/plot_graphics_ellipse_item.cc b/modules/gui/src/plot_viewer/plot_graphics_ellipse_item.cc
index a176d07ff406667715590c57bd4fb59e058fb5c2..abf995841dcb87edac7601614dfa97cf725f4f62 100644
--- a/modules/gui/src/plot_viewer/plot_graphics_ellipse_item.cc
+++ b/modules/gui/src/plot_viewer/plot_graphics_ellipse_item.cc
@@ -20,11 +20,11 @@
   Author: Andreas Schenk
 */
 
-#include <QCursor>
-#include <QToolTip>
 #include "plot_data_info.hh"
 #include "plot_data_graphics_item.hh"
 #include "plot_graphics_ellipse_item.hh"
+#include <QCursor>
+#include <QToolTip>
 
 namespace ost{namespace gui{
 
diff --git a/modules/gui/src/plot_viewer/plot_graphics_ellipse_item.hh b/modules/gui/src/plot_viewer/plot_graphics_ellipse_item.hh
index f9f21c0524ac585635a7e3d3a5fef34ef89456ef..9aa90807243d3b92601b030af81fcad7a86143a1 100644
--- a/modules/gui/src/plot_viewer/plot_graphics_ellipse_item.hh
+++ b/modules/gui/src/plot_viewer/plot_graphics_ellipse_item.hh
@@ -23,10 +23,10 @@
   Author: Andreas Schenk
 */
 
-#include <QGraphicsItem>
-#include <QGraphicsSceneHoverEvent>
 #include "plot_data_entry.hh"
 #include "plot_data_info_fw.hh"
+#include <QGraphicsItem>
+#include <QGraphicsSceneHoverEvent>
 
 namespace ost{namespace gui{
 
diff --git a/modules/gui/src/plot_viewer/plot_graphics_rectangle_item.cc b/modules/gui/src/plot_viewer/plot_graphics_rectangle_item.cc
index dd61a1b22d0fa897bf31aa1fa9a5a67704e68a5e..60d1f8f5ecde16887cec93831585a034e03911a5 100644
--- a/modules/gui/src/plot_viewer/plot_graphics_rectangle_item.cc
+++ b/modules/gui/src/plot_viewer/plot_graphics_rectangle_item.cc
@@ -20,11 +20,11 @@
   Author: Andreas Schenk
 */
 
-#include <QCursor>
-#include <QToolTip>
 #include "plot_data_info.hh"
 #include "plot_data_graphics_item.hh"
 #include "plot_graphics_rectangle_item.hh"
+#include <QCursor>
+#include <QToolTip>
 
 namespace ost {namespace gui {
 
diff --git a/modules/gui/src/plot_viewer/plot_graphics_rectangle_item.hh b/modules/gui/src/plot_viewer/plot_graphics_rectangle_item.hh
index 5d099c6923eaac8115cd68430684481d8d16d19d..b0b08eb611ce0f839b17a198c0fdcb2bfa253634 100644
--- a/modules/gui/src/plot_viewer/plot_graphics_rectangle_item.hh
+++ b/modules/gui/src/plot_viewer/plot_graphics_rectangle_item.hh
@@ -23,10 +23,10 @@
   Author: Andreas Schenk
 */
 
-#include <QGraphicsRectItem>
-#include <QGraphicsSceneHoverEvent>
 #include "plot_data_entry.hh"
 #include "plot_data_info_fw.hh"
+#include <QGraphicsRectItem>
+#include <QGraphicsSceneHoverEvent>
 
 namespace ost {namespace gui {
 
diff --git a/modules/gui/src/plot_viewer/plot_group_info.hh b/modules/gui/src/plot_viewer/plot_group_info.hh
index e7668633aa1b87071d6bcf2ed547a11518d97532..f99c8d5e1d4dd88c1fae06082180970abd2f044b 100644
--- a/modules/gui/src/plot_viewer/plot_group_info.hh
+++ b/modules/gui/src/plot_viewer/plot_group_info.hh
@@ -19,9 +19,9 @@
 #ifndef PLOT_GROUP_INFO_HH_
 #define PLOT_GROUP_INFO_HH_
 
+#include <boost/python.hpp>
 #include "plot_info_base.hh"
 #include <vector>
-#include <boost/python.hpp>
 #include <boost/shared_ptr.hpp>
 
 namespace ost{namespace gui{
diff --git a/modules/gui/src/plot_viewer/plot_info_base.hh b/modules/gui/src/plot_viewer/plot_info_base.hh
index 46b21b085fd6416b860b893edc00f2bc0e118b7f..9b40d6ab4ec243067e1e4e2cdd9f7a3437fd131c 100644
--- a/modules/gui/src/plot_viewer/plot_info_base.hh
+++ b/modules/gui/src/plot_viewer/plot_info_base.hh
@@ -24,13 +24,13 @@
 */
 
 #include <boost/shared_ptr.hpp>
+
+#include <ost/gui/module_config.hh>
+
 #include <QObject>
 #include <QColor>
 #include <QPen>
 #include <QBrush>
-
-#include <ost/gui/module_config.hh>
-
 namespace ost{namespace gui{
 
 //fw decl
diff --git a/modules/gui/src/plot_viewer/plot_legend_panel.cc b/modules/gui/src/plot_viewer/plot_legend_panel.cc
index 44decfbc9abe01e0eee9df7ef2569d4afb01f857..e02ae5dce15f25ddd48e3996e42944acefc658ba 100644
--- a/modules/gui/src/plot_viewer/plot_legend_panel.cc
+++ b/modules/gui/src/plot_viewer/plot_legend_panel.cc
@@ -21,9 +21,9 @@
 */
 
 #include <ost/dyn_cast.hh>
-#include <QMetaType>
 #include "plot_legend_panel.hh"
 
+#include <QMetaType>
 Q_DECLARE_METATYPE(ost::gui::PlotInfoBasePtr)
 
 
diff --git a/modules/gui/src/plot_viewer/plot_legend_panel.hh b/modules/gui/src/plot_viewer/plot_legend_panel.hh
index 29a547d5b19564cd5d3227605e18c27e0509850b..09c595018f5bfe2ecf5fcf82635013486f0942cb 100644
--- a/modules/gui/src/plot_viewer/plot_legend_panel.hh
+++ b/modules/gui/src/plot_viewer/plot_legend_panel.hh
@@ -23,12 +23,12 @@
   Author: Andreas Schenk
 */
 
-#include <QTreeWidget>
-#include <QTreeWidgetItem>
 #include "plot_data_info.hh"
 #include "plot_group_info.hh"
 #include "plot_function_info.hh"
 
+#include <QTreeWidget>
+#include <QTreeWidgetItem>
 namespace ost{namespace gui{
 
 class DLLEXPORT_OST_GUI PlotLegendPanel:public  QTreeWidget
diff --git a/modules/gui/src/plot_viewer/plot_viewer.cc b/modules/gui/src/plot_viewer/plot_viewer.cc
index 4ee454836de1c277e9968c7a4c0f42b756819559..c0d1889df9cc30d024ac73b6e360584ea5af0231 100644
--- a/modules/gui/src/plot_viewer/plot_viewer.cc
+++ b/modules/gui/src/plot_viewer/plot_viewer.cc
@@ -21,8 +21,6 @@
 */
 
 #include <limits>
-#include <QHBoxLayout>
-#include <QVBoxLayout>
 
 #include "plot_viewer.hh"
 #include "plot_viewer_panel.hh"
@@ -32,6 +30,8 @@
 #include "plot_function_graphics_item.hh"
 #include "plot_group_graphics_item.hh"
 
+#include <QHBoxLayout>
+#include <QVBoxLayout>
 namespace ost { namespace gui {
 
 PlotViewer::PlotViewer(QWidget* parent,const QString& name):
diff --git a/modules/gui/src/plot_viewer/plot_viewer.hh b/modules/gui/src/plot_viewer/plot_viewer.hh
index f5a6a4a58976d81447e623d58064a6ce21e43591..15c2b25698f5b298cc10a07e10d918c37748ce1b 100644
--- a/modules/gui/src/plot_viewer/plot_viewer.hh
+++ b/modules/gui/src/plot_viewer/plot_viewer.hh
@@ -23,18 +23,18 @@
   Author: Andreas Schenk
 */
 
+
+
 #include <QStandardItemModel>
 #include <QGraphicsScene>
 #include <QWidget>
 #include <QString>
-
 #include "plot_data.hh"
+#include "plot_data_info_fw.hh"
+#include "plot_group_info.hh"
 #include "plot_function.hh"
 #include "plot_group.hh"
 #include "plot_function_info.hh"
-#include "plot_data_info_fw.hh"
-#include "plot_group_info.hh"
-
 namespace ost{namespace gui{
 
 
diff --git a/modules/gui/src/plot_viewer/plot_viewer_panel.cc b/modules/gui/src/plot_viewer/plot_viewer_panel.cc
index a440c06803b475b0d90dd3ac2ebf1151ecdf4074..3fec69dc2808e5da3b458ec18c31fd2604771188 100644
--- a/modules/gui/src/plot_viewer/plot_viewer_panel.cc
+++ b/modules/gui/src/plot_viewer/plot_viewer_panel.cc
@@ -20,10 +20,10 @@
   Author: Andreas Schenk
 */
 
-#include <QtGui>
 #include "plot_viewer_panel.hh"
 #include "plot_types.hh"
 #include "plot_function.hh"
+#include <QtGui>
 
 namespace ost{namespace gui{
 
diff --git a/modules/gui/src/plot_viewer/plot_viewer_panel.hh b/modules/gui/src/plot_viewer/plot_viewer_panel.hh
index 535b27534e34e2411aba3c9397b59e11caf8a444..41753163cafba887ba7174dc99b2bb319df0e840 100644
--- a/modules/gui/src/plot_viewer/plot_viewer_panel.hh
+++ b/modules/gui/src/plot_viewer/plot_viewer_panel.hh
@@ -24,12 +24,12 @@
   Author: Andreas Schenk
 */
 
+#include "plot_axis_horizontal.hh"
+#include "plot_axis_vertical.hh"
 #include <QWidget>
 #include <QHash>
 #include <QPair>
 #include <QGraphicsView>
-#include "plot_axis_horizontal.hh"
-#include "plot_axis_vertical.hh"
 
 namespace ost{namespace gui{
 
diff --git a/modules/gui/src/python_shell/completer_base.cc b/modules/gui/src/python_shell/completer_base.cc
index 3194eb53ca8914caf73e3677a61535fa748bd2b2..a63d3b0bac2cddae7edee71b413685f1e803c9c8 100644
--- a/modules/gui/src/python_shell/completer_base.cc
+++ b/modules/gui/src/python_shell/completer_base.cc
@@ -20,6 +20,7 @@
   Authors: Marco Biasini, Andreas Schenk
  */
 
+#include "completer_base.hh"
 
 #include <QStringList>
 #include <QScrollBar>
@@ -27,7 +28,6 @@
 #include <QKeyEvent>
 #include <QApplication>
 
-#include "completer_base.hh"
 
 
 namespace ost { namespace gui {
diff --git a/modules/gui/src/python_shell/main_thread_runner.hh b/modules/gui/src/python_shell/main_thread_runner.hh
index 056dd6165a1be9a3d0d6e6aeb5ddd1c53e4ee61e..399fd8c0328486bce9014d585093da3129ee9640 100644
--- a/modules/gui/src/python_shell/main_thread_runner.hh
+++ b/modules/gui/src/python_shell/main_thread_runner.hh
@@ -25,9 +25,9 @@
   Author: Andreas Schenk
 */
 
-#include <QObject>
 #include <ost/gui/module_config.hh>
 
+#include <QObject>
 namespace ost { namespace gui {
 
 
diff --git a/modules/gui/src/python_shell/output_redirector.cc b/modules/gui/src/python_shell/output_redirector.cc
index dcbcd49f7259b00aefbb03b67e1a4b310b791cd3..e86879a82307a80a005b5545806ed53cad4366d5 100644
--- a/modules/gui/src/python_shell/output_redirector.cc
+++ b/modules/gui/src/python_shell/output_redirector.cc
@@ -22,8 +22,8 @@
   Author: Andreas Schenk
 */
 
-#include <QTimer>
 #include "output_redirector.hh"
+#include <QTimer>
 
 
 namespace ost { namespace gui {
diff --git a/modules/gui/src/python_shell/output_redirector.hh b/modules/gui/src/python_shell/output_redirector.hh
index aec845cbce0d3a217a9a5d9d0498224f016a8e86..2d13948a268c80f985b692c7e5acc7478b40abf4 100644
--- a/modules/gui/src/python_shell/output_redirector.hh
+++ b/modules/gui/src/python_shell/output_redirector.hh
@@ -26,10 +26,10 @@
   Author: Andreas Schenk
 */
 
+#include <ost/gui/module_config.hh>
 #include <QTime>
 #include <QString>
 #include <QObject>
-#include <ost/gui/module_config.hh>
 
 namespace ost { namespace gui {
 
diff --git a/modules/gui/src/python_shell/python_completer.cc b/modules/gui/src/python_shell/python_completer.cc
index 4618fb74500a69845b530aa27a70f363519d1cc8..d0346397201149c88fb9acb5dc72adaa7db7a244 100644
--- a/modules/gui/src/python_shell/python_completer.cc
+++ b/modules/gui/src/python_shell/python_completer.cc
@@ -22,9 +22,9 @@
 
 #include <iostream>
 
-#include <QStringList>
 #include "python_completer.hh"
 #include "python_namespace_tree_model.hh"
+#include <QStringList>
 
 
 namespace ost { namespace gui {
diff --git a/modules/gui/src/python_shell/python_interpreter.cc b/modules/gui/src/python_shell/python_interpreter.cc
index 059d69ce67133bdf2d133847c1d29fdb6181614a..975c6ff41b032af466f26d796ed192767c34b914 100644
--- a/modules/gui/src/python_shell/python_interpreter.cc
+++ b/modules/gui/src/python_shell/python_interpreter.cc
@@ -30,12 +30,12 @@
 #include <fstream>
 
 #include <boost/filesystem/convenience.hpp>
+#include <ost/log.hh>
 
 #include <QFile>
 #include <QDebug>
 #include <QFile>
 #include <QStringList>
-#include <ost/log.hh>
 
 namespace ost { namespace gui {
 
diff --git a/modules/gui/src/python_shell/python_interpreter.hh b/modules/gui/src/python_shell/python_interpreter.hh
index 01b3e32734fde1263ef0dd05cefda56fbd698b9b..ec6639bbb8d10342b657afc43eda2096dea9c67a 100644
--- a/modules/gui/src/python_shell/python_interpreter.hh
+++ b/modules/gui/src/python_shell/python_interpreter.hh
@@ -29,10 +29,6 @@
 
 #include <vector>
 
-#include <QQueue>
-#include <QMetaType>
-
-
 #include <ost/gui/module_config.hh>
 
 #include <ost/gui/module_config.hh>
@@ -40,6 +36,9 @@
 #include "output_redirector.hh"
 #include "main_thread_runner.hh"
 
+#include <QQueue>
+#include <QMetaType>
+
 namespace ost { namespace gui {
 namespace bp = boost::python;
 
diff --git a/modules/gui/src/python_shell/python_interpreter_worker.hh b/modules/gui/src/python_shell/python_interpreter_worker.hh
index 5093c61b9cf0da2cc44d61b26ec7a4227138cf76..77295ca8612f5877555408774a41f1a945f56de9 100644
--- a/modules/gui/src/python_shell/python_interpreter_worker.hh
+++ b/modules/gui/src/python_shell/python_interpreter_worker.hh
@@ -3,11 +3,11 @@
 
 #include <csignal>
 #include <utility>
-#include <QObject>
-#include <QQueue>
 #include <boost/python.hpp>
 #include <boost/shared_ptr.hpp>
 #include "output_redirector.hh"
+#include <QObject>
+#include <QQueue>
 
 namespace ost { namespace gui {
 namespace bp = boost::python;
diff --git a/modules/gui/src/python_shell/python_shell.cc b/modules/gui/src/python_shell/python_shell.cc
index 6999bb35cfe1143ffacfc3279099d1a313aa367a..6cfdc94aaa49a4ee648b814326857b73b52f2772 100644
--- a/modules/gui/src/python_shell/python_shell.cc
+++ b/modules/gui/src/python_shell/python_shell.cc
@@ -20,14 +20,14 @@
 /* 
   Author: Marco Biasini
  */
-#include <QVBoxLayout>
 
-#include <ost/gui/widget_registry.hh>
 #include <ost/gui/gosty_app.hh>
+#include <ost/gui/widget_registry.hh>
 
 #include "python_shell.hh"
 #include "python_shell_widget.hh"
 
+#include <QVBoxLayout>
 namespace ost { namespace gui {
 
 class PythonShellFactory: public WidgetFactory {
diff --git a/modules/gui/src/python_shell/python_shell_widget.cc b/modules/gui/src/python_shell/python_shell_widget.cc
index 7070794282ef257be1d9c7226a7245c813e36f9b..16d1d4ac2d441c831d345bac845b6ece25955e9d 100644
--- a/modules/gui/src/python_shell/python_shell_widget.cc
+++ b/modules/gui/src/python_shell/python_shell_widget.cc
@@ -22,13 +22,6 @@
 
 #include <iostream>
 
-#include <QApplication>
-#include <QFontMetrics>
-#include <QClipboard>
-#include <QPainter>
-#include <QScrollBar>
-#include <QDirModel>
-#include <QStringList>
 
 #include "python_shell_widget.hh"
 
@@ -42,6 +35,13 @@
 #include "path_completer.hh"
 #include "transition.hh"
 
+#include <QApplication>
+#include <QFontMetrics>
+#include <QClipboard>
+#include <QPainter>
+#include <QScrollBar>
+#include <QDirModel>
+#include <QStringList>
 
 
 /*
diff --git a/modules/gui/src/python_shell/python_shell_widget.hh b/modules/gui/src/python_shell/python_shell_widget.hh
index 364e60bb775c589c86648883125100b9775002f3..9ab34b259e1386f6f240f35b918d61112cce586f 100644
--- a/modules/gui/src/python_shell/python_shell_widget.hh
+++ b/modules/gui/src/python_shell/python_shell_widget.hh
@@ -26,8 +26,6 @@
 
 
 #include <ost/gui/module_config.hh>
-#include <QPlainTextEdit>
-#include <QHash>
 #include "python_interpreter.hh"
 #include "shell_history.hh"
 #include  "python_shell_fw.hh"
@@ -35,6 +33,8 @@
 #include "state_machine.hh"
 #include "state.hh"
 
+#include <QPlainTextEdit>
+#include <QHash>
 namespace ost { namespace gui {
 
 // fw decl
diff --git a/modules/gui/src/python_shell/python_syntax_highlighter.cc b/modules/gui/src/python_shell/python_syntax_highlighter.cc
index ba60ac94df451f27476642e0e14084bd9195b832..f37eb4d61f866bd097ad8ddfbbce68fa565b23aa 100644
--- a/modules/gui/src/python_shell/python_syntax_highlighter.cc
+++ b/modules/gui/src/python_shell/python_syntax_highlighter.cc
@@ -21,8 +21,6 @@
  */
 
 #include <iostream>
-#include <QDebug>
-#include <QTextCursor>
 
 #include "python_shell.hh"
 #include "string_literal_positions.hh"
@@ -31,6 +29,8 @@
 #include "python_context_parser.hh"
 
 
+#include <QDebug>
+#include <QTextCursor>
 
 namespace ost { namespace gui {    
 
diff --git a/modules/gui/src/python_shell/python_syntax_highlighter.hh b/modules/gui/src/python_shell/python_syntax_highlighter.hh
index dea21746b34d5c6ce76c57070fe7fc62a5d8edbe..e31413678dfaee18e8c17a309fe437e39573e03a 100644
--- a/modules/gui/src/python_shell/python_syntax_highlighter.hh
+++ b/modules/gui/src/python_shell/python_syntax_highlighter.hh
@@ -22,12 +22,12 @@
   Authors: Marco Biasini, Andreas Schenk
  */
 
-#include <QSyntaxHighlighter>
-#include <QTextDocument>
 
 #include "python_shell_fw.hh"
 #include "python_tokenizer.hh"
 
+#include <QSyntaxHighlighter>
+#include <QTextDocument>
 namespace ost { namespace gui {
 
 /** 
diff --git a/modules/gui/src/python_shell/shell_history.hh b/modules/gui/src/python_shell/shell_history.hh
index a04bd8469e50deb6113c208cce104465cdaccbc8..a39d7412901a5dceeef9952353cdd22b9fd9cce2 100644
--- a/modules/gui/src/python_shell/shell_history.hh
+++ b/modules/gui/src/python_shell/shell_history.hh
@@ -23,8 +23,8 @@
  */
 
 #include <vector>
-#include <QString>
 #include "python_shell_fw.hh"
+#include <QString>
 
 namespace ost { namespace gui {
 
diff --git a/modules/gui/src/python_shell/state.cc b/modules/gui/src/python_shell/state.cc
index 2d0c8e51c187ae439ac8bbaa27f5739185aa5598..381fffff4d120cf891fa2b5e552258cdfafc5274 100644
--- a/modules/gui/src/python_shell/state.cc
+++ b/modules/gui/src/python_shell/state.cc
@@ -1,7 +1,7 @@
 #include <cassert>
-#include "state_machine.hh"
 #include "transition.hh"
 #include "state.hh"
+#include "state_machine.hh"
 
 namespace ost { namespace gui {
 
diff --git a/modules/gui/src/python_shell/transition.cc b/modules/gui/src/python_shell/transition.cc
index 0803e185b2651b13cd3f42edf3cde536f8dc4852..35501292ce99ed4f82cbabe3d3c714748d3d0067 100644
--- a/modules/gui/src/python_shell/transition.cc
+++ b/modules/gui/src/python_shell/transition.cc
@@ -1,9 +1,9 @@
 #include <cassert>
-#include <QKeyEvent>
-#include <QMouseEvent>
 #include "python_shell_widget.hh"
-#include "state.hh"
 #include "transition.hh"
+#include "state.hh"
+#include <QKeyEvent>
+#include <QMouseEvent>
 
 namespace ost { namespace gui {
 
diff --git a/modules/gui/src/python_shell/transition.hh b/modules/gui/src/python_shell/transition.hh
index 9b832e1af68bdb360d837cf9d34395e32a54d82c..5c8514cbf95cf00e718ea21c08cdfbabdc029812 100644
--- a/modules/gui/src/python_shell/transition.hh
+++ b/modules/gui/src/python_shell/transition.hh
@@ -2,11 +2,11 @@
 #define PYTHON_SHELL_TRANSITION_HH
 
 #include <utility>
+#include <ost/gui/python_shell/python_interpreter.hh>
+
 #include <QObject>
 #include <QEvent>
-#include <ost/gui/python_shell/python_interpreter.hh>
 #include "transition_guard.hh"
-
 //fw decl
 class QKeyEvent;
 class QMouseEvent;
diff --git a/modules/gui/src/python_shell/transition_guard.hh b/modules/gui/src/python_shell/transition_guard.hh
index e9534326db06414c167b617bd67d53e437b13dea..5a2906481c36da41fc7ef1d5aefecfc853d76ad9 100644
--- a/modules/gui/src/python_shell/transition_guard.hh
+++ b/modules/gui/src/python_shell/transition_guard.hh
@@ -1,9 +1,9 @@
 #ifndef TRANSITION_GUARD_HH
 #define TRANSITION_GUARD_HH
 
-#include <QObject>
 #include "python_shell_fw.hh"
 #include "python_interpreter.hh"
+#include <QObject>
 
 namespace ost { namespace gui {
 
diff --git a/modules/gui/src/remote_loader.cc b/modules/gui/src/remote_loader.cc
index 42342e3d5c85ea0b246abf1091c528d19cae194b..2e07f9ab58490fcb8c02112bfafccf29464e959c 100644
--- a/modules/gui/src/remote_loader.cc
+++ b/modules/gui/src/remote_loader.cc
@@ -18,11 +18,6 @@
 //------------------------------------------------------------------------------
 #include <vector>
 
-#include <QString>
-#include <QSettings>
-#include <QNetworkReply>
-#include <QHBoxLayout>
-#include <QDir>
 #include <ost/platform.hh>
 
 #include <ost/gui/file_loader.hh>
@@ -31,6 +26,11 @@
 #include "widget_registry.hh"
 #include "remote_loader.hh"
 
+#include <QString>
+#include <QSettings>
+#include <QNetworkReply>
+#include <QHBoxLayout>
+#include <QDir>
 namespace ost { namespace gui {
 
 RemoteLoader::RemoteLoader(QWidget* parent):
diff --git a/modules/gui/src/remote_loader.hh b/modules/gui/src/remote_loader.hh
index 36d399164419112646ba443c7b3ad7b9b96bb96e..92c5aa9f8c9d6767cea4d0ea7dc9a1e747010d7f 100644
--- a/modules/gui/src/remote_loader.hh
+++ b/modules/gui/src/remote_loader.hh
@@ -19,16 +19,16 @@
 #ifndef OST_GUI_REMOTE_LOADER_HH
 #define OST_GUI_REMOTE_LOADER_HH
 
-#include <QToolButton>
-#include <QLineEdit>
-#include <QKeyEvent>
-#include <QProgressBar>
-#include <QActionGroup>
 
 #include <ost/gfx/gfx_object.hh>
 #include <ost/gui/module_config.hh>
 #include <ost/gui/widget.hh>
 
+#include <QToolButton>
+#include <QLineEdit>
+#include <QKeyEvent>
+#include <QProgressBar>
+#include <QActionGroup>
 namespace ost { namespace gui {
 
 
diff --git a/modules/gui/src/remote_site_loader.hh b/modules/gui/src/remote_site_loader.hh
index 648850fd5df57578311947545b487e2719ed389c..b00823af7500ea22a295f6d1d858c817744f33f7 100644
--- a/modules/gui/src/remote_site_loader.hh
+++ b/modules/gui/src/remote_site_loader.hh
@@ -24,11 +24,11 @@
 #ifndef OST_GUI_REMOTE_SITE_LOADER_HH
 #define OST_GUI_REMOTE_SITE_LOADER_HH
 
+#include <ost/gui/module_config.hh>
+
 #include <QObject>
 #include <QMenu>
 #include <QNetworkReply>
-#include <ost/gui/module_config.hh>
-
 namespace ost { namespace gui {
 
 class DLLEXPORT_OST_GUI RemoteSiteLoader{
diff --git a/modules/gui/src/scene_menu.hh b/modules/gui/src/scene_menu.hh
index 8b8d1f402c579c164e93761e96e191292fbd1b3e..9472a6245f46a49bbad0c8bf38d1828b5286bfcc 100644
--- a/modules/gui/src/scene_menu.hh
+++ b/modules/gui/src/scene_menu.hh
@@ -19,15 +19,14 @@
 #ifndef OST_GUI_SCENE_MENU_HH
 #define OST_GUI_SCENE_MENU_HH
 
-#include <QObject>
-#include <QPoint>
-#include <QMenu>
-#include <QString>
 
 #include <ost/mol/mol.hh>
 #include <ost/gfx/gfx_object_fw.hh>
-#include <ost/gui/scene_menu.hh>
 
+#include <QObject>
+#include <QPoint>
+#include <QMenu>
+#include <QString>
 namespace ost { namespace gui {
 
 class SceneMenu : public QObject{
diff --git a/modules/gui/src/scene_selection.cc b/modules/gui/src/scene_selection.cc
index 17486e36fbdeadfa524e945ba22fb28ae3e6560a..1ef2ee7ce38eab22a77ef5e9501b349c62150b73 100644
--- a/modules/gui/src/scene_selection.cc
+++ b/modules/gui/src/scene_selection.cc
@@ -16,6 +16,7 @@
 // along with this library; if not, write to the Free Software Foundation, Inc.,
 // 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
 //------------------------------------------------------------------------------
+#include <ost/gui/gosty_app.hh>
 #include <ost/dyn_cast.hh>
 
 #include <ost/geom/vec3.hh>
@@ -35,7 +36,6 @@
 
 #endif
 
-#include <ost/gui/gosty_app.hh>
 #include <ost/gui/scene_win/scene_win.hh>
 
 #include "scene_selection.hh"
diff --git a/modules/gui/src/scene_selection.hh b/modules/gui/src/scene_selection.hh
index 292a59e4a0a663e662847a9f68ec5b0363bc0e17..ebc2bbfdbca1f44dcc75052e3ef9d766f9f9c6af 100644
--- a/modules/gui/src/scene_selection.hh
+++ b/modules/gui/src/scene_selection.hh
@@ -19,9 +19,6 @@
 #ifndef OST_GUI_SCENE_SELECTION_HH
 #define OST_GUI_SCENE_SELECTION_HH
 
-#include <QObject>
-#include <QMenu>
-#include <QPoint>
 
 #include <ost/mol/query_view_wrapper.hh>
 
@@ -29,6 +26,9 @@
 #include <ost/gfx/gfx_node_fw.hh>
 #include <ost/gui/module_config.hh>
 
+#include <QObject>
+#include <QMenu>
+#include <QPoint>
 namespace ost { namespace gui {
 
 class DLLEXPORT_OST_GUI SceneSelection : public QObject {
diff --git a/modules/gui/src/scene_win/context_menu.cc b/modules/gui/src/scene_win/context_menu.cc
index c73c0223d4672d3637dba689522b99f1a020aa2b..52b71d38b32f78d3aee6fb0675253aa5b604c766 100644
--- a/modules/gui/src/scene_win/context_menu.cc
+++ b/modules/gui/src/scene_win/context_menu.cc
@@ -21,10 +21,6 @@
 */
 #include <boost/pointer_cast.hpp>
 
-#include <QAction>
-#include <QMenu>
-#include <QItemSelection>
-#include <QItemSelectionModel>
 
 #include <ost/dyn_cast.hh>
 
@@ -43,6 +39,10 @@
 
 #include "context_menu.hh"
 
+#include <QAction>
+#include <QMenu>
+#include <QItemSelection>
+#include <QItemSelectionModel>
 namespace ost { namespace gui {
 
 ContextMenu::ContextMenu(QTreeView* view, SceneWinModel* model):
diff --git a/modules/gui/src/scene_win/context_menu.hh b/modules/gui/src/scene_win/context_menu.hh
index 486f9b8bdabe4923dd48677980d12a3dcfe41c8e..03007fc6fcbd4641f881ab29c1bee48eb532cc86 100644
--- a/modules/gui/src/scene_win/context_menu.hh
+++ b/modules/gui/src/scene_win/context_menu.hh
@@ -23,14 +23,14 @@
   Author: Stefan Scheuber
  */
 
-#include <QFlags>
-#include <QMap>
-#include <QAbstractItemModel>
-#include <QTreeView>
 
 #include <ost/gui/module_config.hh>
 #include <ost/gui/scene_win/scene_win_model.hh>
 
+#include <QFlags>
+#include <QMap>
+#include <QAbstractItemModel>
+#include <QTreeView>
 namespace ost { namespace gui {
 
 enum ContextActionType
diff --git a/modules/gui/src/scene_win/current_selection_node.cc b/modules/gui/src/scene_win/current_selection_node.cc
index c8b0eb03cff2c81aad85d48a8d94479f533d8ad6..9de4397a43989be2af8d4732e08f0adec8974f02 100644
--- a/modules/gui/src/scene_win/current_selection_node.cc
+++ b/modules/gui/src/scene_win/current_selection_node.cc
@@ -16,18 +16,18 @@
 // along with this library; if not, write to the Free Software Foundation, Inc.,
 // 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
 //------------------------------------------------------------------------------
-#include <QFont>
 
+#include <ost/gui/gosty_app.hh>
 #include <ost/mol/query_view_wrapper.hh>
 
 #include <ost/gfx/scene.hh>
 #include <ost/gfx/gfx_node.hh>
 
-#include <ost/gui/gosty_app.hh>
 #include <ost/gui/scene_win/scene_win.hh>
 
 #include "current_selection_node.hh"
 
+#include <QFont>
 namespace ost { namespace gui {
 
 CurrentSelectionNode::CurrentSelectionNode(gfx::EntityP entity, SceneNode* parent):EntityPartNode("Current Selection",entity,mol::QueryViewWrapper(entity->GetSelection()),parent),wrapper_(mol::QueryViewWrapper(entity->GetSelection())){
diff --git a/modules/gui/src/scene_win/current_selection_node.hh b/modules/gui/src/scene_win/current_selection_node.hh
index baedc36040b1f34f54cd87a31b339e8a7db10bca..9a63219d9e63d8a0630e25592aed164fbc43266b 100644
--- a/modules/gui/src/scene_win/current_selection_node.hh
+++ b/modules/gui/src/scene_win/current_selection_node.hh
@@ -19,9 +19,6 @@
 #ifndef OST_GUI_SCENE_WIN_CURRENT_SELECTION_NODE_HH
 #define OST_GUI_SCENE_WIN_CURRENT_SELECTION_NODE_HH
 
-#include <QObject>
-#include <QVariant>
-#include <QModelIndex>
 
 #include <ost/mol/entity_view.hh>
 #include <ost/mol/query_view_wrapper.hh>
@@ -32,6 +29,9 @@
 #include <ost/gui/module_config.hh>
 #include <ost/gui/scene_win/entity_part_node.hh>
 
+#include <QObject>
+#include <QVariant>
+#include <QModelIndex>
 /*
   Author: Stefan Scheuber
  */
diff --git a/modules/gui/src/scene_win/custom_part_node.cc b/modules/gui/src/scene_win/custom_part_node.cc
index f8e5f79db5d70d3ff6d963e0368037301e46dd02..18c9d9972f9646ef64d93b498a7316622eddcc55 100644
--- a/modules/gui/src/scene_win/custom_part_node.cc
+++ b/modules/gui/src/scene_win/custom_part_node.cc
@@ -16,7 +16,6 @@
 // along with this library; if not, write to the Free Software Foundation, Inc.,
 // 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
 //------------------------------------------------------------------------------
-#include <QFont>
 
 #include "custom_part_node.hh"
 
@@ -25,6 +24,7 @@
 #include <ost/gfx/entity.hh>
 #include <ost/gfx/gfx_node.hh>
 
+#include <QFont>
 namespace ost { namespace gui {
 
 CustomPartNode::CustomPartNode(QString name, gfx::EntityP entity, mol::QueryViewWrapper part, SceneNode* parent):EntityPartNode(name,entity,part,parent){
diff --git a/modules/gui/src/scene_win/custom_part_node.hh b/modules/gui/src/scene_win/custom_part_node.hh
index b585af4e0ee03dc06445763d6687007dd4fab761..9c9eba9f4bc609178e0e3577a0144657088b3de9 100644
--- a/modules/gui/src/scene_win/custom_part_node.hh
+++ b/modules/gui/src/scene_win/custom_part_node.hh
@@ -19,9 +19,6 @@
 #ifndef OST_GUI_SCENE_WIN_CUSTOM_PART_NODE_HH
 #define OST_GUI_SCENE_WIN_CUSTOM_PART_NODE_HH
 
-#include <QObject>
-#include <QVariant>
-#include <QModelIndex>
 
 #include <ost/mol/query_view_wrapper.hh>
 
@@ -31,6 +28,9 @@
 #include <ost/gui/scene_win/scene_node.hh>
 
 #include "entity_part_node.hh"
+#include <QObject>
+#include <QVariant>
+#include <QModelIndex>
 /*
   Author: Stefan Scheuber
  */
diff --git a/modules/gui/src/scene_win/entity_node.cc b/modules/gui/src/scene_win/entity_node.cc
index 0b618ea1e785aabfb80de8f0c8d69423a99b6ac8..3aa51c81ce37a0f9acdeebd6033d4573b008ee73 100644
--- a/modules/gui/src/scene_win/entity_node.cc
+++ b/modules/gui/src/scene_win/entity_node.cc
@@ -16,16 +16,14 @@
 // along with this library; if not, write to the Free Software Foundation, Inc.,
 // 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
 //------------------------------------------------------------------------------
+#include <ost/gui/gosty_app.hh>
 #include <boost/pointer_cast.hpp>
 
-#include <QFont>
-#include <QString>
 
 #include <ost/mol/query.hh>
 #include <ost/mol/query_view_wrapper.hh>
 #include <ost/mol/view_type_fw.hh>
 
-#include <ost/gui/gosty_app.hh>
 #include <ost/gui/scene_win/scene_win.hh>
 
 #include "current_selection_node.hh"
@@ -35,6 +33,8 @@
 
 #include "entity_node.hh"
 
+#include <QFont>
+#include <QString>
 
 
 namespace ost { namespace gui {
diff --git a/modules/gui/src/scene_win/entity_part_node.cc b/modules/gui/src/scene_win/entity_part_node.cc
index dd56f2484a9a355bed0745c3e9f4524ab652fe10..da8867d8bb6e8c5c03f93d7318de63ee6ef81762 100644
--- a/modules/gui/src/scene_win/entity_part_node.cc
+++ b/modules/gui/src/scene_win/entity_part_node.cc
@@ -16,13 +16,13 @@
 // along with this library; if not, write to the Free Software Foundation, Inc.,
 // 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
 //------------------------------------------------------------------------------
-#include <QFont>
 
 #include "entity_part_node.hh"
 
 #include <ost/gfx/entity.hh>
 #include <ost/gfx/gfx_node.hh>
 
+#include <QFont>
 namespace ost { namespace gui {
 
 EntityPartNode::EntityPartNode(QString name, gfx::EntityP entity, mol::QueryViewWrapper part, SceneNode* parent):SceneNode(parent),name_(name),entity_(entity),query_view_(part),visible_(true){
diff --git a/modules/gui/src/scene_win/entity_part_node.hh b/modules/gui/src/scene_win/entity_part_node.hh
index 7f7d3629784aa26e6362011f5f428b03d166ebd7..2eb308cbedae85349e627cc31e9d05abe9b68413 100644
--- a/modules/gui/src/scene_win/entity_part_node.hh
+++ b/modules/gui/src/scene_win/entity_part_node.hh
@@ -19,9 +19,6 @@
 #ifndef OST_GUI_SCENE_WIN_ENTITY_PART_NODE_HH
 #define OST_GUI_SCENE_WIN_ENTITY_PART_NODE_HH
 
-#include <QObject>
-#include <QVariant>
-#include <QModelIndex>
 
 #include <ost/mol/query_view_wrapper.hh>
 
@@ -30,6 +27,9 @@
 #include <ost/gui/module_config.hh>
 #include <ost/gui/scene_win/scene_node.hh>
 
+#include <QObject>
+#include <QVariant>
+#include <QModelIndex>
 /*
   Author: Stefan Scheuber
  */
diff --git a/modules/gui/src/scene_win/gfx_scene_node.cc b/modules/gui/src/scene_win/gfx_scene_node.cc
index f8632e9018d3933e0df87ac2d5e61adcd02d3575..191007aee833f93a9f4e36b2c2e91a39df4eb4b4 100644
--- a/modules/gui/src/scene_win/gfx_scene_node.cc
+++ b/modules/gui/src/scene_win/gfx_scene_node.cc
@@ -16,13 +16,13 @@
 // along with this library; if not, write to the Free Software Foundation, Inc.,
 // 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
 //------------------------------------------------------------------------------
-#include <QFont>
 
 #include "gfx_scene_node.hh"
 
 #include <ost/gfx/scene.hh>
 #include <ost/gfx/gfx_node.hh>
 
+#include <QFont>
 namespace ost { namespace gui {
 
 GfxSceneNode::GfxSceneNode(gfx::GfxNodeP gfx_node, SceneNode* parent):SceneNode(parent),gfx_node_(gfx_node){}
diff --git a/modules/gui/src/scene_win/gfx_scene_node.hh b/modules/gui/src/scene_win/gfx_scene_node.hh
index fb954081514a1ffd585428362d8d79181ebd026b..03100392fa20f685e0b98c81dd22325f62a64048 100644
--- a/modules/gui/src/scene_win/gfx_scene_node.hh
+++ b/modules/gui/src/scene_win/gfx_scene_node.hh
@@ -19,15 +19,15 @@
 #ifndef OST_GUI_SCENE_WIN_GFX_SCENE_NODE_HH
 #define OST_GUI_SCENE_WIN_GFX_SCENE_NODE_HH
 
-#include <QObject>
-#include <QVariant>
-#include <QModelIndex>
 
 #include <ost/gfx/gfx_node_fw.hh>
 
 #include <ost/gui/module_config.hh>
 #include <ost/gui/scene_win/scene_node.hh>
 
+#include <QObject>
+#include <QVariant>
+#include <QModelIndex>
 /*
   Author: Stefan Scheuber
  */
diff --git a/modules/gui/src/scene_win/label_node.cc b/modules/gui/src/scene_win/label_node.cc
index 5cf9b2d95599e76da350026866d4150ad59a606f..8a01e6aec1a27ae35b59a1b3cf0c2f98e3d2fcf1 100644
--- a/modules/gui/src/scene_win/label_node.cc
+++ b/modules/gui/src/scene_win/label_node.cc
@@ -16,13 +16,13 @@
 // along with this library; if not, write to the Free Software Foundation, Inc.,
 // 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
 //------------------------------------------------------------------------------
-#include <QFont>
 
 #include "label_node.hh"
 
 #include <ost/gfx/entity.hh>
 #include <ost/gfx/gfx_node.hh>
 
+#include <QFont>
 namespace ost { namespace gui {
 
 LabelNode::LabelNode(QString name, SceneNode* parent):SceneNode(parent),name_(name){
diff --git a/modules/gui/src/scene_win/label_node.hh b/modules/gui/src/scene_win/label_node.hh
index 50d471be0991240d5f99a5becac4be368cc71871..4a9722f7f01ccf09b5afa3609f91f53566f0c5e3 100644
--- a/modules/gui/src/scene_win/label_node.hh
+++ b/modules/gui/src/scene_win/label_node.hh
@@ -19,13 +19,13 @@
 #ifndef OST_GUI_SCENE_WIN_LABEL_NODE_HH
 #define OST_GUI_SCENE_WIN_LABEL_NODE_HH
 
-#include <QObject>
-#include <QVariant>
-#include <QModelIndex>
 
 #include <ost/gui/module_config.hh>
 #include <ost/gui/scene_win/scene_node.hh>
 
+#include <QObject>
+#include <QVariant>
+#include <QModelIndex>
 /*
   Author: Stefan Scheuber
  */
diff --git a/modules/gui/src/scene_win/render_mode_node.cc b/modules/gui/src/scene_win/render_mode_node.cc
index 52836c04362844e8689f28ba3d18d91cfd1f6ce5..88e67dea8d5990dae5ffe25a885805df462a8ca2 100644
--- a/modules/gui/src/scene_win/render_mode_node.cc
+++ b/modules/gui/src/scene_win/render_mode_node.cc
@@ -16,12 +16,12 @@
 // along with this library; if not, write to the Free Software Foundation, Inc.,
 // 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
 //------------------------------------------------------------------------------
-#include <QFont>
 
 #include <ost/mol/query_view_wrapper.hh>
 
 #include "render_mode_node.hh"
 
+#include <QFont>
 namespace ost { namespace gui {
 
 RenderModeNode::RenderModeNode(gfx::EntityP entity, gfx::RenderMode::Type render_mode, SceneNode* parent):EntityPartNode(entity->GetRenderModeName(render_mode).c_str(),entity,mol::QueryViewWrapper(entity->GetRenderView(render_mode)),parent),
diff --git a/modules/gui/src/scene_win/render_mode_node.hh b/modules/gui/src/scene_win/render_mode_node.hh
index f5de2d0842fe62a6052518409fcd06a3e63458b6..fb7304379c7cc18dc97229fa4a80aab0cad44e3b 100644
--- a/modules/gui/src/scene_win/render_mode_node.hh
+++ b/modules/gui/src/scene_win/render_mode_node.hh
@@ -19,9 +19,6 @@
 #ifndef OST_GUI_SCENE_WIN_RENDER_MODE_NODE_HH
 #define OST_GUI_SCENE_WIN_RENDER_MODE_NODE_HH
 
-#include <QObject>
-#include <QVariant>
-#include <QModelIndex>
 
 #include <ost/mol/entity_view.hh>
 #include <ost/mol/query_view_wrapper.hh>
@@ -36,6 +33,9 @@
 #include <ost/gui/module_config.hh>
 #include <ost/gui/scene_win/entity_part_node.hh>
 
+#include <QObject>
+#include <QVariant>
+#include <QModelIndex>
 /*
   Author: Stefan Scheuber
  */
diff --git a/modules/gui/src/scene_win/render_modes_node.cc b/modules/gui/src/scene_win/render_modes_node.cc
index 4c551f6b79b0eb5f649a03adb9eb0727693ced7d..a343490b894a21123cd97e353433db66dee27562 100644
--- a/modules/gui/src/scene_win/render_modes_node.cc
+++ b/modules/gui/src/scene_win/render_modes_node.cc
@@ -16,18 +16,18 @@
 // along with this library; if not, write to the Free Software Foundation, Inc.,
 // 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
 //------------------------------------------------------------------------------
+#include <ost/gui/gosty_app.hh>
 #include <boost/pointer_cast.hpp>
 
-#include <QFont>
 
 #include <ost/gfx/scene.hh>
 #include <ost/gfx/gfx_node.hh>
 
-#include <ost/gui/gosty_app.hh>
 #include <ost/gui/scene_win/scene_win.hh>
 
 #include "render_modes_node.hh"
 #include "render_mode_node.hh"
+#include <QFont>
 
 namespace ost { namespace gui {
 
diff --git a/modules/gui/src/scene_win/render_modes_node.hh b/modules/gui/src/scene_win/render_modes_node.hh
index 231bf41bf62a81fad869aebdfde1063a8fd42740..dbb5c1c2bce9d5a4f2eba02c4d2505cd1f6ef751 100644
--- a/modules/gui/src/scene_win/render_modes_node.hh
+++ b/modules/gui/src/scene_win/render_modes_node.hh
@@ -19,9 +19,6 @@
 #ifndef OST_GUI_SCENE_WIN_RENDER_MODES_NODE_HH
 #define OST_GUI_SCENE_WIN_RENDER_MODES_NODE_HH
 
-#include <QObject>
-#include <QVariant>
-#include <QSet>
 
 #include <ost/gfx/entity.hh>
 #include <ost/gfx/entity_fw.hh>
@@ -36,6 +33,9 @@
 
 #include "render_mode_node.hh"
 
+#include <QObject>
+#include <QVariant>
+#include <QSet>
 /*
   Author: Stefan Scheuber
  */
diff --git a/modules/gui/src/scene_win/root_node.cc b/modules/gui/src/scene_win/root_node.cc
index e883f4b69f46b7e554acb8970fc91ed31ac2f185..98fc34dc9dc0da63138b6529309cd91478310ad9 100644
--- a/modules/gui/src/scene_win/root_node.cc
+++ b/modules/gui/src/scene_win/root_node.cc
@@ -16,12 +16,12 @@
 // along with this library; if not, write to the Free Software Foundation, Inc.,
 // 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
 //------------------------------------------------------------------------------
-#include <QFont>
 
 #include "root_node.hh"
 
 #include <ost/gfx/scene.hh>
 #include <ost/gfx/gfx_node.hh>
+#include <QFont>
 
 namespace ost { namespace gui {
 
diff --git a/modules/gui/src/scene_win/root_node.hh b/modules/gui/src/scene_win/root_node.hh
index 2738a90f50c856bddb26858f426e3eb6099697a2..4775e6246e269c86d414a5ec705599673bf8b227 100644
--- a/modules/gui/src/scene_win/root_node.hh
+++ b/modules/gui/src/scene_win/root_node.hh
@@ -19,12 +19,12 @@
 #ifndef OST_GUI_SCENE_WIN_ROOT_NODE_HH
 #define OST_GUI_SCENE_WIN_ROOT_NODE_HH
 
-#include <QObject>
-#include <QVariant>
-#include <QModelIndex>
 
 #include <ost/gui/module_config.hh>
 #include <ost/gui/scene_win/scene_node.hh>
+#include <QObject>
+#include <QVariant>
+#include <QModelIndex>
 
 /*
   Author: Stefan Scheuber
diff --git a/modules/gui/src/scene_win/scene_node.hh b/modules/gui/src/scene_win/scene_node.hh
index 926c16f75440e241c1610207cb2033913c0cc64b..9fbdd7cda10e8e8539160d1ddbe816877d3ec846 100644
--- a/modules/gui/src/scene_win/scene_node.hh
+++ b/modules/gui/src/scene_win/scene_node.hh
@@ -19,12 +19,12 @@
 #ifndef OST_GUI_SCENE_WIN_SCENE_NODE_HH
 #define OST_GUI_SCENE_WIN_SCENE_NODE_HH
 
+#include <ost/gui/module_config.hh>
+
 #include <QObject>
 #include <QVariant>
 #include <QModelIndex>
 
-#include <ost/gui/module_config.hh>
-
 /*
   Author: Stefan Scheuber
  */
diff --git a/modules/gui/src/scene_win/scene_win.cc b/modules/gui/src/scene_win/scene_win.cc
index 27ef02c87730bd61860ef41a52a1a3ebf71dda4e..ba685c3f62a4d58a6babb74dd65c3c8942428806 100644
--- a/modules/gui/src/scene_win/scene_win.cc
+++ b/modules/gui/src/scene_win/scene_win.cc
@@ -19,15 +19,15 @@
 /*
  Authors: Marco Biasini, Ansgar Philippsen, Stefan Scheuber
  */
-#include <QVBoxLayout>
-#include <QHeaderView>
 
-#include <ost/gui/widget_registry.hh>
 #include <ost/gui/gosty_app.hh>
+#include <ost/gui/widget_registry.hh>
 #include <ost/gui/scene_selection.hh>
 
 #include "scene_win.hh"
 
+#include <QVBoxLayout>
+#include <QHeaderView>
 namespace ost { namespace gui {
 
 class SceneWinFactory: public WidgetFactory {
diff --git a/modules/gui/src/scene_win/scene_win.hh b/modules/gui/src/scene_win/scene_win.hh
index 9761bb1f1924d01adafc8862c7b1fb0c7566bf2e..612198db622f03e3e82bb138eb3ce9d2b85dc164 100644
--- a/modules/gui/src/scene_win/scene_win.hh
+++ b/modules/gui/src/scene_win/scene_win.hh
@@ -19,8 +19,6 @@
 #ifndef OST_GUI_SCENE_WIN_SCENE_WIN_HH
 #define OST_GUI_SCENE_WIN_SCENE_WIN_HH
 
-#include <QTreeView>
-#include <QItemSelection>
 
 #include <ost/mol/query_view_wrapper.hh>
 
@@ -31,6 +29,8 @@
 #include <ost/gui/scene_win/scene_win_model.hh>
 #include <ost/gui/scene_win/context_menu.hh>
 
+#include <QTreeView>
+#include <QItemSelection>
 /*
   Authors: Marco Biasini, Ansgar Philippsen, Stefan Scheuber
 */
diff --git a/modules/gui/src/scene_win/scene_win_model.hh b/modules/gui/src/scene_win/scene_win_model.hh
index c65af6677974af714ad602a61b1d8b9498391a20..060b148816aaadb7b9734b8a3333589f97788d17 100644
--- a/modules/gui/src/scene_win/scene_win_model.hh
+++ b/modules/gui/src/scene_win/scene_win_model.hh
@@ -23,10 +23,6 @@
   Author: Stefan Scheuber, Marco Biasini, Ansgar Philippsen
  */
 
-#include <QStringList>
-#include <QMimeData>
-#include <QMap>
-#include <QAbstractItemModel>
 
 #include <ost/mol/view_type_fw.hh>
 #include <ost/mol/query_view_wrapper.hh>
@@ -38,6 +34,10 @@
 #include <ost/gui/scene_win/scene_node.hh>
 #include <ost/gui/scene_win/render_modes_node.hh>
 
+#include <QStringList>
+#include <QMimeData>
+#include <QMap>
+#include <QAbstractItemModel>
 namespace ost { namespace gui {
 
 
diff --git a/modules/gui/src/sequence_viewer/align_properties_painter.cc b/modules/gui/src/sequence_viewer/align_properties_painter.cc
index e51c0536aa512337dca4b159e35f83fddb29ae89..0dd51f36d33b62bd1e4ca6759fb5008509b6d81f 100644
--- a/modules/gui/src/sequence_viewer/align_properties_painter.cc
+++ b/modules/gui/src/sequence_viewer/align_properties_painter.cc
@@ -22,10 +22,10 @@
  */
 
 
-#include <QtGui>
 
 #include "align_properties_painter.hh"
 
+#include <QtGui>
 namespace ost { namespace gui {
 
 namespace {
diff --git a/modules/gui/src/sequence_viewer/align_properties_painter.hh b/modules/gui/src/sequence_viewer/align_properties_painter.hh
index d33331cc6bd8c188379de76b0443ad5aeef06433..13bda8babfa5d599f836cd2d8da00ac2cbfe9844 100644
--- a/modules/gui/src/sequence_viewer/align_properties_painter.hh
+++ b/modules/gui/src/sequence_viewer/align_properties_painter.hh
@@ -23,9 +23,9 @@
   Author: Stefan Scheuber
  */
 
-#include <QObject>
 
 #include "painter.hh"
+#include <QObject>
 
 namespace ost { namespace gui {
 
diff --git a/modules/gui/src/sequence_viewer/alignment_view_object.cc b/modules/gui/src/sequence_viewer/alignment_view_object.cc
index 9aa23319419f5fd244c60d4c3ec3c980b6153d85..f5a08689be49aed7959370840aa7f2ce89dc79c2 100644
--- a/modules/gui/src/sequence_viewer/alignment_view_object.cc
+++ b/modules/gui/src/sequence_viewer/alignment_view_object.cc
@@ -22,7 +22,6 @@
  */
 
 
-#include <QtGui>
 
 #include <ost/mol/mol.hh>
 #include <ost/mol/view_op.hh>
@@ -41,6 +40,7 @@
 
 #include "alignment_view_object.hh"
 
+#include <QtGui>
 namespace ost { namespace gui {
 
 namespace {
diff --git a/modules/gui/src/sequence_viewer/background_painter.cc b/modules/gui/src/sequence_viewer/background_painter.cc
index 25cf4c65022a3eb0783d7e678d93ca1cabe8e1ff..7e45f62bddcde93345f12bb7925b978f4734002f 100644
--- a/modules/gui/src/sequence_viewer/background_painter.cc
+++ b/modules/gui/src/sequence_viewer/background_painter.cc
@@ -22,10 +22,10 @@
  */
 
 
-#include <QtGui>
 
 #include "background_painter.hh"
 
+#include <QtGui>
 namespace ost { namespace gui {
 
 BackgroundPainter::BackgroundPainter(QObject* parent)
diff --git a/modules/gui/src/sequence_viewer/background_painter.hh b/modules/gui/src/sequence_viewer/background_painter.hh
index 942e1dde5bd9b67326862eaf605de1436c962ab7..dc97901d43c69477b6c7a9c63dca51281ae57254 100644
--- a/modules/gui/src/sequence_viewer/background_painter.hh
+++ b/modules/gui/src/sequence_viewer/background_painter.hh
@@ -23,9 +23,9 @@
   Author: Stefan Scheuber
  */
 
-#include <QObject>
 
 #include "painter.hh"
+#include <QObject>
 
 namespace ost { namespace gui {
 
diff --git a/modules/gui/src/sequence_viewer/base_row.cc b/modules/gui/src/sequence_viewer/base_row.cc
index 16dfb0af3831eda02d11e32f964374b5298c5247..2491b765d03adf4982ca5378e7d49bd597b35dbc 100644
--- a/modules/gui/src/sequence_viewer/base_row.cc
+++ b/modules/gui/src/sequence_viewer/base_row.cc
@@ -22,10 +22,10 @@
  */
 
 
-#include <QtGui>
 
 #include "base_row.hh"
 
+#include <QtGui>
 namespace ost { namespace gui {
 
 BaseRow::BaseRow(QObject *parent) : QObject(parent)
diff --git a/modules/gui/src/sequence_viewer/base_row.hh b/modules/gui/src/sequence_viewer/base_row.hh
index 6f20d872b7ff431bb4ba3799e7f5af66c6f52d20..12b86caeb3586d8d56a5ca287a2f2a6f4164ad2d 100644
--- a/modules/gui/src/sequence_viewer/base_row.hh
+++ b/modules/gui/src/sequence_viewer/base_row.hh
@@ -23,12 +23,12 @@
   Author: Stefan Scheuber
  */
 
-#include <QObject>
-#include <QModelIndex>
-#include <QList>
 
 #include "painter.hh"
 
+#include <QObject>
+#include <QModelIndex>
+#include <QList>
 namespace ost { namespace gui {
 
 class BaseRow : public QObject
diff --git a/modules/gui/src/sequence_viewer/base_view_object.cc b/modules/gui/src/sequence_viewer/base_view_object.cc
index 72953aa3ea0aaeae9a5e562c9fb9ebf35a8cc255..716cdb8d8ee2d016026bfa9320e1d625d0634784 100644
--- a/modules/gui/src/sequence_viewer/base_view_object.cc
+++ b/modules/gui/src/sequence_viewer/base_view_object.cc
@@ -22,10 +22,10 @@
  */
 
 
-#include <QtGui>
 
 #include "base_view_object.hh"
 
+#include <QtGui>
 namespace ost { namespace gui {
 
 BaseViewObject::BaseViewObject(QObject* parent): QObject(parent)
diff --git a/modules/gui/src/sequence_viewer/base_view_object.hh b/modules/gui/src/sequence_viewer/base_view_object.hh
index 90526bfa36011a33f7c75890f59a5d43f4f8e3e2..fc843813d988daefbc0f99a41fb8cd25e29ccb92 100644
--- a/modules/gui/src/sequence_viewer/base_view_object.hh
+++ b/modules/gui/src/sequence_viewer/base_view_object.hh
@@ -23,11 +23,11 @@
   Author: Stefan Scheuber
  */
 
-#include <QObject>
-#include <QList>
 
 #include "base_row.hh"
 
+#include <QObject>
+#include <QList>
 
 namespace ost { namespace gui {
 
diff --git a/modules/gui/src/sequence_viewer/conservation_painter.cc b/modules/gui/src/sequence_viewer/conservation_painter.cc
index 7bab56edccd81c7fa29edbebc4d1789d038102af..b5e7085485da45d80c6b6c818e853eda135fa2ce 100644
--- a/modules/gui/src/sequence_viewer/conservation_painter.cc
+++ b/modules/gui/src/sequence_viewer/conservation_painter.cc
@@ -22,10 +22,10 @@
  */
 
 
-#include <QtGui>
 
 #include "conservation_painter.hh"
 
+#include <QtGui>
 namespace ost { namespace gui {
 
 
diff --git a/modules/gui/src/sequence_viewer/conservation_painter.hh b/modules/gui/src/sequence_viewer/conservation_painter.hh
index c6549f661c57e579ce07c01fd0ba027fb120a563..f6cea31597773deb3700cfad553e64f6bcbaeb1c 100644
--- a/modules/gui/src/sequence_viewer/conservation_painter.hh
+++ b/modules/gui/src/sequence_viewer/conservation_painter.hh
@@ -23,10 +23,10 @@
   Author: Stefan Scheuber
  */
 
-#include <QObject>
 
 #include "painter.hh"
 
+#include <QObject>
 namespace ost { namespace gui {
 
 
diff --git a/modules/gui/src/sequence_viewer/painter.hh b/modules/gui/src/sequence_viewer/painter.hh
index 75e601cdabe9adb5e83554eda7d57e5d914a11e8..971c0b1f84f46f4600ec5b954b73cf40aa5d1a84 100644
--- a/modules/gui/src/sequence_viewer/painter.hh
+++ b/modules/gui/src/sequence_viewer/painter.hh
@@ -23,15 +23,15 @@
   Author: Stefan Scheuber
  */
 
+
+#include <ost/mol/alg/sec_structure_segments.hh>
+
 #include <QObject>
 #include <QPainter>
 #include <QStyleOptionViewItem>
 #include <QModelIndex>
 #include <QVarLengthArray>
 #include <QList>
-
-#include <ost/mol/alg/sec_structure_segments.hh>
-
 namespace ost { namespace gui {
 
 class Painter : public QObject
diff --git a/modules/gui/src/sequence_viewer/secstr_row.cc b/modules/gui/src/sequence_viewer/secstr_row.cc
index 180a47469bc97f931ce713e74574ee20be3083a7..2610fc1a20493f14a50665270736addfb1718f35 100644
--- a/modules/gui/src/sequence_viewer/secstr_row.cc
+++ b/modules/gui/src/sequence_viewer/secstr_row.cc
@@ -22,7 +22,6 @@
  */
 
 
-#include <QtGui>
 
 #include <ost/mol/mol.hh>
 #include <ost/mol/view_op.hh>
@@ -31,6 +30,7 @@
 
 #include "secstr_row.hh"
 
+#include <QtGui>
 namespace ost { namespace gui {
 
 SecStrRow::SecStrRow(const QString& name, mol::ChainView& chain, SequenceViewObject* parent) : SequenceRow(name,parent)
diff --git a/modules/gui/src/sequence_viewer/secstr_row.hh b/modules/gui/src/sequence_viewer/secstr_row.hh
index 4b6bd2762457b2545807b344f1953362543f0347..7a9d7991dc3e4dbf30f3d646eb4ba0d994591862 100644
--- a/modules/gui/src/sequence_viewer/secstr_row.hh
+++ b/modules/gui/src/sequence_viewer/secstr_row.hh
@@ -23,14 +23,14 @@
   Author: Stefan Scheuber
  */
 
-#include <QObject>
-#include <QVarLengthArray>
 
 #include <ost/mol/chain_view.hh>
 #include <ost/mol/alg/sec_structure_segments.hh>
 
 #include "sequence_row.hh"
 
+#include <QObject>
+#include <QVarLengthArray>
 namespace ost { namespace gui {
 
 class SecStrRow : public SequenceRow
diff --git a/modules/gui/src/sequence_viewer/seq_secstr_painter.cc b/modules/gui/src/sequence_viewer/seq_secstr_painter.cc
index 0929a9527653e2e778316b3dc202962e5797888b..df3a284d8d9c5b281fb7e56e39a1c2dc4fe1a43e 100644
--- a/modules/gui/src/sequence_viewer/seq_secstr_painter.cc
+++ b/modules/gui/src/sequence_viewer/seq_secstr_painter.cc
@@ -22,10 +22,10 @@
  */
 
 
-#include <QtGui>
 
 #include "seq_secstr_painter.hh"
 
+#include <QtGui>
 namespace ost { namespace gui {
 
 SeqSecStrPainter::SeqSecStrPainter(QObject* parent)
diff --git a/modules/gui/src/sequence_viewer/seq_secstr_painter.hh b/modules/gui/src/sequence_viewer/seq_secstr_painter.hh
index a00ebdfd3e0eb83a213f4fce669a19b19e2bfbe4..3dc5fdcb4c112789db41d43cd5528f76b85888a2 100644
--- a/modules/gui/src/sequence_viewer/seq_secstr_painter.hh
+++ b/modules/gui/src/sequence_viewer/seq_secstr_painter.hh
@@ -23,10 +23,10 @@
   Author: Stefan Scheuber
  */
 
-#include <QObject>
-#include <QVarLengthArray>
 
 #include "painter.hh"
+#include <QObject>
+#include <QVarLengthArray>
 
 namespace ost { namespace gui {
 
diff --git a/modules/gui/src/sequence_viewer/seq_selection_painter.cc b/modules/gui/src/sequence_viewer/seq_selection_painter.cc
index 8473171967a9f398e8e9a9883197ab54ff605146..4cff32d95000b7263c3e45b2c7736bed6ca9b054 100644
--- a/modules/gui/src/sequence_viewer/seq_selection_painter.cc
+++ b/modules/gui/src/sequence_viewer/seq_selection_painter.cc
@@ -22,9 +22,9 @@
  */
 
 
-#include <QtGui>
 
 #include "seq_selection_painter.hh"
+#include <QtGui>
 
 namespace ost { namespace gui {
 
diff --git a/modules/gui/src/sequence_viewer/seq_selection_painter.hh b/modules/gui/src/sequence_viewer/seq_selection_painter.hh
index a98d5afb6bf0cab9e33e7283ec5e6b80af423aa3..68174501a2edcabbef106bf9556645d7f61a48f3 100644
--- a/modules/gui/src/sequence_viewer/seq_selection_painter.hh
+++ b/modules/gui/src/sequence_viewer/seq_selection_painter.hh
@@ -23,9 +23,9 @@
   Author: Stefan Scheuber
  */
 
-#include <QObject>
 
 #include "painter.hh"
+#include <QObject>
 
 namespace ost { namespace gui {
 
diff --git a/modules/gui/src/sequence_viewer/seq_text_painter.cc b/modules/gui/src/sequence_viewer/seq_text_painter.cc
index 50334bf3909612a58e4945fab049578709cfe54a..ea1599e9e5a5e9028e377757ae84bc937424fc1d 100644
--- a/modules/gui/src/sequence_viewer/seq_text_painter.cc
+++ b/modules/gui/src/sequence_viewer/seq_text_painter.cc
@@ -22,10 +22,10 @@
  */
 
 
-#include <QtGui>
 
 #include "seq_text_painter.hh"
 
+#include <QtGui>
 namespace ost { namespace gui {
 
 SeqTextPainter::SeqTextPainter(QObject* parent)
diff --git a/modules/gui/src/sequence_viewer/seq_text_painter.hh b/modules/gui/src/sequence_viewer/seq_text_painter.hh
index 429394cb4bca349b3bc67a9269fbda2048954223..89d3190809d49696bc6b6f74d58343f125b8e244 100644
--- a/modules/gui/src/sequence_viewer/seq_text_painter.hh
+++ b/modules/gui/src/sequence_viewer/seq_text_painter.hh
@@ -23,9 +23,9 @@
   Author: Stefan Scheuber
  */
 
-#include <QObject>
 
 #include "painter.hh"
+#include <QObject>
 
 namespace ost { namespace gui {
 
diff --git a/modules/gui/src/sequence_viewer/sequence_delegate.cc b/modules/gui/src/sequence_viewer/sequence_delegate.cc
index 6bb36cac4c7ba1dae8af0df6dc2f6e66748feac3..ba2598b85f80556948dbce64d17b15948a3deab4 100644
--- a/modules/gui/src/sequence_viewer/sequence_delegate.cc
+++ b/modules/gui/src/sequence_viewer/sequence_delegate.cc
@@ -22,8 +22,8 @@
  */
 
 
-#include <QtGui>
 #include "sequence_delegate.hh"
+#include <QtGui>
 
 namespace ost { namespace gui {
 
diff --git a/modules/gui/src/sequence_viewer/sequence_delegate.hh b/modules/gui/src/sequence_viewer/sequence_delegate.hh
index 3c74fcf54abd4f7604c10b41dde9427fa0e7d54f..4396faafa2d2125e0147d4d03996a31ed5aedbe6 100644
--- a/modules/gui/src/sequence_viewer/sequence_delegate.hh
+++ b/modules/gui/src/sequence_viewer/sequence_delegate.hh
@@ -23,10 +23,10 @@
   Author: Stefan Scheuber
  */
 
-#include <QItemDelegate>
-#include <QModelIndex>
 
 #include "sequence_model.hh"
+#include <QItemDelegate>
+#include <QModelIndex>
 
 namespace ost { namespace gui {
 
diff --git a/modules/gui/src/sequence_viewer/sequence_model.cc b/modules/gui/src/sequence_viewer/sequence_model.cc
index 293ffe2d6291148c330b9cdb56df2fff547493d8..342a04e1f258cfe8b87cd0488bb616d46b94ab2c 100644
--- a/modules/gui/src/sequence_viewer/sequence_model.cc
+++ b/modules/gui/src/sequence_viewer/sequence_model.cc
@@ -21,10 +21,6 @@
   Author: Stefan Scheuber
  */
 
-#include <QMap>
-#include <QMapIterator>
-
-#include <QtGui>
 
 #include "title_row.hh"
 
@@ -33,6 +29,10 @@
 
 #include "sequence_model.hh"
 
+#include <QMap>
+#include <QMapIterator>
+
+#include <QtGui>
 namespace ost { namespace gui {
 
 SequenceModel::SequenceModel(QObject *parent)
diff --git a/modules/gui/src/sequence_viewer/sequence_model.hh b/modules/gui/src/sequence_viewer/sequence_model.hh
index f05241df018cbb6d6736d7cb676fa69a46f9c52d..5a105c66fd1b8aa6b95d9dc5883e998191192cba 100644
--- a/modules/gui/src/sequence_viewer/sequence_model.hh
+++ b/modules/gui/src/sequence_viewer/sequence_model.hh
@@ -23,8 +23,6 @@
   Author: Stefan Scheuber
  */
 
-#include <QAbstractTableModel>
-#include <QItemSelection>
 
 #include <ost/mol/chain_view.hh>
 
@@ -37,6 +35,8 @@
 #include "alignment_view_object.hh"
 #include "sequence_view_object.hh"
 
+#include <QAbstractTableModel>
+#include <QItemSelection>
 namespace ost { namespace gui {
 
 class SequenceModel : public QAbstractTableModel
diff --git a/modules/gui/src/sequence_viewer/sequence_row.cc b/modules/gui/src/sequence_viewer/sequence_row.cc
index f614799f1d14fa71b95dd8b05d2eb15845889fbb..5537b9f82e51b1c121163147cf9f0edc950bd81b 100644
--- a/modules/gui/src/sequence_viewer/sequence_row.cc
+++ b/modules/gui/src/sequence_viewer/sequence_row.cc
@@ -22,7 +22,6 @@
  */
 
 
-#include <QtGui>
 
 #include <ost/mol/mol.hh>
 #include <ost/mol/view_op.hh>
@@ -32,6 +31,7 @@
 #include "sequence_view_object.hh"
 #include "sequence_row.hh"
 
+#include <QtGui>
 namespace ost { namespace gui {
 
 SequenceRow::SequenceRow(const QString& name, seq::SequenceHandle& sequence, SequenceViewObject* parent) : BaseRow(QFont("Courier",11),parent), name_(name), name_font_(QFont("Courier",11)), sequence_(sequence)
diff --git a/modules/gui/src/sequence_viewer/sequence_row.hh b/modules/gui/src/sequence_viewer/sequence_row.hh
index 51979f330de1a0c2249816c6eda26784d3f29564..1665366ba447e0121b94a5c9a41fa5919616d291 100644
--- a/modules/gui/src/sequence_viewer/sequence_row.hh
+++ b/modules/gui/src/sequence_viewer/sequence_row.hh
@@ -23,11 +23,11 @@
   Author: Stefan Scheuber
  */
 
-#include <QObject>
 
 #include <ost/seq/sequence_handle.hh>
 
 #include "base_row.hh"
+#include <QObject>
 
 namespace ost { namespace gui {
 
diff --git a/modules/gui/src/sequence_viewer/sequence_table_view.cc b/modules/gui/src/sequence_viewer/sequence_table_view.cc
index baa69d8254a262f12bebc6dddbaf1a0b3b825962..a4998dcf3419bd50c4a4b1153b1f78f5fbb8aff9 100644
--- a/modules/gui/src/sequence_viewer/sequence_table_view.cc
+++ b/modules/gui/src/sequence_viewer/sequence_table_view.cc
@@ -21,14 +21,14 @@
   Author: Stefan Scheuber
  */
 
+
+#include "sequence_table_view.hh"
+#include "sequence_model.hh"
 #include <QHeaderView>
 #include <QScrollBar>
 #include <QTableWidgetItem>
 #include <QMouseEvent>
 
-#include "sequence_table_view.hh"
-#include "sequence_model.hh"
-
 namespace ost { namespace gui {
 
 
diff --git a/modules/gui/src/sequence_viewer/sequence_table_view.hh b/modules/gui/src/sequence_viewer/sequence_table_view.hh
index e138d07eadc8dc63a4c110b4fbcb2900f82bac44..3114a8f6e8c334cd40f46529f9f05707aa62dcac 100644
--- a/modules/gui/src/sequence_viewer/sequence_table_view.hh
+++ b/modules/gui/src/sequence_viewer/sequence_table_view.hh
@@ -23,13 +23,13 @@
   Author: Stefan Scheuber
  */
 
-#include <QTableView>
-#include <QWheelEvent>
 
 #include <ost/gui/module_config.hh>
 
 #include "sequence_delegate.hh"
 
+#include <QTableView>
+#include <QWheelEvent>
 namespace ost { namespace gui {
 
 /// \brief QTableView with first column not moving
diff --git a/modules/gui/src/sequence_viewer/sequence_view_object.cc b/modules/gui/src/sequence_viewer/sequence_view_object.cc
index fdc227d2eb41ae1323f1c9b7a01bba8e62d7831e..40a46a519d85158584d37338558bd70128fd7f6b 100644
--- a/modules/gui/src/sequence_viewer/sequence_view_object.cc
+++ b/modules/gui/src/sequence_viewer/sequence_view_object.cc
@@ -22,7 +22,6 @@
  */
 
 
-#include <QtGui>
 
 #include <ost/mol/mol.hh>
 #include <ost/mol/view_op.hh>
@@ -32,6 +31,7 @@
 
 #include "sequence_view_object.hh"
 
+#include <QtGui>
 namespace ost { namespace gui {
 
 const QString SequenceViewObject::properties_mode = "Highlight properties";
diff --git a/modules/gui/src/sequence_viewer/sequence_viewer.cc b/modules/gui/src/sequence_viewer/sequence_viewer.cc
index 2d38f5e6969a38aa09ea9b1efa38ce6495b192bb..79c13057f9e85b248bfc9590d3f5bc1af19929ad 100644
--- a/modules/gui/src/sequence_viewer/sequence_viewer.cc
+++ b/modules/gui/src/sequence_viewer/sequence_viewer.cc
@@ -20,18 +20,9 @@
 /*
   Author: Stefan Scheuber
  */
+#include <ost/gui/gosty_app.hh>
 #include <boost/pointer_cast.hpp>
 
-#include <QAbstractItemView>
-#include <QApplication>
-#include <QClipboard>
-#include <QDir>
-#include <QHeaderView>
-#include <QMenu>
-#include <QPushButton>
-#include <QShortcut>
-#include <QVBoxLayout>
-#include <QVarLengthArray>
 
 #include <ost/platform.hh>
 #include <ost/mol/chain_view.hh>
@@ -44,11 +35,20 @@
 #include <ost/gfx/gfx_node_visitor.hh>
 
 #include <ost/gui/widget_registry.hh>
-#include <ost/gui/gosty_app.hh>
 
 #include "sequence_model.hh"
 #include "sequence_viewer.hh"
 
+#include <QAbstractItemView>
+#include <QApplication>
+#include <QClipboard>
+#include <QDir>
+#include <QHeaderView>
+#include <QMenu>
+#include <QPushButton>
+#include <QShortcut>
+#include <QVBoxLayout>
+#include <QVarLengthArray>
 namespace ost { namespace gui {
 
 class SequenceViewerFactory: public WidgetFactory {
diff --git a/modules/gui/src/sequence_viewer/sequence_viewer.hh b/modules/gui/src/sequence_viewer/sequence_viewer.hh
index 1939eddb1dccdcdbc7832ca9b76f91adda133dbe..6a3c49efcabf852bf39a1bf47d6f503f75c2c5ea 100644
--- a/modules/gui/src/sequence_viewer/sequence_viewer.hh
+++ b/modules/gui/src/sequence_viewer/sequence_viewer.hh
@@ -23,9 +23,6 @@
   Author: Stefan Scheuber
  */
 
-#include <QWidget>
-#include <QActionGroup>
-#include <QToolBar>
 
 #include <ost/seq/alignment_handle.hh>
 
@@ -40,6 +37,9 @@
 #include "sequence_model.hh"
 #include "sequence_table_view.hh"
 
+#include <QWidget>
+#include <QActionGroup>
+#include <QToolBar>
 namespace ost { namespace gui {
 
 /// \brief QTableView with first column not moving
diff --git a/modules/gui/src/sequence_viewer/tick_painter.hh b/modules/gui/src/sequence_viewer/tick_painter.hh
index d5c6c4fff05c68214c3f012b26b046f29bbfeedd..11ff679bb183e91fa8cb92ffa08176c8ca2f418d 100644
--- a/modules/gui/src/sequence_viewer/tick_painter.hh
+++ b/modules/gui/src/sequence_viewer/tick_painter.hh
@@ -23,9 +23,9 @@
   Author: Stefan Scheuber
  */
 
-#include <QObject>
 
 #include "painter.hh"
+#include <QObject>
 
 namespace ost { namespace gui {
 
diff --git a/modules/gui/src/sequence_viewer/title_row.cc b/modules/gui/src/sequence_viewer/title_row.cc
index 727aa0239b86a8e3eff2bba67e326efb0f3ea428..b8b05fbcaaa9089b7b73727ffe4dfc59b68bbda0 100644
--- a/modules/gui/src/sequence_viewer/title_row.cc
+++ b/modules/gui/src/sequence_viewer/title_row.cc
@@ -22,11 +22,11 @@
  */
 
 
-#include <QtGui>
 
 #include "sequence_model.hh"
 #include "title_row.hh"
 
+#include <QtGui>
 namespace ost { namespace gui {
 
 TitleRow::TitleRow(QObject* parent) : BaseRow(QFont("Courier",10),parent), font_("Verdana",9), small_font_("Verdana",7)
diff --git a/modules/gui/src/sequence_viewer/title_row.hh b/modules/gui/src/sequence_viewer/title_row.hh
index 6274d3c13dd322ef63a1c7ce87253d2bb4776b5e..409d62e5033fd46bcb313061541e3fa191dd0957 100644
--- a/modules/gui/src/sequence_viewer/title_row.hh
+++ b/modules/gui/src/sequence_viewer/title_row.hh
@@ -23,9 +23,9 @@
   Author: Stefan Scheuber
  */
 
-#include <QObject>
 
 #include "base_row.hh"
+#include <QObject>
 
 namespace ost { namespace gui {
 
diff --git a/modules/gui/src/thin_splitter.cc b/modules/gui/src/thin_splitter.cc
index 94455343f7a2bd6f5973f49b3baee118ea53068b..aed72b937e8b11a0dde1b48ad31d0ded48a252ea 100644
--- a/modules/gui/src/thin_splitter.cc
+++ b/modules/gui/src/thin_splitter.cc
@@ -16,6 +16,9 @@
 // along with this library; if not, write to the Free Software Foundation, Inc.,
 // 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
 //------------------------------------------------------------------------------
+
+#include "thin_splitter.hh"
+
 #include <QRegion>
 #include <QPainter>
 #include <QResizeEvent>
@@ -23,9 +26,6 @@
 #include <QSplitterHandle>
 #include <QApplication>
 #include <QPalette>
-
-#include "thin_splitter.hh"
-
 /*
    Author: Marco Biasini
  */
diff --git a/modules/gui/src/tools/manipulator.cc b/modules/gui/src/tools/manipulator.cc
index ac50e4dd20db637ae8d5851e615291244e7514be..29fe8b703e6710f025f0ae6cfe83b3c389686819 100644
--- a/modules/gui/src/tools/manipulator.cc
+++ b/modules/gui/src/tools/manipulator.cc
@@ -16,7 +16,7 @@
 // along with this library; if not, write to the Free Software Foundation, Inc.,
 // 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
 //------------------------------------------------------------------------------
-#include <QDir>
+#include <ost/gui/gosty_app.hh>
 
 #include <ost/platform.hh>
 
@@ -24,11 +24,11 @@
 #include <ost/gfx/gfx_object.hh>
 #include <ost/gfx/gfx_node.hh>
 
-#include <ost/gui/gosty_app.hh>
 #include <ost/gui/scene_selection.hh>
 
 #include "manipulator.hh"
 
+#include <QDir>
 namespace ost { namespace gui {
 
 Manipulator::Manipulator():
diff --git a/modules/gui/src/tools/manipulator.hh b/modules/gui/src/tools/manipulator.hh
index 2fb4cbbe4c209f29a3a6c25605d890f68ef3811e..2affc6628e104c971f8b9b749edf894ef510973c 100644
--- a/modules/gui/src/tools/manipulator.hh
+++ b/modules/gui/src/tools/manipulator.hh
@@ -22,13 +22,14 @@
 /*
   Author: Marco Biasini
  */
-#include <QList>
 
 #include <ost/gui/module_config.hh>
 #include <ost/gfx/input.hh>
 
 #include <ost/gui/tools/tool.hh>
 
+#include <QList>
+
 namespace ost { namespace gui {
 
 class Manipulator;
diff --git a/modules/gui/src/tools/map_tool.cc b/modules/gui/src/tools/map_tool.cc
index 58b67d3e77ccb474fa129663ac7515ce29272bc7..ef2a784412153df6b475a8a74404ae0f99ee4aff 100644
--- a/modules/gui/src/tools/map_tool.cc
+++ b/modules/gui/src/tools/map_tool.cc
@@ -16,17 +16,17 @@
 // along with this library; if not, write to the Free Software Foundation, Inc.,
 // 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
 //------------------------------------------------------------------------------
-#include <QDir>
 
+#include <ost/gui/gosty_app.hh>
 #include <ost/platform.hh>
 #include <ost/gfx/map_iso.hh>
 #include <ost/gfx/map_slab.hh>
 #include <ost/gfx/scene.hh>
 
 #include <ost/gui/scene_selection.hh>
-#include <ost/gui/gosty_app.hh>
 #include "map_tool.hh"
 
+#include <QDir>
 namespace ost { namespace gui {
 
 MapTool::MapTool():
diff --git a/modules/gui/src/tools/map_tool.hh b/modules/gui/src/tools/map_tool.hh
index 2d1257cb81dd029518207cd137aa7f0be25d2ed5..35547b51525f85ec4d89532c480979b09b413f20 100644
--- a/modules/gui/src/tools/map_tool.hh
+++ b/modules/gui/src/tools/map_tool.hh
@@ -22,10 +22,10 @@
 /*
   Author: Ansgar Philippsen
 */
-#include <QList>
 
 #include <ost/gui/tools/tool.hh>
 
+#include <QList>
 namespace ost { namespace gui {
 
 class DLLEXPORT_OST_GUI MapTool : public Tool {
diff --git a/modules/gui/src/tools/measure_tool.cc b/modules/gui/src/tools/measure_tool.cc
index ac8c2951478fa3c4ad59002cfac65066d8c4c8bf..4247e2f830d7f859a03666693c522e530cfc88ae 100644
--- a/modules/gui/src/tools/measure_tool.cc
+++ b/modules/gui/src/tools/measure_tool.cc
@@ -27,7 +27,6 @@
 #include <iostream>
 #include <sstream>
 
-#include <QDir>
 
 #include <ost/platform.hh>
 #include <ost/gfx/scene.hh>
@@ -36,6 +35,7 @@
 
 #include <ost/geom/vec3.hh>
 
+#include <QDir>
 namespace ost { namespace gui {
 
 MeasureTool::MeasureTool()
diff --git a/modules/gui/src/tools/measure_tool.hh b/modules/gui/src/tools/measure_tool.hh
index 77b5f627f117ec072404837e49b6267a4c5fb5a8..d1eedcef7c44652865c6de1c10c42771b4eaa79c 100644
--- a/modules/gui/src/tools/measure_tool.hh
+++ b/modules/gui/src/tools/measure_tool.hh
@@ -22,12 +22,12 @@
 /*
   Author: Tobias Schmidt
  */
-#include <QList>
 
 #include <ost/gui/tools/tool.hh>
 #include <ost/mol/atom_handle.hh>
 #include <ost/gfx/color.hh>
 
+#include <QList>
 namespace ost { namespace gui {
 
 class DLLEXPORT_OST_GUI Measurement {
diff --git a/modules/gui/src/tools/selection_tool.cc b/modules/gui/src/tools/selection_tool.cc
index 047577a62fa5adb03df4e795877aa6071f215097..dfc45ca8f0aa55cc979336f8a54c0d9cbaf42730 100644
--- a/modules/gui/src/tools/selection_tool.cc
+++ b/modules/gui/src/tools/selection_tool.cc
@@ -21,13 +21,13 @@
  */
 #include "selection_tool.hh"
 
-#include <QDir>
 
 #include <ost/platform.hh>
 #include <ost/gfx/scene.hh>
 
 #include <ost/gui/gl_canvas.hh>
 
+#include <QDir>
 namespace ost { namespace gui {
 
 SelectionTool::SelectionTool()
diff --git a/modules/gui/src/tools/selection_tool.hh b/modules/gui/src/tools/selection_tool.hh
index d805ced221a8b663f8c16ef7e6371e774d68aea2..a02102fdb55924d6f40a64e784a6a2a121378657 100644
--- a/modules/gui/src/tools/selection_tool.hh
+++ b/modules/gui/src/tools/selection_tool.hh
@@ -22,10 +22,10 @@
 /*
   Author: Marco Biasini
  */
-#include <QList>
 
 #include <ost/gui/tools/tool.hh>
 
+#include <QList>
 
 namespace ost { namespace gui {
 
diff --git a/modules/gui/src/tools/tool.hh b/modules/gui/src/tools/tool.hh
index 24f4536901c87d6c08e2738c85c2d46e5b520f66..0be85bc7daaa514f2d0965095c13919ac1fc0a82 100644
--- a/modules/gui/src/tools/tool.hh
+++ b/modules/gui/src/tools/tool.hh
@@ -24,13 +24,14 @@
  */
 #include <vector>
 
-#include <QIcon>
 
 #include <ost/gui/module_config.hh>
 #include <ost/gfx/gfx_node.hh>
 #include <ost/gui/tools/mouse_event.hh>
 #include <ost/gui/tools/tool_options.hh>
 
+#include <QIcon>
+
 namespace ost { namespace gui {
 
 class ToolOptions;
diff --git a/modules/gui/src/tools/tool_bar.cc b/modules/gui/src/tools/tool_bar.cc
index 11621af0f4f07980bf0be1755bbbd54cb7009dd5..e4babc0ed2b85be84a2113f3f30a127a74e35bc8 100644
--- a/modules/gui/src/tools/tool_bar.cc
+++ b/modules/gui/src/tools/tool_bar.cc
@@ -16,15 +16,15 @@
 // along with this library; if not, write to the Free Software Foundation, Inc.,
 // 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
 //------------------------------------------------------------------------------
-#include <QAction>
-#include <QDebug>
-#include <QActionGroup>
 
+#include <ost/gui/gosty_app.hh>
 #include <ost/mol/query_view_wrapper.hh>
 #include <ost/gui/tools/tool_manager.hh>
-#include <ost/gui/gosty_app.hh>
 #include "tool_bar.hh"
 
+#include <QAction>
+#include <QDebug>
+#include <QActionGroup>
 namespace ost { namespace gui {
 
 ToolBar::ToolBar(QWidget* parent):
diff --git a/modules/gui/src/tools/tool_bar.hh b/modules/gui/src/tools/tool_bar.hh
index 1e95d5bbf4f27c0c6fa808bf862a6c36a05aaded..f58594cc5b899436ed92e811d6cc161b8274025b 100644
--- a/modules/gui/src/tools/tool_bar.hh
+++ b/modules/gui/src/tools/tool_bar.hh
@@ -23,13 +23,13 @@
   Author: Marco Biasini
  */
 
-#include <QToolBar>
-#include <QList>
 
 #include <ost/gfx/gfx_node.hh>
 #include <ost/gui/module_config.hh>
 #include <ost/gui/tools/tool.hh>
 
+#include <QToolBar>
+#include <QList>
 
 class QActionGroup;
 
diff --git a/modules/gui/src/tools/tool_manager.hh b/modules/gui/src/tools/tool_manager.hh
index 5fa48b05e0a619f7e6a4d4fd56486b46a146546d..d571f00151995a7e10ed5f86cb51ee5e8170803e 100644
--- a/modules/gui/src/tools/tool_manager.hh
+++ b/modules/gui/src/tools/tool_manager.hh
@@ -20,10 +20,10 @@
 #define OST_GUI_TOOL_MANAGER_HH
 
 #include <ost/gui/module_config.hh>
-#include <QObject>
 
 #include <ost/gui/tools/tool.hh>
 
+#include <QObject>
 /*
   Author: Marco Biasini
  */
diff --git a/modules/gui/src/tools/tool_option.hh b/modules/gui/src/tools/tool_option.hh
index 793974be04e601e07a5702d62da78c09af100f2e..ff08fad0df6dd5dcfe84e4ea39135d3de1927531 100644
--- a/modules/gui/src/tools/tool_option.hh
+++ b/modules/gui/src/tools/tool_option.hh
@@ -26,9 +26,10 @@
 #include <limits>
 #include <vector>
 
-#include <QObject>
 
 #include <ost/gui/module_config.hh>
+#include <QObject>
+
 
 namespace ost { namespace gui {
 
diff --git a/modules/gui/src/tools/tool_option_group.hh b/modules/gui/src/tools/tool_option_group.hh
index 6b47d0ed6ea46f20e368d328a0c52dfdd3292984..ead9a57e3bdde25cb17ed698f5f996fba3931afe 100644
--- a/modules/gui/src/tools/tool_option_group.hh
+++ b/modules/gui/src/tools/tool_option_group.hh
@@ -23,11 +23,11 @@
   Author: Marco Biasini
  */
 
-#include <QObject>
 
 #include <ost/gui/module_config.hh>
 #include <ost/gui/tools/tool_option.hh>
 
+#include <QObject>
 namespace ost { namespace gui {
 
 
diff --git a/modules/gui/src/tools/tool_options.hh b/modules/gui/src/tools/tool_options.hh
index fd7d20d2c7841cf78e31df57b481be0cde760ae8..f4c9adeda925bbd66ab6b01a907ef0232f852689 100644
--- a/modules/gui/src/tools/tool_options.hh
+++ b/modules/gui/src/tools/tool_options.hh
@@ -23,11 +23,11 @@
   Author: Marco Biasini
  */
  
-#include <QObject>
 
 #include <ost/gui/module_config.hh>
 #include <ost/gui/tools/tool_option_group.hh>
 
+#include <QObject>
 namespace ost { namespace gui {
 
 
diff --git a/modules/gui/src/tools/tool_options_win.cc b/modules/gui/src/tools/tool_options_win.cc
index ecc1c1e4087154e71ab8e1d307faa5ac2b5607f6..56b2f551df416f841882869a75c8ba0edec790ed 100644
--- a/modules/gui/src/tools/tool_options_win.cc
+++ b/modules/gui/src/tools/tool_options_win.cc
@@ -16,14 +16,14 @@
 // along with this library; if not, write to the Free Software Foundation, Inc.,
 // 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
 //------------------------------------------------------------------------------
-#include <QVBoxLayout>
 
+#include <ost/gui/gosty_app.hh>
 #include <ost/gui/tools/tool_options_win.hh>
 #include <ost/gui/widget_registry.hh>
 #include <ost/gui/tools/tool_options_widget.hh>
 #include <ost/gui/tools/tool_manager.hh>
-#include <ost/gui/gosty_app.hh>
 
+#include <QVBoxLayout>
 namespace ost { namespace gui {
 
 
diff --git a/modules/gui/src/tools/tool_options_win.hh b/modules/gui/src/tools/tool_options_win.hh
index 08347ac994cfef1ff0cf0fc348cfe37e2c967e4e..9c1d7900c89d5d37fc435d2b88fceb0cb8e18f72 100644
--- a/modules/gui/src/tools/tool_options_win.hh
+++ b/modules/gui/src/tools/tool_options_win.hh
@@ -21,13 +21,13 @@
 
 #include <map>
 
-#include <QStackedWidget>
  
 #include <ost/gui/module_config.hh>
 
 #include <ost/gui/tools/tool.hh>
 #include <ost/gui/widget.hh>
 
+#include <QStackedWidget>
 
 /*
   Author: Marco Biasini
diff --git a/modules/gui/src/widget.hh b/modules/gui/src/widget.hh
index 9aeb1bbfa3426f250d12bb1b0350ef784bf93a26..45252b0475925e5e038a4d1a1d4f143adfc0c0fb 100644
--- a/modules/gui/src/widget.hh
+++ b/modules/gui/src/widget.hh
@@ -19,11 +19,11 @@
 #ifndef OST_GUI_WIDGET_HH
 #define OST_GUI_WIDGET_HH
 
-#include <QWidget>
-#include <QMetaType>
 
 #include <ost/gui/module_config.hh>
 
+#include <QWidget>
+#include <QMetaType>
 /*
   Author: Marco Biasini
  */
diff --git a/modules/gui/src/widget_geom_handler.cc b/modules/gui/src/widget_geom_handler.cc
index 6b9914157b5317033815f605b8aeed12fbe9973b..aa2acd8d9e9a371cba22b83d5cdf0d5f8f8783ca 100644
--- a/modules/gui/src/widget_geom_handler.cc
+++ b/modules/gui/src/widget_geom_handler.cc
@@ -16,10 +16,10 @@
 // along with this library; if not, write to the Free Software Foundation, Inc.,
 // 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
 //------------------------------------------------------------------------------
-#include <QSettings>
 #include <iostream>
 #include "widget_geom_handler.hh"
 
+#include <QSettings>
 namespace ost { namespace gui {
 
 WidgetGeomHandler::WidgetGeomHandler(const QString& name, QWidget* widget, QWidget* parent)
diff --git a/modules/gui/src/widget_geom_handler.hh b/modules/gui/src/widget_geom_handler.hh
index 070a7ae7fa57c651380f0196895dc22fbadb2d41..164719ba4ae35222ceb4b60992a8465d7deed7bc 100644
--- a/modules/gui/src/widget_geom_handler.hh
+++ b/modules/gui/src/widget_geom_handler.hh
@@ -19,10 +19,10 @@
 #ifndef OST_GUI_WIDGET_GEOM_HANDLER_HH
 #define OST_GUI_WIDGET_GEOM_HANDLER_HH
 
-#include <QWidget>
 
 #include <ost/gui/module_config.hh>
 
+#include <QWidget>
 namespace ost { namespace gui {
 
 class DLLEXPORT_OST_GUI WidgetGeomHandler: public QObject{
diff --git a/modules/gui/src/widget_pool.hh b/modules/gui/src/widget_pool.hh
index 7555a2116318202d38001f8e385d6baed3312061..8a938c63506a94db3200a753ce39a3d01ead03a0 100644
--- a/modules/gui/src/widget_pool.hh
+++ b/modules/gui/src/widget_pool.hh
@@ -19,8 +19,8 @@
 #ifndef OST_GUI_WIDGET_POOL_HH
 #define OST_GUI_WIDGET_POOL_HH
 
-#include <QSettings>
 #include <ost/gui/widget.hh>
+#include <QSettings>
 /*
   Author: Marco Biasini, Stefan Scheuber
  */
diff --git a/modules/gui/src/widget_registry.cc b/modules/gui/src/widget_registry.cc
index d528f701d694a41cf5c3a6a6f79cab6b5177de89..965545f127358b4c88dce4ddcf044f5eb433b9e0 100644
--- a/modules/gui/src/widget_registry.cc
+++ b/modules/gui/src/widget_registry.cc
@@ -16,10 +16,10 @@
 // along with this library; if not, write to the Free Software Foundation, Inc.,
 // 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
 //------------------------------------------------------------------------------
-#include <QDebug>
 
 #include "widget_registry.hh"
 
+#include <QDebug>
 namespace ost { namespace gui {