5 files changed, 23 insertions, 16 deletions
diff --git a/src/server/ClientBroadcaster.hpp b/src/server/ClientBroadcaster.hpp
index 5db6961d..c34bb34b 100644
--- a/src/server/ClientBroadcaster.hpp
+++ b/src/server/ClientBroadcaster.hpp
@@ -18,12 +18,14 @@
 #ifndef INGEN_ENGINE_CLIENTBROADCASTER_HPP
 #define INGEN_ENGINE_CLIENTBROADCASTER_HPP
 
-#include <string>
 #include <list>
 #include <map>
-#include <pthread.h>
+#include <string>
+
 #include "raul/SharedPtr.hpp"
+
 #include "ingen/ClientInterface.hpp"
+
 #include "NodeFactory.hpp"
 
 using namespace std;
diff --git a/src/server/HTTPClientSender.hpp b/src/server/HTTPClientSender.hpp
index 63842c3a..71f705da 100644
--- a/src/server/HTTPClientSender.hpp
+++ b/src/server/HTTPClientSender.hpp
@@ -20,8 +20,9 @@
 
 #include <cassert>
 #include <string>
-#include <pthread.h>
+
 #include "raul/Thread.hpp"
+
 #include "ingen/ClientInterface.hpp"
 #include "shared/HTTPSender.hpp"
 
diff --git a/src/server/NodeFactory.cpp b/src/server/NodeFactory.cpp
index 11c11bb4..590f2f86 100644
--- a/src/server/NodeFactory.cpp
+++ b/src/server/NodeFactory.cpp
@@ -15,26 +15,31 @@
  * 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
-#include <cstdlib>
-#include <string>
-#include <pthread.h>
-#include <dirent.h>
 #include <float.h>
-#include <cmath>
+#include <math.h>
+#include <stdlib.h>
+
+#include <string>
+
 #include <glibmm/miscutils.h>
+
 #include "sord/sordmm.hpp"
+
 #include "raul/log.hpp"
-#include "ingen-config.h"
-#include "shared/World.hpp"
+
 #include "internals/Controller.hpp"
 #include "internals/Delay.hpp"
 #include "internals/Note.hpp"
 #include "internals/Trigger.hpp"
+#include "shared/World.hpp"
+
 #include "Engine.hpp"
 #include "InternalPlugin.hpp"
 #include "NodeFactory.hpp"
 #include "PatchImpl.hpp"
 #include "ThreadManager.hpp"
+
+#include "ingen-config.h"
 #ifdef HAVE_LILV
 #include "lilv/lilv.h"
 #include "LV2Plugin.hpp"
diff --git a/src/server/NodeFactory.hpp b/src/server/NodeFactory.hpp
index d81639cc..8021cbdc 100644
--- a/src/server/NodeFactory.hpp
+++ b/src/server/NodeFactory.hpp
@@ -18,15 +18,13 @@
 #ifndef INGEN_ENGINE_NODEFACTORY_HPP
 #define INGEN_ENGINE_NODEFACTORY_HPP
 
-#include <list>
 #include <map>
-#include <string>
-#include <pthread.h>
-#include <glibmm/module.h>
+
 #include "raul/SharedPtr.hpp"
 #include "raul/URI.hpp"
-#include "shared/World.hpp"
+
 #include "ingen-config.h"
+#include "shared/World.hpp"
 
 namespace Ingen {
 namespace Server {
diff --git a/src/server/OSCClientSender.hpp b/src/server/OSCClientSender.hpp
index eb052bc7..208497b1 100644
--- a/src/server/OSCClientSender.hpp
+++ b/src/server/OSCClientSender.hpp
@@ -20,8 +20,9 @@
 
 #include <cassert>
 #include <string>
+
 #include <lo/lo.h>
-#include <pthread.h>
+
 #include "ingen/ClientInterface.hpp"
 #include "ingen/GraphObject.hpp"
 #include "shared/OSCSender.hpp"