Clean up includes

10 files changed, 10 insertions, 18 deletions

diff --git a/src/server/ArcImpl.cpp b/src/server/ArcImpl.cpp
index 689be199..ac39ffe1 100644
--- a/src/server/ArcImpl.cpp
+++ b/src/server/ArcImpl.cpp
@@ -27,7 +27,6 @@
 
 #include <algorithm>
 #include <cassert>
-#include <string>
 
 namespace ingen {
 namespace server {
diff --git a/src/server/BlockFactory.cpp b/src/server/BlockFactory.cpp
index 14a50098..d36924ae 100644
--- a/src/server/BlockFactory.cpp
+++ b/src/server/BlockFactory.cpp
@@ -33,7 +33,9 @@
 #include "internals/Trigger.hpp"
 #include "lilv/lilv.h"
 
+#include <algorithm>
 #include <cstdint>
+#include <iterator>
 #include <memory>
 #include <utility>
 #include <vector>
@@ -84,11 +86,10 @@ BlockFactory::refresh()
 	}
 
 	// Add any resurrected plugins to response
-	for (const auto& z : zombies) {
-		if (!z->is_zombie()) {
-			new_plugins.insert(z);
-		}
-	}
+	std::copy_if(zombies.begin(),
+	             zombies.end(),
+	             std::inserter(new_plugins, new_plugins.end()),
+	             [](const auto& z) { return !z->is_zombie(); });
 
 	return new_plugins;
 }
diff --git a/src/server/Broadcaster.cpp b/src/server/Broadcaster.cpp
index 6d32db84..04fbdba0 100644
--- a/src/server/Broadcaster.cpp
+++ b/src/server/Broadcaster.cpp
@@ -22,7 +22,6 @@
 #include "ingen/Interface.hpp"
 
 #include <cstddef>
-#include <map>
 #include <memory>
 #include <utility>
 
diff --git a/src/server/Buffer.cpp b/src/server/Buffer.cpp
index 69db7b5e..deb167d9 100644
--- a/src/server/Buffer.cpp
+++ b/src/server/Buffer.cpp
@@ -23,7 +23,6 @@
 #include "ingen/Atom.hpp"
 #include "ingen/Log.hpp"
 #include "ingen/URIs.hpp"
-#include "ingen_config.h"
 #include "lv2/atom/atom.h"
 #include "lv2/atom/util.h"
 #include "lv2/urid/urid.h"
diff --git a/src/server/PortImpl.cpp b/src/server/PortImpl.cpp
index 68392707..ff5e8111 100644
--- a/src/server/PortImpl.cpp
+++ b/src/server/PortImpl.cpp
@@ -31,11 +31,9 @@
 #include "lv2/urid/urid.h"
 #include "raul/Array.hpp"
 #include "raul/Maid.hpp"
-#include "raul/Path.hpp"
 
 #include <algorithm>
 #include <cassert>
-#include <cstdio>
 #include <memory>
 #include <utility>
 
diff --git a/src/server/PreProcessor.cpp b/src/server/PreProcessor.cpp
index b2f0fd46..9ef5db28 100644
--- a/src/server/PreProcessor.cpp
+++ b/src/server/PreProcessor.cpp
@@ -24,14 +24,10 @@
 #include "ThreadManager.hpp"
 #include "UndoStack.hpp"
 
-#include "ingen/Atom.hpp"
 #include "ingen/AtomWriter.hpp"
-#include "ingen/Configuration.hpp"
 #include "ingen/World.hpp"
 
 #include <cassert>
-#include <cstdint>
-#include <cstdio>
 #include <memory>
 
 namespace ingen {
diff --git a/src/server/UndoStack.cpp b/src/server/UndoStack.cpp
index 97539823..40c59af5 100644
--- a/src/server/UndoStack.cpp
+++ b/src/server/UndoStack.cpp
@@ -18,6 +18,7 @@
 
 #include "ingen/URIMap.hpp"
 #include "ingen/URIs.hpp"
+#include "ingen/ingen.h"
 #include "lv2/atom/atom.h"
 #include "lv2/atom/util.h"
 #include "lv2/patch/patch.h"
diff --git a/src/server/events/Delta.cpp b/src/server/events/Delta.cpp
index b4d46fb9..17f3c716 100644
--- a/src/server/events/Delta.cpp
+++ b/src/server/events/Delta.cpp
@@ -49,7 +49,6 @@
 #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 726d8b48..64ee67db 100644
--- a/src/server/events/Delta.hpp
+++ b/src/server/events/Delta.hpp
@@ -20,6 +20,7 @@
 #include "ClientUpdate.hpp"
 #include "ControlBindings.hpp"
 #include "Event.hpp"
+#include "SetPortValue.hpp"
 #include "State.hpp"
 #include "types.hpp"
 
@@ -34,6 +35,8 @@
 #include <memory>
 #include <vector>
 
+// IWYU pragma: no_include <algorithm>
+
 namespace ingen {
 
 class Interface;
@@ -51,8 +54,6 @@ class RunContext;
 
 namespace events {
 
-class SetPortValue;
-
 /** Set properties of a graph object.
  * \ingroup engine
  */
diff --git a/src/server/events/DisconnectAll.cpp b/src/server/events/DisconnectAll.cpp
index 35254ba0..220418e4 100644
--- a/src/server/events/DisconnectAll.cpp
+++ b/src/server/events/DisconnectAll.cpp
@@ -34,7 +34,6 @@
 #include "ingen/Store.hpp"
 #include "raul/Maid.hpp"
 
-#include <map>
 #include <memory>
 #include <mutex>
 #include <set>