7 files changed, 7 insertions, 22 deletions
diff --git a/src/server/events/Connect.cpp b/src/server/events/Connect.cpp
index 92d89d35..d4df3e68 100644
--- a/src/server/events/Connect.cpp
+++ b/src/server/events/Connect.cpp
@@ -14,9 +14,6 @@
   along with Ingen.  If not, see <http://www.gnu.org/licenses/>.
 */
 
-#include <string>
-
-#include <boost/format.hpp>
 #include <glibmm/thread.h>
 
 #include "raul/Maid.hpp"
@@ -25,14 +22,12 @@
 #include "Broadcaster.hpp"
 #include "Connect.hpp"
 #include "EdgeImpl.hpp"
-#include "DuplexPort.hpp"
 #include "Engine.hpp"
 #include "EngineStore.hpp"
 #include "InputPort.hpp"
 #include "OutputPort.hpp"
 #include "PatchImpl.hpp"
 #include "PortImpl.hpp"
-#include "ProcessContext.hpp"
 #include "types.hpp"
 
 namespace Ingen {
diff --git a/src/server/events/Connect.hpp b/src/server/events/Connect.hpp
index a5799f77..a4bad5e8 100644
--- a/src/server/events/Connect.hpp
+++ b/src/server/events/Connect.hpp
@@ -20,9 +20,8 @@
 #include "raul/Path.hpp"
 
 #include "Event.hpp"
-#include "InputPort.hpp"
-#include "PatchImpl.hpp"
 #include "types.hpp"
+#include "BufferRef.hpp"
 
 namespace Raul {
 template <typename T> class Array;
diff --git a/src/server/events/CreateNode.cpp b/src/server/events/CreateNode.cpp
index f52e20a1..9b3cdd89 100644
--- a/src/server/events/CreateNode.cpp
+++ b/src/server/events/CreateNode.cpp
@@ -17,8 +17,6 @@
 #include "ingen/shared/URIs.hpp"
 #include "raul/Maid.hpp"
 #include "raul/Path.hpp"
-#include "raul/log.hpp"
-#include "sord/sordmm.hpp"
 
 #include "Broadcaster.hpp"
 #include "CreateNode.hpp"
diff --git a/src/server/events/CreatePatch.cpp b/src/server/events/CreatePatch.cpp
index b802d066..9d1280e1 100644
--- a/src/server/events/CreatePatch.cpp
+++ b/src/server/events/CreatePatch.cpp
@@ -23,9 +23,7 @@
 #include "Driver.hpp"
 #include "Engine.hpp"
 #include "EngineStore.hpp"
-#include "NodeImpl.hpp"
 #include "PatchImpl.hpp"
-#include "PluginImpl.hpp"
 
 namespace Ingen {
 namespace Server {
diff --git a/src/server/events/Delete.hpp b/src/server/events/Delete.hpp
index 4316763f..80051336 100644
--- a/src/server/events/Delete.hpp
+++ b/src/server/events/Delete.hpp
@@ -24,13 +24,11 @@
 
 namespace Raul {
 template<typename T> class Array;
-template<typename T> class ListNode;
 }
 
 namespace Ingen {
 namespace Server {
 
-class GraphObjectImpl;
 class NodeImpl;
 class PortImpl;
 class EnginePort;
diff --git a/src/server/events/Delta.cpp b/src/server/events/Delta.cpp
index 34e9d63d..5f6af4a4 100644
--- a/src/server/events/Delta.cpp
+++ b/src/server/events/Delta.cpp
@@ -14,17 +14,12 @@
   along with Ingen.  If not, see <http://www.gnu.org/licenses/>.
 */
 
-#include <string>
 #include <vector>
 
 #include <glibmm/thread.h>
 
-#include <boost/format.hpp>
-
-#include "raul/log.hpp"
 #include "raul/Maid.hpp"
 
-#include "ingen/shared/URIMap.hpp"
 #include "ingen/shared/URIs.hpp"
 
 #include "Broadcaster.hpp"
@@ -33,7 +28,6 @@
 #include "CreatePatch.hpp"
 #include "CreatePort.hpp"
 #include "Delta.hpp"
-#include "Driver.hpp"
 #include "Engine.hpp"
 #include "EngineStore.hpp"
 #include "GraphObjectImpl.hpp"
diff --git a/src/server/events/Delta.hpp b/src/server/events/Delta.hpp
index 935dcfac..bedba5ca 100644
--- a/src/server/events/Delta.hpp
+++ b/src/server/events/Delta.hpp
@@ -23,14 +23,17 @@
 
 #include "ControlBindings.hpp"
 #include "Event.hpp"
-#include "ingen/shared/ResourceImpl.hpp"
 
 namespace Ingen {
+
+namespace Shared { class ResourceImpl; }
+
 namespace Server {
 
-class GraphObjectImpl;
-class PatchImpl;
 class CompiledPatch;
+class Engine;
+class PatchImpl;
+class ProcessContext;
 
 namespace Events {