Clean up includes in core and server

17 files changed, 53 insertions, 9 deletions

diff --git a/src/server/events/Connect.cpp b/src/server/events/Connect.cpp
index 60c1ce24..234bc550 100644
--- a/src/server/events/Connect.cpp
+++ b/src/server/events/Connect.cpp
@@ -20,6 +20,7 @@
 #include "BlockImpl.hpp"
 #include "Broadcaster.hpp"
 #include "BufferFactory.hpp"
+#include "CompiledGraph.hpp"
 #include "Engine.hpp"
 #include "GraphImpl.hpp"
 #include "InputPort.hpp"
@@ -38,6 +39,7 @@
 #include <cassert>
 #include <memory>
 #include <mutex>
+#include <set>
 #include <utility>
 
 namespace ingen {
@@ -55,6 +57,8 @@ Connect::Connect(Engine&                           engine,
 {
 }
 
+Connect::~Connect() = default;
+
 bool
 Connect::pre_process(PreProcessContext& ctx)
 {
diff --git a/src/server/events/Connect.hpp b/src/server/events/Connect.hpp
index ba53b8d3..e9eadff0 100644
--- a/src/server/events/Connect.hpp
+++ b/src/server/events/Connect.hpp
@@ -17,7 +17,6 @@
 #ifndef INGEN_EVENTS_CONNECT_HPP
 #define INGEN_EVENTS_CONNECT_HPP
 
-#include "CompiledGraph.hpp"
 #include "Event.hpp"
 #include "PortImpl.hpp"
 #include "types.hpp"
@@ -35,6 +34,7 @@ class Interface;
 namespace server {
 
 class ArcImpl;
+class CompiledGraph;
 class Engine;
 class GraphImpl;
 class InputPort;
@@ -55,6 +55,8 @@ public:
 	        SampleCount                       timestamp,
 	        const ingen::Connect&             msg);
 
+	~Connect() override;
+
 	bool pre_process(PreProcessContext& ctx) override;
 	void execute(RunContext& ctx) override;
 	void post_process() override;
diff --git a/src/server/events/Copy.cpp b/src/server/events/Copy.cpp
index 37211ee8..3f7fa52e 100644
--- a/src/server/events/Copy.cpp
+++ b/src/server/events/Copy.cpp
@@ -18,6 +18,7 @@
 
 #include "BlockImpl.hpp"
 #include "Broadcaster.hpp"
+#include "CompiledGraph.hpp"
 #include "Engine.hpp"
 #include "GraphImpl.hpp"
 #include "PreProcessContext.hpp"
@@ -33,6 +34,9 @@
 #include "raul/Path.hpp"
 #include "raul/Symbol.hpp"
 
+#include <boost/optional/optional.hpp>
+
+#include <map>
 #include <memory>
 #include <mutex>
 #include <string>
@@ -53,6 +57,8 @@ Copy::Copy(Engine&                           engine,
     , _block(nullptr)
 {}
 
+Copy::~Copy() = default;
+
 bool
 Copy::pre_process(PreProcessContext& ctx)
 {
diff --git a/src/server/events/Copy.hpp b/src/server/events/Copy.hpp
index 5cff71c3..b133a6d6 100644
--- a/src/server/events/Copy.hpp
+++ b/src/server/events/Copy.hpp
@@ -17,7 +17,6 @@
 #ifndef INGEN_EVENTS_COPY_HPP
 #define INGEN_EVENTS_COPY_HPP
 
-#include "CompiledGraph.hpp"
 #include "Event.hpp"
 #include "types.hpp"
 
@@ -33,6 +32,7 @@ class Interface;
 namespace server {
 
 class BlockImpl;
+class CompiledGraph;
 class Engine;
 class GraphImpl;
 class PreProcessContext;
@@ -51,6 +51,8 @@ public:
 	     SampleCount                       timestamp,
 	     const ingen::Copy&                msg);
 
+	~Copy() override;
+
 	bool pre_process(PreProcessContext& ctx) override;
 	void execute(RunContext& ctx) override;
 	void post_process() override;
diff --git a/src/server/events/CreateBlock.cpp b/src/server/events/CreateBlock.cpp
index 4dc64bdc..4c675f2f 100644
--- a/src/server/events/CreateBlock.cpp
+++ b/src/server/events/CreateBlock.cpp
@@ -19,11 +19,13 @@
 #include "BlockFactory.hpp"
 #include "BlockImpl.hpp"
 #include "Broadcaster.hpp"
+#include "CompiledGraph.hpp"
 #include "Engine.hpp"
 #include "GraphImpl.hpp"
 #include "LV2Block.hpp"
 #include "PluginImpl.hpp"
 #include "PreProcessContext.hpp"
+#include "State.hpp"
 #include "types.hpp"
 
 #include "ingen/FilePath.hpp"
@@ -38,11 +40,11 @@
 #include "ingen/URIs.hpp"
 #include "ingen/World.hpp"
 #include "ingen/paths.hpp"
-#include "lilv/lilv.h"
 #include "raul/Maid.hpp"
 #include "raul/Path.hpp"
 #include "raul/Symbol.hpp"
 
+#include <map>
 #include <memory>
 #include <utility>
 
@@ -66,6 +68,8 @@ CreateBlock::CreateBlock(Engine&                           engine,
     , _block(nullptr)
 {}
 
+CreateBlock::~CreateBlock() = default;
+
 bool
 CreateBlock::pre_process(PreProcessContext& ctx)
 {
diff --git a/src/server/events/CreateBlock.hpp b/src/server/events/CreateBlock.hpp
index 872e4612..3da589c7 100644
--- a/src/server/events/CreateBlock.hpp
+++ b/src/server/events/CreateBlock.hpp
@@ -18,7 +18,6 @@
 #define INGEN_EVENTS_CREATEBLOCK_HPP
 
 #include "ClientUpdate.hpp"
-#include "CompiledGraph.hpp"
 #include "Event.hpp"
 #include "types.hpp"
 
@@ -36,6 +35,7 @@ class Properties;
 namespace server {
 
 class BlockImpl;
+class CompiledGraph;
 class Engine;
 class GraphImpl;
 class PreProcessContext;
@@ -57,6 +57,8 @@ public:
 	            const Raul::Path&                 path,
 	            Properties&                       properties);
 
+	~CreateBlock() override;
+
 	bool pre_process(PreProcessContext& ctx) override;
 	void execute(RunContext& ctx) override;
 	void post_process() override;
diff --git a/src/server/events/CreateGraph.cpp b/src/server/events/CreateGraph.cpp
index db90c433..e5dbb55b 100644
--- a/src/server/events/CreateGraph.cpp
+++ b/src/server/events/CreateGraph.cpp
@@ -18,6 +18,7 @@
 
 #include "BlockImpl.hpp"
 #include "Broadcaster.hpp"
+#include "CompiledGraph.hpp"
 #include "Engine.hpp"
 #include "GraphImpl.hpp"
 #include "PreProcessContext.hpp"
@@ -39,6 +40,9 @@
 #include "raul/Path.hpp"
 #include "raul/Symbol.hpp"
 
+#include <boost/intrusive/slist.hpp>
+
+#include <map>
 #include <memory>
 #include <utility>
 
@@ -59,6 +63,8 @@ CreateGraph::CreateGraph(Engine&                           engine,
     , _parent(nullptr)
 {}
 
+CreateGraph::~CreateGraph() = default;
+
 void
 CreateGraph::build_child_events()
 {
diff --git a/src/server/events/CreateGraph.hpp b/src/server/events/CreateGraph.hpp
index 2523e4b8..6c49feda 100644
--- a/src/server/events/CreateGraph.hpp
+++ b/src/server/events/CreateGraph.hpp
@@ -18,7 +18,6 @@
 #define INGEN_EVENTS_CREATEGRAPH_HPP
 
 #include "ClientUpdate.hpp"
-#include "CompiledGraph.hpp"
 #include "Event.hpp"
 #include "types.hpp"
 
@@ -36,6 +35,7 @@ class Interface;
 
 namespace server {
 
+class CompiledGraph;
 class Engine;
 class GraphImpl;
 class PreProcessContext;
@@ -57,6 +57,8 @@ public:
 	            const Raul::Path&                 path,
 	            const Properties&                 properties);
 
+	~CreateGraph() override;
+
 	bool pre_process(PreProcessContext& ctx) override;
 	void execute(RunContext& ctx) override;
 	void post_process() override;
diff --git a/src/server/events/CreatePort.cpp b/src/server/events/CreatePort.cpp
index 7c3b08f3..2b0c00a5 100644
--- a/src/server/events/CreatePort.cpp
+++ b/src/server/events/CreatePort.cpp
@@ -41,6 +41,7 @@
 #include "raul/Symbol.hpp"
 
 #include <cassert>
+#include <map>
 #include <memory>
 #include <utility>
 
diff --git a/src/server/events/Delta.cpp b/src/server/events/Delta.cpp
index 911ace66..e441f2fe 100644
--- a/src/server/events/Delta.cpp
+++ b/src/server/events/Delta.cpp
@@ -19,6 +19,7 @@
 #include "BlockFactory.hpp"
 #include "BlockImpl.hpp"
 #include "Broadcaster.hpp"
+#include "CompiledGraph.hpp"
 #include "ControlBindings.hpp"
 #include "CreateBlock.hpp"
 #include "CreateGraph.hpp"
@@ -44,9 +45,12 @@
 #include "ingen/World.hpp"
 #include "ingen/memory.hpp"
 #include "ingen/paths.hpp"
+#include "lilv/lilv.h"
 #include "raul/Maid.hpp"
 #include "raul/Path.hpp"
 
+#include <algorithm>
+#include <map>
 #include <memory>
 #include <mutex>
 #include <set>
diff --git a/src/server/events/Delta.hpp b/src/server/events/Delta.hpp
index fc4716f2..f28832a2 100644
--- a/src/server/events/Delta.hpp
+++ b/src/server/events/Delta.hpp
@@ -17,17 +17,15 @@
 #ifndef INGEN_EVENTS_DELTA_HPP
 #define INGEN_EVENTS_DELTA_HPP
 
-#include "BlockImpl.hpp"
 #include "ClientUpdate.hpp"
-#include "CompiledGraph.hpp"
 #include "ControlBindings.hpp"
 #include "Event.hpp"
+#include "State.hpp"
 #include "types.hpp"
 
 #include "ingen/Properties.hpp"
 #include "ingen/Resource.hpp"
 #include "ingen/URI.hpp"
-#include "lilv/lilv.h"
 #include "raul/Maid.hpp"
 
 #include <boost/optional/optional.hpp>
@@ -45,6 +43,7 @@ struct SetProperty;
 
 namespace server {
 
+class CompiledGraph;
 class Engine;
 class GraphImpl;
 class PreProcessContext;
diff --git a/src/server/events/Disconnect.cpp b/src/server/events/Disconnect.cpp
index 57a20628..93e271af 100644
--- a/src/server/events/Disconnect.cpp
+++ b/src/server/events/Disconnect.cpp
@@ -21,6 +21,7 @@
 #include "Buffer.hpp"
 #include "BufferFactory.hpp"
 #include "BufferRef.hpp"
+#include "CompiledGraph.hpp"
 #include "Engine.hpp"
 #include "GraphImpl.hpp"
 #include "InputPort.hpp"
@@ -63,6 +64,8 @@ Disconnect::Disconnect(Engine&                           engine,
 {
 }
 
+Disconnect::~Disconnect() = default;
+
 Disconnect::Impl::Impl(Engine&     e,
                        GraphImpl*  graph,
                        PortImpl*   t,
diff --git a/src/server/events/Disconnect.hpp b/src/server/events/Disconnect.hpp
index 681f1df0..7f8a1594 100644
--- a/src/server/events/Disconnect.hpp
+++ b/src/server/events/Disconnect.hpp
@@ -17,7 +17,6 @@
 #ifndef INGEN_EVENTS_DISCONNECT_HPP
 #define INGEN_EVENTS_DISCONNECT_HPP
 
-#include "CompiledGraph.hpp"
 #include "Event.hpp"
 #include "PortImpl.hpp"
 #include "types.hpp"
@@ -34,6 +33,7 @@ class Interface;
 namespace server {
 
 class ArcImpl;
+class CompiledGraph;
 class Engine;
 class GraphImpl;
 class InputPort;
@@ -54,6 +54,8 @@ public:
 	           SampleCount                       timestamp,
 	           const ingen::Disconnect&          msg);
 
+	~Disconnect() override;
+
 	bool pre_process(PreProcessContext& ctx) override;
 	void execute(RunContext& ctx) override;
 	void post_process() override;
diff --git a/src/server/events/DisconnectAll.cpp b/src/server/events/DisconnectAll.cpp
index 43836611..86a38d7b 100644
--- a/src/server/events/DisconnectAll.cpp
+++ b/src/server/events/DisconnectAll.cpp
@@ -34,6 +34,7 @@
 #include "ingen/Store.hpp"
 #include "raul/Maid.hpp"
 
+#include <map>
 #include <memory>
 #include <mutex>
 #include <set>
diff --git a/src/server/events/Mark.cpp b/src/server/events/Mark.cpp
index 520f57e9..27ca6630 100644
--- a/src/server/events/Mark.cpp
+++ b/src/server/events/Mark.cpp
@@ -27,6 +27,7 @@
 
 #include <cassert>
 #include <memory>
+#include <unordered_set>
 #include <utility>
 
 namespace ingen {
@@ -51,6 +52,8 @@ Mark::Mark(Engine&                           engine,
 	, _depth(-1)
 {}
 
+Mark::~Mark() = default;
+
 void
 Mark::mark(PreProcessContext&)
 {
diff --git a/src/server/events/Mark.hpp b/src/server/events/Mark.hpp
index ffbf9062..e651b1e7 100644
--- a/src/server/events/Mark.hpp
+++ b/src/server/events/Mark.hpp
@@ -61,6 +61,8 @@ public:
 	     SampleCount                       timestamp,
 	     const ingen::BundleEnd&           msg);
 
+	~Mark() override;
+
 	void mark(PreProcessContext& ctx) override;
 	bool pre_process(PreProcessContext& ctx) override;
 	void execute(RunContext& ctx) override;
diff --git a/src/server/events/Move.cpp b/src/server/events/Move.cpp
index b79dde2a..d85451c8 100644
--- a/src/server/events/Move.cpp
+++ b/src/server/events/Move.cpp
@@ -24,6 +24,7 @@
 #include "ingen/Store.hpp"
 #include "raul/Path.hpp"
 
+#include <map>
 #include <memory>
 #include <mutex>