12 files changed, 17 insertions, 16 deletions
diff --git a/src/client/PluginModel.cpp b/src/client/PluginModel.cpp
index 23015f51..eaa70b9e 100644
--- a/src/client/PluginModel.cpp
+++ b/src/client/PluginModel.cpp
@@ -19,8 +19,8 @@
 #include "ingen/Atom.hpp"
 #include "ingen/client/GraphModel.hpp"
 #include "ingen/client/PluginUI.hpp"
-#include "raul/Path.hpp"
 #include "ingen_config.h"
+#include "raul/Path.hpp"
 
 #include <boost/optional/optional.hpp>
 
diff --git a/src/gui/App.hpp b/src/gui/App.hpp
index 13c46414..e9d83cfd 100644
--- a/src/gui/App.hpp
+++ b/src/gui/App.hpp
@@ -31,8 +31,8 @@
 #include <gtkmm/main.h>
 #include <gtkmm/window.h>
 
-#include <unordered_map>
 #include <string>
+#include <unordered_map>
 
 namespace ingen {
 
diff --git a/src/gui/GraphCanvas.hpp b/src/gui/GraphCanvas.hpp
index 7aa4bb98..b2529845 100644
--- a/src/gui/GraphCanvas.hpp
+++ b/src/gui/GraphCanvas.hpp
@@ -27,9 +27,9 @@
 #include "lilv/lilv.h"
 #include "raul/Path.hpp"
 
-#include <string>
 #include <map>
 #include <set>
+#include <string>
 
 namespace ingen {
 
diff --git a/src/gui/GraphPortModule.cpp b/src/gui/GraphPortModule.cpp
index 336dced7..a80afe57 100644
--- a/src/gui/GraphPortModule.cpp
+++ b/src/gui/GraphPortModule.cpp
@@ -15,13 +15,13 @@
 */
 
 #include "App.hpp"
-#include "Style.hpp"
 #include "GraphCanvas.hpp"
 #include "GraphPortModule.hpp"
 #include "GraphWindow.hpp"
 #include "Port.hpp"
 #include "PortMenu.hpp"
 #include "RenameWindow.hpp"
+#include "Style.hpp"
 #include "WidgetFactory.hpp"
 #include "WindowFactory.hpp"
 
diff --git a/src/gui/GraphView.cpp b/src/gui/GraphView.cpp
index ca12e1ef..e25fa1ba 100644
--- a/src/gui/GraphView.cpp
+++ b/src/gui/GraphView.cpp
@@ -15,11 +15,11 @@
 */
 
 #include "App.hpp"
-#include "LoadPluginWindow.hpp"
-#include "NewSubgraphWindow.hpp"
 #include "GraphCanvas.hpp"
 #include "GraphTreeWindow.hpp"
 #include "GraphView.hpp"
+#include "LoadPluginWindow.hpp"
+#include "NewSubgraphWindow.hpp"
 #include "WidgetFactory.hpp"
 
 #include "ingen/Interface.hpp"
diff --git a/src/gui/LoadPluginWindow.cpp b/src/gui/LoadPluginWindow.cpp
index bb84f96f..870288ac 100644
--- a/src/gui/LoadPluginWindow.cpp
+++ b/src/gui/LoadPluginWindow.cpp
@@ -25,10 +25,10 @@
 #include "ingen/client/ClientStore.hpp"
 #include "ingen/client/GraphModel.hpp"
 
-#include <string>
-#include <cstddef>
-#include <cassert>
 #include <algorithm>
+#include <cassert>
+#include <cstddef>
+#include <string>
 
 using std::string;
 
diff --git a/src/gui/SubgraphModule.hpp b/src/gui/SubgraphModule.hpp
index 6f4e1c4c..8ce4f063 100644
--- a/src/gui/SubgraphModule.hpp
+++ b/src/gui/SubgraphModule.hpp
@@ -19,8 +19,8 @@
 
 #include "ingen/types.hpp"
 
-#include "NodeModule.hpp"
 #include "GraphPortModule.hpp"
+#include "NodeModule.hpp"
 
 namespace ingen { namespace client {
 class GraphModel;
diff --git a/src/server/BufferFactory.hpp b/src/server/BufferFactory.hpp
index 03a85d1c..78d3fb56 100644
--- a/src/server/BufferFactory.hpp
+++ b/src/server/BufferFactory.hpp
@@ -25,8 +25,8 @@
 #include "types.hpp"
 
 #include <atomic>
-#include <mutex>
 #include <cstdint>
+#include <mutex>
 
 namespace Raul { class Maid; }
 
diff --git a/src/server/JackDriver.cpp b/src/server/JackDriver.cpp
index af4dde8f..71ebe308 100644
--- a/src/server/JackDriver.cpp
+++ b/src/server/JackDriver.cpp
@@ -35,13 +35,15 @@
 #include "lv2/atom/util.h"
 
 #include <jack/midiport.h>
+
 #ifdef INGEN_JACK_SESSION
-#include <jack/session.h>
 #include "ingen/Serialiser.hpp"
+#include <jack/session.h>
 #endif
+
 #ifdef HAVE_JACK_METADATA
-#include <jack/metadata.h>
 #include "jackey.h"
+#include <jack/metadata.h>
 #endif
 
 #include <cassert>
diff --git a/src/server/LV2Block.hpp b/src/server/LV2Block.hpp
index 5ef8c69a..d42da499 100644
--- a/src/server/LV2Block.hpp
+++ b/src/server/LV2Block.hpp
@@ -17,8 +17,8 @@
 #ifndef INGEN_ENGINE_LV2BLOCK_HPP
 #define INGEN_ENGINE_LV2BLOCK_HPP
 
-#include "BufferRef.hpp"
 #include "BlockImpl.hpp"
+#include "BufferRef.hpp"
 #include "types.hpp"
 
 #include "ingen/LV2Features.hpp"
diff --git a/src/server/ingen_lv2.cpp b/src/server/ingen_lv2.cpp
index e368d8f1..bccae02d 100644
--- a/src/server/ingen_lv2.cpp
+++ b/src/server/ingen_lv2.cpp
@@ -46,7 +46,6 @@
 #include "ingen/runtime_paths.hpp"
 #include "ingen/types.hpp"
 #include "lv2/atom/atom.h"
-#include "lv2/atom/atom.h"
 #include "lv2/atom/util.h"
 #include "lv2/buf-size/buf-size.h"
 #include "lv2/core/lv2.h"
diff --git a/src/server/util.hpp b/src/server/util.hpp
index 34e2ee79..59cceda4 100644
--- a/src/server/util.hpp
+++ b/src/server/util.hpp
@@ -26,8 +26,8 @@
 #include <xmmintrin.h>
 #endif
 
-#include <fenv.h>
 #include <cstdlib>
+#include <fenv.h>
 
 #ifdef __clang__
 #    define REALTIME __attribute__((annotate("realtime")))