diff --git a/modules/gui/pymod/export_message_widget.cc b/modules/gui/pymod/export_message_widget.cc
index 0cbdcdfc7f40eb2b0d442ec3f289895025870883..0a9c2d7dcedcf10d616793f5924ac8a3082824cc 100644
--- a/modules/gui/pymod/export_message_widget.cc
+++ b/modules/gui/pymod/export_message_widget.cc
@@ -16,9 +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 <vector>
 
 #include <boost/python.hpp>
+#include <vector>
 #include <boost/python/suite/indexing/vector_indexing_suite.hpp>
 
 #include <ost/gui/messages/message_widget.hh>
diff --git a/modules/gui/pymod/export_remote_site_loader.cc b/modules/gui/pymod/export_remote_site_loader.cc
index 91b80ca7727c7abc619749f1bf311977906bbfd0..d864b87e4b4e06bae2d47ff081ff9ceb41c0966d 100644
--- a/modules/gui/pymod/export_remote_site_loader.cc
+++ b/modules/gui/pymod/export_remote_site_loader.cc
@@ -16,20 +16,20 @@
 // along with this library; if not, write to the Free Software Foundation, Inc.,
 // 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
 //------------------------------------------------------------------------------
-#include <string>
 
 #include <boost/python.hpp>
-#include <boost/python/register_ptr_to_python.hpp>
-#include <boost/python/suite/indexing/vector_indexing_suite.hpp>
+#include <string>
 
-using namespace boost::python;
 
 #include <ost/gui/remote_site_loader.hh>
+#include <boost/python/register_ptr_to_python.hpp>
+#include <boost/python/suite/indexing/vector_indexing_suite.hpp>
 
 #include "sip_handler.hh"
 
 using namespace ost;
 using namespace ost::gui;
+using namespace boost::python;
 
 struct WrappedRemoteSiteLoader : public RemoteSiteLoader
 {
diff --git a/modules/gui/pymod/export_sequence_viewer.cc b/modules/gui/pymod/export_sequence_viewer.cc
index fb2c7e45fa38274c375a36e9c39d48debe6b2012..268b4dd2b28d3779d9b5d2260c978f21cdb0c293 100644
--- a/modules/gui/pymod/export_sequence_viewer.cc
+++ b/modules/gui/pymod/export_sequence_viewer.cc
@@ -16,9 +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 <vector>
 
 #include <boost/python.hpp>
+#include <vector>
 #include <boost/python/suite/indexing/vector_indexing_suite.hpp>
 
 #include <ost/gui/sequence_viewer/sequence_viewer.hh>
diff --git a/modules/gui/pymod/export_tool.cc b/modules/gui/pymod/export_tool.cc
index 946340659ba6bbf7aa8f26c161dd163adffc8124..1d050038fb3854d45b797b56994c6bbe872d55df 100644
--- a/modules/gui/pymod/export_tool.cc
+++ b/modules/gui/pymod/export_tool.cc
@@ -17,9 +17,8 @@
 // 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
 //------------------------------------------------------------------------------
 
-#include <vector>
-
 #include <boost/python.hpp>
+#include <vector>
 #include <boost/python/register_ptr_to_python.hpp>
 #include <boost/python/suite/indexing/vector_indexing_suite.hpp>
 
diff --git a/modules/gui/pymod/export_widget.cc b/modules/gui/pymod/export_widget.cc
index 20d4cc746192069960bc101b5cc3a8b6d75898e8..f548e52ff1f6518c1d887440d08e27af11e2eb4c 100644
--- a/modules/gui/pymod/export_widget.cc
+++ b/modules/gui/pymod/export_widget.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 <string>
 
 #include <boost/python.hpp>
+#include <string>
 #include <boost/python/register_ptr_to_python.hpp>
 
-using namespace boost::python;
 
 #include <ost/gui/widget.hh>
 
 #include "sip_handler.hh"
 
+using namespace boost::python;
 using namespace ost;
 using namespace ost::gui;
 
diff --git a/modules/gui/src/plot_viewer/plot_data_info.hh b/modules/gui/src/plot_viewer/plot_data_info.hh
index d1f6a44a6da4faadc6d8cbb5f6540d26a1835bb6..d1babc2f966efe66791371a80010462f3a435229 100644
--- a/modules/gui/src/plot_viewer/plot_data_info.hh
+++ b/modules/gui/src/plot_viewer/plot_data_info.hh
@@ -24,11 +24,10 @@
   Author: Andreas Schenk
 */
 
-#include <vector>
-#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_group_info.hh b/modules/gui/src/plot_viewer/plot_group_info.hh
index 20f6b4c742cc5e20f03a3b2b96a2a8f7302cd429..e7668633aa1b87071d6bcf2ed547a11518d97532 100644
--- a/modules/gui/src/plot_viewer/plot_group_info.hh
+++ b/modules/gui/src/plot_viewer/plot_group_info.hh
@@ -19,10 +19,10 @@
 #ifndef PLOT_GROUP_INFO_HH_
 #define PLOT_GROUP_INFO_HH_
 
+#include "plot_info_base.hh"
 #include <vector>
-#include <boost/shared_ptr.hpp>
 #include <boost/python.hpp>
-#include "plot_info_base.hh"
+#include <boost/shared_ptr.hpp>
 
 namespace ost{namespace gui{