11 files changed, 8 insertions, 6 deletions
diff --git a/src/server/BlockImpl.cpp b/src/server/BlockImpl.cpp
index d4285832..cae6b252 100644
--- a/src/server/BlockImpl.cpp
+++ b/src/server/BlockImpl.cpp
@@ -25,7 +25,6 @@
 
 #include "lv2/urid/urid.h"
 #include "raul/Array.hpp"
-#include "raul/Maid.hpp"
 #include "raul/Symbol.hpp"
 
 #include <cassert>
diff --git a/src/server/ClientUpdate.cpp b/src/server/ClientUpdate.cpp
index c69f5b49..167cd294 100644
--- a/src/server/ClientUpdate.cpp
+++ b/src/server/ClientUpdate.cpp
@@ -27,6 +27,7 @@
 #include "ingen/Forge.hpp"
 #include "ingen/Interface.hpp"
 #include "ingen/URIs.hpp"
+#include "raul/Path.hpp"
 
 #include <boost/intrusive/slist.hpp>
 
diff --git a/src/server/NodeImpl.cpp b/src/server/NodeImpl.cpp
index c76c66d4..f771d953 100644
--- a/src/server/NodeImpl.cpp
+++ b/src/server/NodeImpl.cpp
@@ -27,6 +27,10 @@
 #include <map>
 #include <utility>
 
+namespace raul {
+class Symbol;
+}
+
 namespace ingen::server {
 
 NodeImpl::NodeImpl(const ingen::URIs&  uris,
diff --git a/src/server/SocketListener.cpp b/src/server/SocketListener.cpp
index 075d78cc..a3139660 100644
--- a/src/server/SocketListener.cpp
+++ b/src/server/SocketListener.cpp
@@ -28,6 +28,7 @@
 
 #include <poll.h>
 #include <sys/stat.h>
+#include <sys/types.h>
 #include <unistd.h>
 
 #include <cerrno>
diff --git a/src/server/Task.hpp b/src/server/Task.hpp
index 30941f28..c665c16f 100644
--- a/src/server/Task.hpp
+++ b/src/server/Task.hpp
@@ -17,7 +17,6 @@
 #ifndef INGEN_ENGINE_TASK_HPP
 #define INGEN_ENGINE_TASK_HPP
 
-#include <algorithm>
 #include <atomic>
 #include <cassert>
 #include <deque>
diff --git a/src/server/UndoStack.hpp b/src/server/UndoStack.hpp
index 8195920a..8954f05d 100644
--- a/src/server/UndoStack.hpp
+++ b/src/server/UndoStack.hpp
@@ -24,7 +24,6 @@
 #include "server.h"
 #include "sratom/sratom.h"
 
-#include <algorithm>
 #include <cstdint>
 #include <cstdio>
 #include <cstdlib>
diff --git a/src/server/events/CreateBlock.cpp b/src/server/events/CreateBlock.cpp
index 0ad050f2..7f50411c 100644
--- a/src/server/events/CreateBlock.cpp
+++ b/src/server/events/CreateBlock.cpp
@@ -40,7 +40,6 @@
 #include "ingen/URIs.hpp"
 #include "ingen/World.hpp"
 #include "ingen/paths.hpp"
-#include "lilv/lilv.h"
 #include "raul/Path.hpp"
 #include "raul/Symbol.hpp"
 
diff --git a/src/server/events/Delete.cpp b/src/server/events/Delete.cpp
index bcebe2ba..b42f0652 100644
--- a/src/server/events/Delete.cpp
+++ b/src/server/events/Delete.cpp
@@ -40,7 +40,6 @@
 #include "ingen/World.hpp"
 #include "ingen/paths.hpp"
 #include "raul/Array.hpp"
-#include "raul/Maid.hpp"
 #include "raul/Path.hpp"
 
 #include <cassert>
diff --git a/src/server/events/Delta.cpp b/src/server/events/Delta.cpp
index 11a0b0ff..3f9e3b9d 100644
--- a/src/server/events/Delta.cpp
+++ b/src/server/events/Delta.cpp
@@ -47,7 +47,6 @@
 #include "lilv/lilv.h"
 #include "raul/Path.hpp"
 
-#include <algorithm>
 #include <memory>
 #include <mutex>
 #include <set>
diff --git a/src/server/events/DisconnectAll.cpp b/src/server/events/DisconnectAll.cpp
index 87df61a5..e429e0e6 100644
--- a/src/server/events/DisconnectAll.cpp
+++ b/src/server/events/DisconnectAll.cpp
@@ -32,6 +32,7 @@
 #include "ingen/Node.hpp"
 #include "ingen/Status.hpp"
 #include "ingen/Store.hpp"
+#include "raul/Path.hpp"
 
 #include <memory>
 #include <mutex>
diff --git a/src/server/events/Get.cpp b/src/server/events/Get.cpp
index 385e55f3..ab369c80 100644
--- a/src/server/events/Get.cpp
+++ b/src/server/events/Get.cpp
@@ -36,6 +36,7 @@
 #include <cstdint>
 #include <memory>
 #include <mutex>
+#include <utility>
 
 namespace ingen::server::events {