Clean up includes and forward declarations

62 files changed, 38 insertions, 158 deletions

diff --git a/src/.clang-tidy b/src/.clang-tidy
index c6080d72..659fd994 100644
--- a/src/.clang-tidy
+++ b/src/.clang-tidy
@@ -3,6 +3,7 @@ Checks: >
   -*-macro-to-enum,
   -*-vararg,
   -android-cloexec-*,
+  -boost-use-ranges,
   -bugprone-easily-swappable-parameters,
   -bugprone-multi-level-implicit-pointer-conversion,
   -bugprone-unchecked-optional-access,
diff --git a/src/AtomWriter.cpp b/src/AtomWriter.cpp
index f2132a39..5200cfde 100644
--- a/src/AtomWriter.cpp
+++ b/src/AtomWriter.cpp
@@ -67,6 +67,7 @@
 #include <cassert>
 #include <cstdint>
 #include <map>
+#include <string>
 #include <utility>
 #include <variant>
 
diff --git a/src/Log.cpp b/src/Log.cpp
index 5c582cfa..fbcaeca1 100644
--- a/src/Log.cpp
+++ b/src/Log.cpp
@@ -27,6 +27,7 @@
 
 #include <cstdio>
 #include <cstdlib>
+#include <memory>
 
 namespace ingen {
 
diff --git a/src/client/BlockModel.cpp b/src/client/BlockModel.cpp
index c8f76195..c5dbd3b7 100644
--- a/src/client/BlockModel.cpp
+++ b/src/client/BlockModel.cpp
@@ -39,10 +39,6 @@
 #include <string>
 #include <utility>
 
-namespace ingen {
-class Node;
-} // namespace ingen
-
 namespace ingen::client {
 
 BlockModel::BlockModel(URIs&                               uris,
diff --git a/src/client/ObjectModel.cpp b/src/client/ObjectModel.cpp
index d233dd1a..4baa895c 100644
--- a/src/client/ObjectModel.cpp
+++ b/src/client/ObjectModel.cpp
@@ -32,10 +32,6 @@
 #include <string>
 #include <utility>
 
-namespace ingen {
-class URI;
-} // namespace ingen
-
 namespace ingen::client {
 
 ObjectModel::ObjectModel(URIs& uris, const raul::Path& path)
diff --git a/src/client/ingen_client.cpp b/src/client/ingen_client.cpp
index 2f1a8aa6..88619115 100644
--- a/src/client/ingen_client.cpp
+++ b/src/client/ingen_client.cpp
@@ -16,18 +16,13 @@
 
 #include <ingen/Module.hpp>
 
-namespace ingen {
-
-class World;
-
-namespace client {
+namespace ingen::client {
 
 struct ClientModule : public ingen::Module {
 	void load(ingen::World& world) override {}
 };
 
-} // namespace client
-} // namespace ingen
+} // namespace ingen::client
 
 extern "C" {
 
diff --git a/src/gui/App.cpp b/src/gui/App.cpp
index 7c1a626c..260afdba 100644
--- a/src/gui/App.cpp
+++ b/src/gui/App.cpp
@@ -72,6 +72,7 @@
 
 #include <algorithm>
 #include <cassert>
+#include <cstdarg>
 #include <cstdio>
 #include <exception>
 #include <iostream>
diff --git a/src/gui/GraphBox.cpp b/src/gui/GraphBox.cpp
index b47393f3..47c567e3 100644
--- a/src/gui/GraphBox.cpp
+++ b/src/gui/GraphBox.cpp
@@ -50,6 +50,7 @@
 #include <raul/Symbol.hpp>
 
 #include <gdk/gdk.h>
+#include <glib.h>
 #include <glib/gstdio.h>
 #include <glibmm/convert.h>
 #include <glibmm/fileutils.h>
diff --git a/src/gui/GraphTreeWindow.cpp b/src/gui/GraphTreeWindow.cpp
index d32b2a17..1d141271 100644
--- a/src/gui/GraphTreeWindow.cpp
+++ b/src/gui/GraphTreeWindow.cpp
@@ -47,6 +47,7 @@
 #include <cassert>
 #include <cstdint>
 #include <memory>
+#include <string>
 
 namespace ingen {
 
diff --git a/src/gui/GraphView.cpp b/src/gui/GraphView.cpp
index 6c46776f..8d1e1777 100644
--- a/src/gui/GraphView.cpp
+++ b/src/gui/GraphView.cpp
@@ -45,6 +45,7 @@
 #include <cstdint>
 #include <map>
 #include <memory>
+#include <string>
 #include <utility>
 
 namespace ingen {
diff --git a/src/gui/GraphWindow.hpp b/src/gui/GraphWindow.hpp
index 05c555a5..9936b5df 100644
--- a/src/gui/GraphWindow.hpp
+++ b/src/gui/GraphWindow.hpp
@@ -44,8 +44,6 @@ class PortModel;
 
 namespace gui {
 
-class App;
-
 /** A window for a graph.
  *
  * \ingroup GUI
diff --git a/src/gui/LoadPluginWindow.cpp b/src/gui/LoadPluginWindow.cpp
index 56551318..3d8b2cd5 100644
--- a/src/gui/LoadPluginWindow.cpp
+++ b/src/gui/LoadPluginWindow.cpp
@@ -43,6 +43,7 @@
 #include <gtkmm/combobox.h>
 #include <gtkmm/enums.h>
 #include <gtkmm/messagedialog.h>
+#include <gtkmm/object.h>
 #include <gtkmm/treeiter.h>
 #include <gtkmm/treepath.h>
 #include <gtkmm/treeview.h>
diff --git a/src/gui/MessagesWindow.hpp b/src/gui/MessagesWindow.hpp
index c0de6b61..0a70e76c 100644
--- a/src/gui/MessagesWindow.hpp
+++ b/src/gui/MessagesWindow.hpp
@@ -38,8 +38,6 @@ class TextView;
 
 namespace ingen::gui {
 
-class App;
-
 /** Messages Window.
  *
  * Loaded from XML as a derived object.
diff --git a/src/gui/PropertiesWindow.cpp b/src/gui/PropertiesWindow.cpp
index 770e4a40..0dde0ab2 100644
--- a/src/gui/PropertiesWindow.cpp
+++ b/src/gui/PropertiesWindow.cpp
@@ -39,6 +39,7 @@
 #include <glibmm/containers.h>
 #include <glibmm/propertyproxy.h>
 #include <glibmm/ustring.h>
+#include <gtk/gtk.h>
 #include <gtkmm/alignment.h>
 #include <gtkmm/bin.h>
 #include <gtkmm/box.h>
diff --git a/src/gui/ingen_gui.cpp b/src/gui/ingen_gui.cpp
index 133286f6..7fba2d50 100644
--- a/src/gui/ingen_gui.cpp
+++ b/src/gui/ingen_gui.cpp
@@ -28,6 +28,7 @@
 #include <glibmm/thread.h>
 
 #include <memory>
+#include <string>
 
 namespace ingen::gui {
 
diff --git a/src/server/ArcImpl.hpp b/src/server/ArcImpl.hpp
index b0914929..5be51187 100644
--- a/src/server/ArcImpl.hpp
+++ b/src/server/ArcImpl.hpp
@@ -26,10 +26,6 @@
 
 #include <cstdint>
 
-namespace raul {
-class Path;
-} // namespace raul
-
 namespace ingen::server {
 
 class InputPort;
diff --git a/src/server/BlockFactory.cpp b/src/server/BlockFactory.cpp
index 9c9b9e98..a70de0b6 100644
--- a/src/server/BlockFactory.cpp
+++ b/src/server/BlockFactory.cpp
@@ -38,6 +38,7 @@
 #include <cstdint>
 #include <iterator>
 #include <memory>
+#include <string>
 #include <utility>
 #include <vector>
 
diff --git a/src/server/BlockImpl.cpp b/src/server/BlockImpl.cpp
index 31f66c7b..b104dfb9 100644
--- a/src/server/BlockImpl.cpp
+++ b/src/server/BlockImpl.cpp
@@ -33,10 +33,6 @@
 #include <initializer_list>
 #include <string>
 
-namespace ingen {
-class Resource;
-} // namespace ingen
-
 namespace ingen::server {
 
 BlockImpl::BlockImpl(PluginImpl*         plugin,
diff --git a/src/server/BlockImpl.hpp b/src/server/BlockImpl.hpp
index 5589d979..69564ff4 100644
--- a/src/server/BlockImpl.hpp
+++ b/src/server/BlockImpl.hpp
@@ -45,8 +45,6 @@ namespace ingen {
 
 enum class PortType;
 
-class Node;
-
 namespace server {
 
 class BufferFactory;
diff --git a/src/server/DuplexPort.hpp b/src/server/DuplexPort.hpp
index da00b4bf..fb3eb74e 100644
--- a/src/server/DuplexPort.hpp
+++ b/src/server/DuplexPort.hpp
@@ -22,7 +22,6 @@
 #include "server.h"
 #include "types.hpp"
 
-#include <ingen/URI.hpp>
 #include <lv2/urid/urid.h>
 #include <raul/Maid.hpp>
 
@@ -40,14 +39,12 @@ namespace ingen {
 enum class PortType;
 
 class Atom;
-class Properties;
 
 namespace server {
 
 class BufferFactory;
 class Engine;
 class GraphImpl;
-class RunContext;
 
 /** A duplex Port (both an input and output port on a Graph)
  *
diff --git a/src/server/Engine.cpp b/src/server/Engine.cpp
index 8a250d77..4d753bbc 100644
--- a/src/server/Engine.cpp
+++ b/src/server/Engine.cpp
@@ -72,6 +72,7 @@
 #include <limits>
 #include <map>
 #include <memory>
+#include <string>
 #include <thread>
 #include <utility>
 
diff --git a/src/server/Engine.hpp b/src/server/Engine.hpp
index e6c543d9..8fa1d169 100644
--- a/src/server/Engine.hpp
+++ b/src/server/Engine.hpp
@@ -19,7 +19,6 @@
 
 #include "Event.hpp"
 #include "Load.hpp"
-#include "RunContext.hpp"
 #include "server.h"
 #include "types.hpp"
 
@@ -61,6 +60,7 @@ class GraphImpl;
 class LV2Options;
 class PostProcessor;
 class PreProcessor;
+class RunContext;
 class SocketListener;
 class Task;
 class UndoStack;
diff --git a/src/server/GraphImpl.cpp b/src/server/GraphImpl.cpp
index 0d381175..9e44a4d4 100644
--- a/src/server/GraphImpl.cpp
+++ b/src/server/GraphImpl.cpp
@@ -42,6 +42,7 @@
 #include <cstddef>
 #include <map>
 #include <memory>
+#include <string>
 #include <unordered_map>
 
 namespace ingen::server {
diff --git a/src/server/InternalBlock.cpp b/src/server/InternalBlock.cpp
index a1eb0027..2eb0d411 100644
--- a/src/server/InternalBlock.cpp
+++ b/src/server/InternalBlock.cpp
@@ -43,7 +43,6 @@ class Atom;
 namespace server {
 
 class GraphImpl;
-class RunContext;
 
 InternalBlock::InternalBlock(PluginImpl*         plugin,
                              const raul::Symbol& symbol,
diff --git a/src/server/InternalBlock.hpp b/src/server/InternalBlock.hpp
index 9db7325a..9eca9716 100644
--- a/src/server/InternalBlock.hpp
+++ b/src/server/InternalBlock.hpp
@@ -26,10 +26,8 @@ class Symbol;
 
 namespace ingen::server {
 
-class Engine;
 class GraphImpl;
 class PluginImpl;
-class RunContext;
 
 /** An internal Block implemented inside Ingen.
  *
diff --git a/src/server/InternalPlugin.hpp b/src/server/InternalPlugin.hpp
index 5fffcb17..4d715491 100644
--- a/src/server/InternalPlugin.hpp
+++ b/src/server/InternalPlugin.hpp
@@ -31,11 +31,6 @@ class URIs;
 
 namespace server {
 
-class BlockImpl;
-class BufferFactory;
-class Engine;
-class GraphImpl;
-
 /** Implementation of an Internal plugin.
  */
 class InternalPlugin : public PluginImpl
diff --git a/src/server/JackDriver.cpp b/src/server/JackDriver.cpp
index d796f289..e508c850 100644
--- a/src/server/JackDriver.cpp
+++ b/src/server/JackDriver.cpp
@@ -37,7 +37,6 @@
 #include <ingen/URIMap.hpp>
 #include <ingen/URIs.hpp>
 #include <ingen/World.hpp>
-#include <ingen/memory.hpp>
 #include <lv2/atom/atom.h>
 #include <lv2/atom/forge.h>
 #include <lv2/atom/util.h>
diff --git a/src/server/JackDriver.hpp b/src/server/JackDriver.hpp
index 192604f4..4c8e779e 100644
--- a/src/server/JackDriver.hpp
+++ b/src/server/JackDriver.hpp
@@ -39,18 +39,12 @@
 #include <memory>
 #include <string>
 
-namespace raul {
-class Path;
-} // namespace raul
-
 namespace ingen {
 
 class Atom;
 
 namespace server {
 
-class Buffer;
-class DuplexPort;
 class Engine;
 class FrameTimer;
 class RunContext;
diff --git a/src/server/LV2Block.cpp b/src/server/LV2Block.cpp
index 1cc266bf..ea6a6955 100644
--- a/src/server/LV2Block.cpp
+++ b/src/server/LV2Block.cpp
@@ -56,6 +56,7 @@
 #include <cstdint>
 #include <map>
 #include <memory>
+#include <optional>
 #include <string>
 #include <utility>
 
diff --git a/src/server/LV2Block.hpp b/src/server/LV2Block.hpp
index 7b7466bb..78b5ffac 100644
--- a/src/server/LV2Block.hpp
+++ b/src/server/LV2Block.hpp
@@ -23,8 +23,6 @@
 #include "types.hpp"
 
 #include <ingen/LV2Features.hpp>
-#include <ingen/Properties.hpp>
-#include <ingen/URI.hpp>
 #include <lilv/lilv.h>
 #include <lv2/worker/worker.h>
 #include <raul/Array.hpp>
@@ -41,7 +39,6 @@
 #include <filesystem>
 #include <memory>
 #include <mutex>
-#include <optional>
 
 namespace raul {
 class Symbol;
@@ -49,18 +46,14 @@ class Symbol;
 
 namespace ingen {
 
-class Resource;
 class URIs;
 class World;
 
 namespace server {
 
 class BufferFactory;
-class Engine;
 class GraphImpl;
 class LV2Plugin;
-class RunContext;
-class Worker;
 
 /** An instance of a LV2 plugin.
  *
diff --git a/src/server/LV2Plugin.hpp b/src/server/LV2Plugin.hpp
index c657f8d8..c94e88f7 100644
--- a/src/server/LV2Plugin.hpp
+++ b/src/server/LV2Plugin.hpp
@@ -21,7 +21,6 @@
 
 #include <ingen/URI.hpp>
 #include <lilv/lilv.h>
-#include <raul/Symbol.hpp>
 
 namespace ingen {
 
@@ -29,11 +28,6 @@ class World;
 
 namespace server {
 
-class BlockImpl;
-class BufferFactory;
-class Engine;
-class GraphImpl;
-
 /** Implementation of an LV2 plugin (loaded shared library).
  */
 class LV2Plugin : public PluginImpl
diff --git a/src/server/NodeImpl.cpp b/src/server/NodeImpl.cpp
index 6d5843a0..e820a44e 100644
--- a/src/server/NodeImpl.cpp
+++ b/src/server/NodeImpl.cpp
@@ -28,10 +28,6 @@
 #include <map>
 #include <utility>
 
-namespace ingen {
-class URI;
-} // namespace ingen
-
 namespace ingen::server {
 
 NodeImpl::NodeImpl(const ingen::URIs&  uris,
diff --git a/src/server/NodeImpl.hpp b/src/server/NodeImpl.hpp
index 614f18de..fcf2f57f 100644
--- a/src/server/NodeImpl.hpp
+++ b/src/server/NodeImpl.hpp
@@ -18,7 +18,6 @@
 #define INGEN_ENGINE_NODEIMPL_HPP
 
 #include <ingen/Node.hpp>
-#include <ingen/URI.hpp>
 #include <ingen/paths.hpp>
 #include <raul/Path.hpp>
 #include <raul/Symbol.hpp>
@@ -27,7 +26,6 @@
 
 namespace ingen {
 
-class Atom;
 class URIs;
 
 namespace server {
diff --git a/src/server/PortAudioDriver.cpp b/src/server/PortAudioDriver.cpp
index 4dc85352..ef893478 100644
--- a/src/server/PortAudioDriver.cpp
+++ b/src/server/PortAudioDriver.cpp
@@ -34,10 +34,6 @@
 #include <cstring>
 #include <string>
 
-namespace ingen {
-class URI;
-} // namespace ingen
-
 namespace ingen::server {
 
 static bool
diff --git a/src/server/PortAudioDriver.hpp b/src/server/PortAudioDriver.hpp
index 77d91461..6c7bfb9e 100644
--- a/src/server/PortAudioDriver.hpp
+++ b/src/server/PortAudioDriver.hpp
@@ -21,7 +21,6 @@
 #include "EnginePort.hpp"
 #include "types.hpp"
 
-#include <ingen/URI.hpp>
 #include <raul/Semaphore.hpp>
 
 #include <boost/intrusive/options.hpp>
@@ -32,18 +31,8 @@
 #include <cstdint>
 #include <memory>
 
-namespace raul {
-class Path;
-} // namespace raul
+namespace ingen::server {
 
-namespace ingen {
-
-class Atom;
-
-namespace server {
-
-class Buffer;
-class DuplexPort;
 class Engine;
 class FrameTimer;
 class RunContext;
@@ -129,7 +118,6 @@ protected:
 	bool                        _is_activated{false};
 };
 
-} // namespace server
-} // namespace ingen
+} // namespace ingen::server
 
 #endif // INGEN_ENGINE_PORTAUDIODRIVER_HPP
diff --git a/src/server/PostProcessor.cpp b/src/server/PostProcessor.cpp
index a97fc451..4c071ecd 100644
--- a/src/server/PostProcessor.cpp
+++ b/src/server/PostProcessor.cpp
@@ -23,8 +23,6 @@
 
 namespace ingen::server {
 
-class PreProcessContext;
-
 class Sentinel : public Event
 {
 public:
diff --git a/src/server/PreProcessor.cpp b/src/server/PreProcessor.cpp
index bcca7d0a..b3bad0b2 100644
--- a/src/server/PreProcessor.cpp
+++ b/src/server/PreProcessor.cpp
@@ -34,6 +34,7 @@
 #include <cstdint>
 #include <cstdio>
 #include <memory>
+#include <string>
 
 namespace ingen::server {
 
diff --git a/src/server/Worker.cpp b/src/server/Worker.cpp
index f917897d..1c04bb36 100644
--- a/src/server/Worker.cpp
+++ b/src/server/Worker.cpp
@@ -30,11 +30,7 @@
 #include <cstdlib>
 #include <memory>
 
-namespace ingen {
-
-class World;
-
-namespace server {
+namespace ingen::server {
 
 /// A message in the Worker::_requests ring
 struct MessageHeader {
@@ -166,5 +162,4 @@ Worker::run()
 	}
 }
 
-} // namespace server
-} // namespace ingen
+} // namespace ingen::server
diff --git a/src/server/Worker.hpp b/src/server/Worker.hpp
index b2ad6d4b..08b75509 100644
--- a/src/server/Worker.hpp
+++ b/src/server/Worker.hpp
@@ -30,8 +30,6 @@
 namespace ingen {
 
 class Log;
-class Node;
-class World;
 
 namespace server {
 
diff --git a/src/server/events/Connect.hpp b/src/server/events/Connect.hpp
index 5c295dca..458df0ef 100644
--- a/src/server/events/Connect.hpp
+++ b/src/server/events/Connect.hpp
@@ -38,8 +38,6 @@ class CompiledGraph;
 class Engine;
 class GraphImpl;
 class InputPort;
-class PreProcessContext;
-class RunContext;
 
 namespace events {
 
diff --git a/src/server/events/Copy.hpp b/src/server/events/Copy.hpp
index ee26ab43..8031bb42 100644
--- a/src/server/events/Copy.hpp
+++ b/src/server/events/Copy.hpp
@@ -35,7 +35,6 @@ class CompiledGraph;
 class Engine;
 class GraphImpl;
 class PreProcessContext;
-class RunContext;
 
 namespace events {
 
diff --git a/src/server/events/CreateBlock.cpp b/src/server/events/CreateBlock.cpp
index b8170702..55c9b782 100644
--- a/src/server/events/CreateBlock.cpp
+++ b/src/server/events/CreateBlock.cpp
@@ -45,13 +45,10 @@
 
 #include <map>
 #include <memory>
+#include <string>
 #include <utility>
 
-namespace ingen::server {
-
-class RunContext;
-
-namespace events {
+namespace ingen::server::events {
 
 CreateBlock::CreateBlock(Engine&                           engine,
                          const std::shared_ptr<Interface>& client,
@@ -199,5 +196,4 @@ CreateBlock::undo(Interface& target)
 	target.del(_block->uri());
 }
 
-} // namespace events
-} // namespace ingen::server
+} // namespace ingen::server::events
diff --git a/src/server/events/CreateBlock.hpp b/src/server/events/CreateBlock.hpp
index 41918175..0ee6e36f 100644
--- a/src/server/events/CreateBlock.hpp
+++ b/src/server/events/CreateBlock.hpp
@@ -37,8 +37,6 @@ class BlockImpl;
 class CompiledGraph;
 class Engine;
 class GraphImpl;
-class PreProcessContext;
-class RunContext;
 
 namespace events {
 
diff --git a/src/server/events/CreateGraph.cpp b/src/server/events/CreateGraph.cpp
index 3f1b1f45..5df28afa 100644
--- a/src/server/events/CreateGraph.cpp
+++ b/src/server/events/CreateGraph.cpp
@@ -43,6 +43,7 @@
 
 #include <map>
 #include <memory>
+#include <string>
 #include <utility>
 
 namespace ingen::server::events {
diff --git a/src/server/events/CreateGraph.hpp b/src/server/events/CreateGraph.hpp
index 2140c991..1d7f04a5 100644
--- a/src/server/events/CreateGraph.hpp
+++ b/src/server/events/CreateGraph.hpp
@@ -37,8 +37,6 @@ namespace server {
 class CompiledGraph;
 class Engine;
 class GraphImpl;
-class PreProcessContext;
-class RunContext;
 
 namespace events {
 
diff --git a/src/server/events/CreatePort.cpp b/src/server/events/CreatePort.cpp
index a975fd07..b42542f8 100644
--- a/src/server/events/CreatePort.cpp
+++ b/src/server/events/CreatePort.cpp
@@ -45,6 +45,7 @@
 #include <cassert>
 #include <map>
 #include <memory>
+#include <string>
 #include <utility>
 
 namespace ingen::server::events {
diff --git a/src/server/events/CreatePort.hpp b/src/server/events/CreatePort.hpp
index 6e1066f0..151bf82f 100644
--- a/src/server/events/CreatePort.hpp
+++ b/src/server/events/CreatePort.hpp
@@ -41,8 +41,6 @@ class DuplexPort;
 class Engine;
 class EnginePort;
 class GraphImpl;
-class PreProcessContext;
-class RunContext;
 
 namespace events {
 
diff --git a/src/server/events/Delete.cpp b/src/server/events/Delete.cpp
index 1a5fb93d..9e940ea7 100644
--- a/src/server/events/Delete.cpp
+++ b/src/server/events/Delete.cpp
@@ -50,11 +50,7 @@
 #include <string>
 #include <string_view>
 
-namespace ingen::server {
-
-class RunContext;
-
-namespace events {
+namespace ingen::server::events {
 
 Delete::Delete(Engine&                           engine,
                const std::shared_ptr<Interface>& client,
@@ -231,5 +227,4 @@ Delete::undo(Interface& target)
 	}
 }
 
-} // namespace events
-} // namespace ingen::server
+} // namespace ingen::server::events
diff --git a/src/server/events/Delete.hpp b/src/server/events/Delete.hpp
index 246adc21..7e901f4b 100644
--- a/src/server/events/Delete.hpp
+++ b/src/server/events/Delete.hpp
@@ -34,6 +34,8 @@
 #include <utility>
 #include <vector>
 
+// IWYU pragma: no_include <iterator>
+
 namespace ingen {
 
 class Interface;
@@ -45,8 +47,6 @@ class CompiledGraph;
 class DuplexPort;
 class Engine;
 class EnginePort;
-class PreProcessContext;
-class RunContext;
 
 namespace events {
 
diff --git a/src/server/events/Delta.cpp b/src/server/events/Delta.cpp
index 9072e34d..cba21214 100644
--- a/src/server/events/Delta.cpp
+++ b/src/server/events/Delta.cpp
@@ -58,11 +58,7 @@
 #include <utility>
 #include <vector>
 
-namespace ingen::server {
-
-class PreProcessContext;
-
-namespace events {
+namespace ingen::server::events {
 
 Delta::Delta(Engine&                           engine,
              const std::shared_ptr<Interface>& client,
@@ -674,5 +670,4 @@ Delta::get_execution() const
 	return _block ? Execution::ATOMIC : Execution::NORMAL;
 }
 
-} // namespace events
-} // namespace ingen::server
+} // namespace ingen::server::events
diff --git a/src/server/events/Delta.hpp b/src/server/events/Delta.hpp
index a2a63a71..befbdcc7 100644
--- a/src/server/events/Delta.hpp
+++ b/src/server/events/Delta.hpp
@@ -45,8 +45,6 @@ namespace server {
 
 class Engine;
 class GraphImpl;
-class PreProcessContext;
-class RunContext;
 
 namespace events {
 
diff --git a/src/server/events/Disconnect.hpp b/src/server/events/Disconnect.hpp
index c89b6e95..92dd81d3 100644
--- a/src/server/events/Disconnect.hpp
+++ b/src/server/events/Disconnect.hpp
@@ -37,7 +37,6 @@ class CompiledGraph;
 class Engine;
 class GraphImpl;
 class InputPort;
-class PreProcessContext;
 class RunContext;
 
 namespace events {
diff --git a/src/server/events/DisconnectAll.hpp b/src/server/events/DisconnectAll.hpp
index 753460de..0eeda6f8 100644
--- a/src/server/events/DisconnectAll.hpp
+++ b/src/server/events/DisconnectAll.hpp
@@ -40,8 +40,6 @@ class CompiledGraph;
 class Engine;
 class GraphImpl;
 class PortImpl;
-class PreProcessContext;
-class RunContext;
 
 namespace events {
 
diff --git a/src/server/events/Get.hpp b/src/server/events/Get.hpp
index c434d0d8..0f5ed235 100644
--- a/src/server/events/Get.hpp
+++ b/src/server/events/Get.hpp
@@ -35,8 +35,6 @@ namespace server {
 
 class Engine;
 class PluginImpl;
-class PreProcessContext;
-class RunContext;
 
 namespace events {
 
diff --git a/src/server/events/Mark.hpp b/src/server/events/Mark.hpp
index c98ca0d9..e7180764 100644
--- a/src/server/events/Mark.hpp
+++ b/src/server/events/Mark.hpp
@@ -34,8 +34,6 @@ namespace server {
 
 class Engine;
 class GraphImpl;
-class PreProcessContext;
-class RunContext;
 
 namespace events {
 
diff --git a/src/server/events/Move.hpp b/src/server/events/Move.hpp
index 2b79a58b..cca4d310 100644
--- a/src/server/events/Move.hpp
+++ b/src/server/events/Move.hpp
@@ -31,8 +31,6 @@ class Interface;
 namespace server {
 
 class Engine;
-class PreProcessContext;
-class RunContext;
 
 namespace events {
 
diff --git a/src/server/events/SetPortValue.hpp b/src/server/events/SetPortValue.hpp
index 548f5475..32a8b761 100644
--- a/src/server/events/SetPortValue.hpp
+++ b/src/server/events/SetPortValue.hpp
@@ -35,7 +35,6 @@ namespace server {
 
 class Engine;
 class PortImpl;
-class PreProcessContext;
 class RunContext;
 
 namespace events {
diff --git a/src/server/events/Undo.hpp b/src/server/events/Undo.hpp
index eb9cb70a..818dc754 100644
--- a/src/server/events/Undo.hpp
+++ b/src/server/events/Undo.hpp
@@ -32,8 +32,6 @@ struct Undo;
 namespace server {
 
 class Engine;
-class PreProcessContext;
-class RunContext;
 
 namespace events {
 
diff --git a/src/server/ingen_lv2.cpp b/src/server/ingen_lv2.cpp
index 192a8450..482363f8 100644
--- a/src/server/ingen_lv2.cpp
+++ b/src/server/ingen_lv2.cpp
@@ -76,11 +76,7 @@
 
 // #define CLEAR_GRAPH_ON_RESTORE 1
 
-namespace ingen {
-
-class Atom;
-
-namespace server {
+namespace ingen::server {
 
 class GraphImpl;
 
@@ -857,8 +853,8 @@ lib_get_plugin(LV2_Lib_Handle handle, uint32_t index)
 }
 
 } // extern "C"
-} // namespace server
-} // namespace ingen
+
+} // namespace ingen::server
 
 extern "C" {
 
diff --git a/src/server/internals/BlockDelay.cpp b/src/server/internals/BlockDelay.cpp
index b929f2e9..acc68851 100644
--- a/src/server/internals/BlockDelay.cpp
+++ b/src/server/internals/BlockDelay.cpp
@@ -33,11 +33,7 @@
 
 #include <memory>
 
-namespace ingen::server {
-
-class RunContext;
-
-namespace internals {
+namespace ingen::server::internals {
 
 InternalPlugin* BlockDelayNode::internal_plugin(URIs& uris) {
 	return new InternalPlugin(
@@ -90,5 +86,4 @@ BlockDelayNode::run(RunContext& ctx)
 	_buffer->copy(ctx, _in_port->buffer(0).get());
 }
 
-} // namespace internals
-} // namespace ingen::server
+} // namespace ingen::server::internals
diff --git a/src/server/internals/BlockDelay.hpp b/src/server/internals/BlockDelay.hpp
index 78a03c28..a9667fa0 100644
--- a/src/server/internals/BlockDelay.hpp
+++ b/src/server/internals/BlockDelay.hpp
@@ -36,7 +36,6 @@ class GraphImpl;
 class InputPort;
 class InternalPlugin;
 class OutputPort;
-class RunContext;
 
 namespace internals {
 
diff --git a/src/server/internals/Time.hpp b/src/server/internals/Time.hpp
index fa3e90e5..228e67a8 100644
--- a/src/server/internals/Time.hpp
+++ b/src/server/internals/Time.hpp
@@ -34,7 +34,6 @@ class BufferFactory;
 class GraphImpl;
 class InternalPlugin;
 class OutputPort;
-class RunContext;
 
 namespace internals {