19 files changed, 11 insertions, 46 deletions
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 {