Clean up includes and forward declarations

27 files changed, 180 insertions, 138 deletions

diff --git a/src/server/events/Connect.cpp b/src/server/events/Connect.cpp
index 99a90a49..1ce8f5a1 100644
--- a/src/server/events/Connect.cpp
+++ b/src/server/events/Connect.cpp
@@ -14,14 +14,11 @@
   along with Ingen.  If not, see <http://www.gnu.org/licenses/>.
 */
 
-#include "ingen/Store.hpp"
-#include "raul/Maid.hpp"
-#include "raul/Path.hpp"
+#include "Connect.hpp"
 
 #include "ArcImpl.hpp"
 #include "Broadcaster.hpp"
 #include "BufferFactory.hpp"
-#include "Connect.hpp"
 #include "Engine.hpp"
 #include "GraphImpl.hpp"
 #include "InputPort.hpp"
@@ -30,6 +27,13 @@
 #include "internals/BlockDelay.hpp"
 #include "types.hpp"
 
+#include "ingen/Store.hpp"
+#include "raul/Maid.hpp"
+
+#include <cassert>
+#include <mutex>
+#include <utility>
+
 namespace ingen {
 namespace server {
 namespace events {
diff --git a/src/server/events/Connect.hpp b/src/server/events/Connect.hpp
index 16ea8bc9..625fa39d 100644
--- a/src/server/events/Connect.hpp
+++ b/src/server/events/Connect.hpp
@@ -17,17 +17,11 @@
 #ifndef INGEN_EVENTS_CONNECT_HPP
 #define INGEN_EVENTS_CONNECT_HPP
 
-#include "raul/Path.hpp"
-
 #include "CompiledGraph.hpp"
 #include "Event.hpp"
 #include "PortImpl.hpp"
 #include "types.hpp"
 
-namespace Raul {
-template <typename T> class Array;
-}
-
 namespace ingen {
 namespace server {
 
diff --git a/src/server/events/Copy.cpp b/src/server/events/Copy.cpp
index 8c23568b..9fa3deed 100644
--- a/src/server/events/Copy.cpp
+++ b/src/server/events/Copy.cpp
@@ -14,18 +14,23 @@
   along with Ingen.  If not, see <http://www.gnu.org/licenses/>.
 */
 
-#include "ingen/Parser.hpp"
-#include "ingen/Serialiser.hpp"
-#include "ingen/Store.hpp"
-#include "raul/Path.hpp"
+#include "events/Copy.hpp"
 
 #include "BlockImpl.hpp"
 #include "Broadcaster.hpp"
 #include "Engine.hpp"
-#include "EnginePort.hpp"
 #include "GraphImpl.hpp"
 #include "PreProcessContext.hpp"
-#include "events/Copy.hpp"
+
+#include "ingen/Parser.hpp"
+#include "ingen/Serialiser.hpp"
+#include "ingen/Store.hpp"
+#include "ingen/World.hpp"
+#include "raul/Path.hpp"
+
+#include <mutex>
+#include <string>
+#include <utility>
 
 namespace ingen {
 namespace server {
diff --git a/src/server/events/Copy.hpp b/src/server/events/Copy.hpp
index f31fe4d4..86a95e9c 100644
--- a/src/server/events/Copy.hpp
+++ b/src/server/events/Copy.hpp
@@ -17,11 +17,6 @@
 #ifndef INGEN_EVENTS_COPY_HPP
 #define INGEN_EVENTS_COPY_HPP
 
-#include <list>
-
-#include "ingen/Store.hpp"
-#include "raul/Path.hpp"
-
 #include "CompiledGraph.hpp"
 #include "Event.hpp"
 
@@ -29,6 +24,7 @@ namespace ingen {
 namespace server {
 
 class BlockImpl;
+class Engine;
 class GraphImpl;
 
 namespace events {
diff --git a/src/server/events/CreateBlock.cpp b/src/server/events/CreateBlock.cpp
index c193a8b5..e1991b5f 100644
--- a/src/server/events/CreateBlock.cpp
+++ b/src/server/events/CreateBlock.cpp
@@ -14,23 +14,26 @@
   along with Ingen.  If not, see <http://www.gnu.org/licenses/>.
 */
 
-#include "ingen/Forge.hpp"
-#include "ingen/Store.hpp"
-#include "ingen/URIs.hpp"
-#include "raul/Maid.hpp"
-#include "raul/Path.hpp"
+#include "CreateBlock.hpp"
 
 #include "BlockFactory.hpp"
 #include "BlockImpl.hpp"
 #include "Broadcaster.hpp"
-#include "CreateBlock.hpp"
 #include "Engine.hpp"
 #include "GraphImpl.hpp"
 #include "PluginImpl.hpp"
-#include "PortImpl.hpp"
 #include "PreProcessContext.hpp"
 #include "LV2Block.hpp"
 
+#include "ingen/Forge.hpp"
+#include "ingen/Store.hpp"
+#include "ingen/URIs.hpp"
+#include "ingen/World.hpp"
+#include "raul/Maid.hpp"
+#include "raul/Path.hpp"
+
+#include <utility>
+
 namespace ingen {
 namespace server {
 namespace events {
diff --git a/src/server/events/CreateBlock.hpp b/src/server/events/CreateBlock.hpp
index 02bfeda7..bf34f6e2 100644
--- a/src/server/events/CreateBlock.hpp
+++ b/src/server/events/CreateBlock.hpp
@@ -17,12 +17,12 @@
 #ifndef INGEN_EVENTS_CREATEBLOCK_HPP
 #define INGEN_EVENTS_CREATEBLOCK_HPP
 
-#include "ingen/Resource.hpp"
-
 #include "ClientUpdate.hpp"
 #include "CompiledGraph.hpp"
 #include "Event.hpp"
 
+#include <cstdint>
+
 namespace ingen {
 namespace server {
 
diff --git a/src/server/events/CreateGraph.cpp b/src/server/events/CreateGraph.cpp
index 5bb66a46..e2dffc61 100644
--- a/src/server/events/CreateGraph.cpp
+++ b/src/server/events/CreateGraph.cpp
@@ -14,19 +14,23 @@
   along with Ingen.  If not, see <http://www.gnu.org/licenses/>.
 */
 
-#include "ingen/Forge.hpp"
-#include "ingen/Store.hpp"
-#include "ingen/URIs.hpp"
-#include "raul/Maid.hpp"
-#include "raul/Path.hpp"
+#include "events/CreateGraph.hpp"
 
 #include "Broadcaster.hpp"
 #include "Engine.hpp"
 #include "GraphImpl.hpp"
 #include "PreProcessContext.hpp"
-#include "events/CreateGraph.hpp"
 #include "events/CreatePort.hpp"
 
+#include "ingen/Forge.hpp"
+#include "ingen/Store.hpp"
+#include "ingen/URIs.hpp"
+#include "ingen/World.hpp"
+#include "raul/Maid.hpp"
+#include "raul/Path.hpp"
+
+#include <utility>
+
 namespace ingen {
 namespace server {
 namespace events {
diff --git a/src/server/events/CreateGraph.hpp b/src/server/events/CreateGraph.hpp
index 565a3278..6ea07957 100644
--- a/src/server/events/CreateGraph.hpp
+++ b/src/server/events/CreateGraph.hpp
@@ -17,14 +17,14 @@
 #ifndef INGEN_EVENTS_CREATEGRAPH_HPP
 #define INGEN_EVENTS_CREATEGRAPH_HPP
 
-#include <list>
+#include "ClientUpdate.hpp"
+#include "CompiledGraph.hpp"
+#include "Event.hpp"
 
-#include "ingen/Resource.hpp"
 #include "ingen/types.hpp"
 
-#include "CompiledGraph.hpp"
-#include "Event.hpp"
-#include "events/Get.hpp"
+#include <cstdint>
+#include <list>
 
 namespace ingen {
 namespace server {
diff --git a/src/server/events/CreatePort.cpp b/src/server/events/CreatePort.cpp
index c27a8ac6..f463eb4f 100644
--- a/src/server/events/CreatePort.cpp
+++ b/src/server/events/CreatePort.cpp
@@ -14,24 +14,28 @@
   along with Ingen.  If not, see <http://www.gnu.org/licenses/>.
 */
 
-#include <utility>
-
-#include "ingen/Atom.hpp"
-#include "ingen/Store.hpp"
-#include "ingen/URIMap.hpp"
-#include "ingen/URIs.hpp"
-#include "raul/Array.hpp"
-#include "raul/Path.hpp"
+#include "CreatePort.hpp"
 
 #include "Broadcaster.hpp"
 #include "BufferFactory.hpp"
-#include "CreatePort.hpp"
 #include "Driver.hpp"
 #include "DuplexPort.hpp"
 #include "Engine.hpp"
 #include "GraphImpl.hpp"
 #include "PortImpl.hpp"
 
+#include "ingen/Atom.hpp"
+#include "ingen/Forge.hpp"
+#include "ingen/Store.hpp"
+#include "ingen/URIMap.hpp"
+#include "ingen/URIs.hpp"
+#include "ingen/World.hpp"
+#include "raul/Array.hpp"
+#include "raul/Path.hpp"
+
+#include <cassert>
+#include <utility>
+
 namespace ingen {
 namespace server {
 namespace events {
diff --git a/src/server/events/CreatePort.hpp b/src/server/events/CreatePort.hpp
index 6c760d29..9c5bb396 100644
--- a/src/server/events/CreatePort.hpp
+++ b/src/server/events/CreatePort.hpp
@@ -17,16 +17,16 @@
 #ifndef INGEN_EVENTS_CREATEPORT_HPP
 #define INGEN_EVENTS_CREATEPORT_HPP
 
-#include <boost/optional.hpp>
+#include "BlockImpl.hpp"
+#include "Event.hpp"
+#include "PortType.hpp"
 
-#include "ingen/Resource.hpp"
 #include "lv2/urid/urid.h"
-#include "raul/Array.hpp"
 #include "raul/Path.hpp"
 
-#include "BlockImpl.hpp"
-#include "Event.hpp"
-#include "PortType.hpp"
+#include <boost/optional/optional.hpp>
+
+#include <cstdint>
 
 namespace ingen {
 namespace server {
@@ -34,7 +34,6 @@ namespace server {
 class DuplexPort;
 class EnginePort;
 class GraphImpl;
-class PortImpl;
 
 namespace events {
 
diff --git a/src/server/events/Delete.cpp b/src/server/events/Delete.cpp
index f6168c9c..0b46f3f4 100644
--- a/src/server/events/Delete.cpp
+++ b/src/server/events/Delete.cpp
@@ -14,23 +14,31 @@
   along with Ingen.  If not, see <http://www.gnu.org/licenses/>.
 */
 
-#include "ingen/Store.hpp"
-#include "raul/Maid.hpp"
-#include "raul/Path.hpp"
+#include "Delete.hpp"
 
 #include "BlockImpl.hpp"
 #include "Broadcaster.hpp"
+#include "BufferFactory.hpp"
 #include "ControlBindings.hpp"
-#include "Delete.hpp"
 #include "DisconnectAll.hpp"
 #include "Driver.hpp"
 #include "Engine.hpp"
 #include "EnginePort.hpp"
 #include "GraphImpl.hpp"
-#include "PluginImpl.hpp"
 #include "PortImpl.hpp"
 #include "PreProcessContext.hpp"
 
+#include "ingen/Forge.hpp"
+#include "ingen/Store.hpp"
+#include "ingen/World.hpp"
+#include "raul/Maid.hpp"
+#include "raul/Path.hpp"
+
+#include <cassert>
+#include <cstddef>
+#include <mutex>
+#include <string>
+
 namespace ingen {
 namespace server {
 namespace events {
diff --git a/src/server/events/Delete.hpp b/src/server/events/Delete.hpp
index 4925a856..14acac83 100644
--- a/src/server/events/Delete.hpp
+++ b/src/server/events/Delete.hpp
@@ -17,27 +17,23 @@
 #ifndef INGEN_EVENTS_DELETE_HPP
 #define INGEN_EVENTS_DELETE_HPP
 
-#include <map>
-#include <vector>
-
-#include "ingen/Store.hpp"
-
-#include "CompiledGraph.hpp"
 #include "ControlBindings.hpp"
 #include "Event.hpp"
 #include "GraphImpl.hpp"
 
-namespace Raul {
-template<typename T> class Array;
-}
+#include "ingen/Store.hpp"
+
+#include <cstdint>
+#include <map>
+#include <utility>
+#include <vector>
 
 namespace ingen {
 namespace server {
 
-class BlockImpl;
+class CompiledGraph;
 class DuplexPort;
 class EnginePort;
-class PortImpl;
 
 namespace events {
 
diff --git a/src/server/events/Delta.cpp b/src/server/events/Delta.cpp
index 982b1141..f5928c12 100644
--- a/src/server/events/Delta.cpp
+++ b/src/server/events/Delta.cpp
@@ -14,30 +14,38 @@
   along with Ingen.  If not, see <http://www.gnu.org/licenses/>.
 */
 
-#include <vector>
-#include <thread>
-
-#include "ingen/Log.hpp"
-#include "ingen/Store.hpp"
-#include "ingen/URIs.hpp"
-#include "raul/Maid.hpp"
+#include "Delta.hpp"
 
 #include "Broadcaster.hpp"
 #include "ControlBindings.hpp"
 #include "CreateBlock.hpp"
 #include "CreateGraph.hpp"
 #include "CreatePort.hpp"
-#include "Delta.hpp"
 #include "Engine.hpp"
 #include "GraphImpl.hpp"
 #include "PluginImpl.hpp"
 #include "PortImpl.hpp"
 #include "PortType.hpp"
 #include "SetPortValue.hpp"
-#include "events/Get.hpp"
+
+#include "ingen/Forge.hpp"
+#include "ingen/Log.hpp"
+#include "ingen/Store.hpp"
+#include "ingen/URIs.hpp"
+#include "ingen/World.hpp"
+#include "raul/Maid.hpp"
+
+#include <mutex>
+#include <set>
+#include <string>
+#include <utility>
+#include <vector>
 
 namespace ingen {
 namespace server {
+
+class PreProcessContext;
+
 namespace events {
 
 Delta::Delta(Engine&           engine,
diff --git a/src/server/events/Delta.hpp b/src/server/events/Delta.hpp
index 0fda067a..dcc265f8 100644
--- a/src/server/events/Delta.hpp
+++ b/src/server/events/Delta.hpp
@@ -17,23 +17,22 @@
 #ifndef INGEN_EVENTS_DELTA_HPP
 #define INGEN_EVENTS_DELTA_HPP
 
-#include <vector>
-
-#include <boost/optional.hpp>
-
-#include "lilv/lilv.h"
-
-#include "CompiledGraph.hpp"
+#include "ClientUpdate.hpp"
 #include "ControlBindings.hpp"
 #include "Event.hpp"
-#include "PluginImpl.hpp"
 
-namespace ingen {
+#include "lilv/lilv.h"
 
-class Resource;
+#include <boost/optional/optional.hpp>
 
+#include <algorithm>
+#include <cstdint>
+#include <vector>
+
+namespace ingen {
 namespace server {
 
+class CompiledGraph;
 class Engine;
 class GraphImpl;
 class RunContext;
diff --git a/src/server/events/Disconnect.cpp b/src/server/events/Disconnect.cpp
index 3abf23e4..349fb6ae 100644
--- a/src/server/events/Disconnect.cpp
+++ b/src/server/events/Disconnect.cpp
@@ -14,11 +14,7 @@
   along with Ingen.  If not, see <http://www.gnu.org/licenses/>.
 */
 
-#include <set>
-
-#include "ingen/Store.hpp"
-#include "raul/Maid.hpp"
-#include "raul/Path.hpp"
+#include "events/Disconnect.hpp"
 
 #include "ArcImpl.hpp"
 #include "Broadcaster.hpp"
@@ -31,7 +27,17 @@
 #include "PreProcessContext.hpp"
 #include "RunContext.hpp"
 #include "ThreadManager.hpp"
-#include "events/Disconnect.hpp"
+
+#include "ingen/Store.hpp"
+#include "raul/Maid.hpp"
+#include "raul/Path.hpp"
+
+#include <cassert>
+#include <cstdint>
+#include <mutex>
+#include <set>
+#include <string>
+#include <utility>
 
 namespace ingen {
 namespace server {
diff --git a/src/server/events/Disconnect.hpp b/src/server/events/Disconnect.hpp
index 566a7721..15872ba5 100644
--- a/src/server/events/Disconnect.hpp
+++ b/src/server/events/Disconnect.hpp
@@ -17,23 +17,16 @@
 #ifndef INGEN_EVENTS_DISCONNECT_HPP
 #define INGEN_EVENTS_DISCONNECT_HPP
 
-#include "raul/Path.hpp"
-
-#include "BufferFactory.hpp"
 #include "CompiledGraph.hpp"
 #include "Event.hpp"
-#include "GraphImpl.hpp"
+#include "PortImpl.hpp"
 #include "types.hpp"
 
-namespace Raul {
-template <typename T> class Array;
-}
-
 namespace ingen {
 namespace server {
 
+class ArcImpl;
 class InputPort;
-class PortImpl;
 
 namespace events {
 
diff --git a/src/server/events/DisconnectAll.cpp b/src/server/events/DisconnectAll.cpp
index e21fad4d..9c949480 100644
--- a/src/server/events/DisconnectAll.cpp
+++ b/src/server/events/DisconnectAll.cpp
@@ -14,12 +14,7 @@
   along with Ingen.  If not, see <http://www.gnu.org/licenses/>.
 */
 
-#include <set>
-
-#include "ingen/Store.hpp"
-#include "raul/Array.hpp"
-#include "raul/Maid.hpp"
-#include "raul/Path.hpp"
+#include "events/DisconnectAll.hpp"
 
 #include "ArcImpl.hpp"
 #include "BlockImpl.hpp"
@@ -30,9 +25,17 @@
 #include "PortImpl.hpp"
 #include "PreProcessContext.hpp"
 #include "events/Disconnect.hpp"
-#include "events/DisconnectAll.hpp"
 #include "util.hpp"
 
+#include "ingen/Store.hpp"
+#include "raul/Array.hpp"
+#include "raul/Maid.hpp"
+#include "raul/Path.hpp"
+
+#include <mutex>
+#include <set>
+#include <utility>
+
 namespace ingen {
 namespace server {
 namespace events {
diff --git a/src/server/events/DisconnectAll.hpp b/src/server/events/DisconnectAll.hpp
index aca5fbce..8aa63d2b 100644
--- a/src/server/events/DisconnectAll.hpp
+++ b/src/server/events/DisconnectAll.hpp
@@ -17,14 +17,14 @@
 #ifndef INGEN_EVENTS_DISCONNECTALL_HPP
 #define INGEN_EVENTS_DISCONNECTALL_HPP
 
-#include <list>
-
-#include "raul/Path.hpp"
-
 #include "CompiledGraph.hpp"
 #include "Disconnect.hpp"
 #include "Event.hpp"
 
+#include "raul/Path.hpp"
+
+#include <list>
+
 namespace ingen {
 namespace server {
 
diff --git a/src/server/events/Get.cpp b/src/server/events/Get.cpp
index 6074ea27..167f5f91 100644
--- a/src/server/events/Get.cpp
+++ b/src/server/events/Get.cpp
@@ -14,21 +14,25 @@
   along with Ingen.  If not, see <http://www.gnu.org/licenses/>.
 */
 
-#include <utility>
-
-#include "ingen/Interface.hpp"
-#include "ingen/Node.hpp"
-#include "ingen/Store.hpp"
+#include "Get.hpp"
 
 #include "BlockImpl.hpp"
 #include "Broadcaster.hpp"
 #include "BufferFactory.hpp"
 #include "Engine.hpp"
-#include "Get.hpp"
 #include "GraphImpl.hpp"
 #include "PluginImpl.hpp"
 #include "PortImpl.hpp"
 
+#include "ingen/Forge.hpp"
+#include "ingen/Interface.hpp"
+#include "ingen/Node.hpp"
+#include "ingen/Store.hpp"
+#include "ingen/World.hpp"
+
+#include <cstdint>
+#include <mutex>
+
 namespace ingen {
 namespace server {
 namespace events {
diff --git a/src/server/events/Get.hpp b/src/server/events/Get.hpp
index 9598010c..b23c7294 100644
--- a/src/server/events/Get.hpp
+++ b/src/server/events/Get.hpp
@@ -17,8 +17,6 @@
 #ifndef INGEN_EVENTS_GET_HPP
 #define INGEN_EVENTS_GET_HPP
 
-#include <vector>
-
 #include "BlockFactory.hpp"
 #include "ClientUpdate.hpp"
 #include "Event.hpp"
diff --git a/src/server/events/Mark.cpp b/src/server/events/Mark.cpp
index be943533..4f9b1261 100644
--- a/src/server/events/Mark.cpp
+++ b/src/server/events/Mark.cpp
@@ -14,10 +14,13 @@
   along with Ingen.  If not, see <http://www.gnu.org/licenses/>.
 */
 
+#include "events/Mark.hpp"
+
 #include "Engine.hpp"
 #include "PreProcessContext.hpp"
 #include "UndoStack.hpp"
-#include "events/Mark.hpp"
+
+#include <utility>
 
 namespace ingen {
 namespace server {
diff --git a/src/server/events/Mark.hpp b/src/server/events/Mark.hpp
index 076b67dd..33aedcd6 100644
--- a/src/server/events/Mark.hpp
+++ b/src/server/events/Mark.hpp
@@ -19,10 +19,14 @@
 
 #include "Event.hpp"
 
+#include <map>
+
 namespace ingen {
 namespace server {
 
+class CompiledGraph;
 class Engine;
+class GraphImpl;
 
 namespace events {
 
diff --git a/src/server/events/Move.cpp b/src/server/events/Move.cpp
index 1890dc5f..c7478898 100644
--- a/src/server/events/Move.cpp
+++ b/src/server/events/Move.cpp
@@ -25,6 +25,8 @@
 #include "GraphImpl.hpp"
 #include "events/Move.hpp"
 
+#include <mutex>
+
 namespace ingen {
 namespace server {
 namespace events {
diff --git a/src/server/events/Move.hpp b/src/server/events/Move.hpp
index 510fcfce..327b31b9 100644
--- a/src/server/events/Move.hpp
+++ b/src/server/events/Move.hpp
@@ -17,11 +17,11 @@
 #ifndef INGEN_EVENTS_MOVE_HPP
 #define INGEN_EVENTS_MOVE_HPP
 
+#include "Event.hpp"
+
 #include "ingen/Store.hpp"
 #include "raul/Path.hpp"
 
-#include "Event.hpp"
-
 namespace ingen {
 namespace server {
 
diff --git a/src/server/events/SetPortValue.cpp b/src/server/events/SetPortValue.cpp
index 4c879682..9193f876 100644
--- a/src/server/events/SetPortValue.cpp
+++ b/src/server/events/SetPortValue.cpp
@@ -14,10 +14,7 @@
   along with Ingen.  If not, see <http://www.gnu.org/licenses/>.
 */
 
-#include "ingen/LV2Features.hpp"
-#include "ingen/Store.hpp"
-#include "ingen/URIs.hpp"
-#include "ingen/World.hpp"
+#include "SetPortValue.hpp"
 
 #include "BlockImpl.hpp"
 #include "Broadcaster.hpp"
@@ -26,7 +23,14 @@
 #include "Engine.hpp"
 #include "PortImpl.hpp"
 #include "RunContext.hpp"
-#include "SetPortValue.hpp"
+
+#include "ingen/Forge.hpp"
+#include "ingen/LV2Features.hpp"
+#include "ingen/Store.hpp"
+#include "ingen/URIs.hpp"
+#include "ingen/World.hpp"
+
+#include <cassert>
 
 namespace ingen {
 namespace server {
diff --git a/src/server/events/SetPortValue.hpp b/src/server/events/SetPortValue.hpp
index 4fe42659..1e7c7250 100644
--- a/src/server/events/SetPortValue.hpp
+++ b/src/server/events/SetPortValue.hpp
@@ -17,13 +17,15 @@
 #ifndef INGEN_EVENTS_SETPORTVALUE_HPP
 #define INGEN_EVENTS_SETPORTVALUE_HPP
 
-#include "ingen/Atom.hpp"
-
 #include "BufferRef.hpp"
 #include "ControlBindings.hpp"
 #include "Event.hpp"
 #include "types.hpp"
 
+#include "ingen/Atom.hpp"
+
+#include <cstdint>
+
 namespace ingen {
 namespace server {
 
diff --git a/src/server/events/Undo.cpp b/src/server/events/Undo.cpp
index 0c307e85..3a3bdbe2 100644
--- a/src/server/events/Undo.cpp
+++ b/src/server/events/Undo.cpp
@@ -14,11 +14,14 @@
   along with Ingen.  If not, see <http://www.gnu.org/licenses/>.
 */
 
-#include "ingen/AtomReader.hpp"
+#include "Undo.hpp"
 
 #include "Engine.hpp"
 #include "EventWriter.hpp"
-#include "Undo.hpp"
+
+#include "ingen/AtomReader.hpp"
+
+#include <deque>
 
 namespace ingen {
 namespace server {