Clean up includes

24 files changed, 24 insertions, 36 deletions

diff --git a/.includes.imp b/.includes.imp
index a1986d0f..7fa08fcb 100644
--- a/.includes.imp
+++ b/.includes.imp
@@ -1,16 +1,17 @@
 [
+  { "symbol": [ "GdkEvent",          "private", "<gdk/gdk.h>",     "public" ] },
+  { "symbol": [ "LilvWorld",         "private", "\"lilv/lilv.h\"", "public" ] },
+  { "symbol": [ "clockid_t",         "private", "<sys/types.h>",   "public" ] },
+  { "symbol": [ "clockid_t",         "private", "<time.h>",        "public" ] },
   { "symbol": [ "fmt::format",       "private", "<fmt/core.h>",    "public" ] },
+  { "symbol": [ "posix_memalign",    "private", "<stdlib.h>",      "public" ] },
+  { "symbol": [ "sched_param",       "private", "<sched.h>",       "public" ] },
   { "symbol": [ "std::exception",    "private", "<exception>",     "public" ] },
   { "symbol": [ "std::ifstream",     "private", "<fstream>",       "public" ] },
-  { "symbol": [ "std::ostream",      "private", "<ostream>",       "public" ] },
+  { "symbol": [ "std::mulliseconds", "private", "<chrono>",        "public" ] },
   { "symbol": [ "std::ostream",      "private", "<iosfwd>",        "public" ] },
-  { "symbol": [ "posix_memalign",    "private", "<stdlib.h>",      "public" ] },
+  { "symbol": [ "std::ostream",      "private", "<ostream>",       "public" ] },
   { "symbol": [ "std::stringstream", "private", "<sstream>",       "public" ] },
-  { "symbol": [ "sched_param",       "private", "<sched.h>",       "public" ] },
-  { "symbol": [ "clockid_t",         "private", "<time.h>",        "public" ] },
-  { "symbol": [ "clockid_t",         "private", "<sys/types.h>",   "public" ] },
-  { "symbol": [ "GdkEvent",          "private", "<gdk/gdk.h>",     "public" ] },
-  { "symbol": [ "LilvWorld",         "private", "\"lilv/lilv.h\"", "public" ] },
 
   { "symbol": [ "boost::intrusive::constant_time_size", "private",
                 "<boost/intrusive/options.hpp>",        "public" ] },
@@ -18,6 +19,7 @@
   { "symbol": [ "boost::intrusive::cache_last",  "private",
                 "<boost/intrusive/options.hpp>", "public" ] },
 
+  { "include": [ "<bits/chrono.h>",      "private", "<chrono>",    "public", ] },
   { "include": [ "<ext/alloc_traits.h>", "private", "<string>",    "public", ] },
   { "include": [ "<ext/alloc_traits.h>", "private", "<vector>",    "public", ] },
   { "include": [ "<gdk/gdkevents.h>",    "private", "<gdk/gdk.h>", "public", ] },
diff --git a/include/ingen/FilePath.hpp b/include/ingen/FilePath.hpp
index 3d077266..392b336a 100644
--- a/include/ingen/FilePath.hpp
+++ b/include/ingen/FilePath.hpp
@@ -21,6 +21,7 @@
 
 #include <boost/utility/string_view.hpp> // IWYU pragma: export
 
+#include <cstddef>
 #include <ostream>
 #include <string>
 #include <utility>
diff --git a/include/ingen/QueuedInterface.hpp b/include/ingen/QueuedInterface.hpp
index 97fbb731..d4c52168 100644
--- a/include/ingen/QueuedInterface.hpp
+++ b/include/ingen/QueuedInterface.hpp
@@ -21,7 +21,6 @@
 #include "ingen/Message.hpp"
 #include "ingen/URI.hpp"
 
-#include <algorithm>
 #include <memory>
 #include <mutex>
 #include <utility>
diff --git a/include/ingen/client/BlockModel.hpp b/include/ingen/client/BlockModel.hpp
index 060d454f..d2641f77 100644
--- a/include/ingen/client/BlockModel.hpp
+++ b/include/ingen/client/BlockModel.hpp
@@ -29,6 +29,8 @@
 #include <string>
 #include <vector>
 
+// IWYU pragma: no_include <algorithm>
+
 namespace raul {
 class Path;
 class Symbol;
diff --git a/include/ingen/client/SocketClient.hpp b/include/ingen/client/SocketClient.hpp
index 1e75ae80..0c823df5 100644
--- a/include/ingen/client/SocketClient.hpp
+++ b/include/ingen/client/SocketClient.hpp
@@ -28,7 +28,6 @@
 #include <cerrno>
 #include <cstring>
 #include <memory>
-#include <string>
 
 namespace ingen {
 
diff --git a/include/ingen/memory.hpp b/include/ingen/memory.hpp
index 6a62d317..7d2e1db0 100644
--- a/include/ingen/memory.hpp
+++ b/include/ingen/memory.hpp
@@ -18,8 +18,6 @@
 #define INGEN_MEMORY_HPP
 
 #include <cstdlib>
-#include <memory>
-#include <utility>
 
 namespace ingen {
 
diff --git a/src/SocketReader.cpp b/src/SocketReader.cpp
index e643b9a2..845974d6 100644
--- a/src/SocketReader.cpp
+++ b/src/SocketReader.cpp
@@ -31,7 +31,6 @@
 #include <mutex>
 #include <poll.h>
 #include <sys/socket.h>
-#include <sys/types.h>
 #include <utility>
 
 namespace ingen {
diff --git a/src/SocketWriter.cpp b/src/SocketWriter.cpp
index 0e5948e5..c705ed96 100644
--- a/src/SocketWriter.cpp
+++ b/src/SocketWriter.cpp
@@ -23,7 +23,6 @@
 
 #include <memory>
 #include <sys/socket.h>
-#include <sys/types.h>
 #include <utility>
 
 #ifndef MSG_NOSIGNAL
diff --git a/src/World.cpp b/src/World.cpp
index 4be9932a..c6f1b715 100644
--- a/src/World.cpp
+++ b/src/World.cpp
@@ -390,7 +390,7 @@ World::new_interface(const URI&                        engine_uri,
                      const std::shared_ptr<Interface>& respondee)
 {
 	const Impl::InterfaceFactories::const_iterator i =
-	    _impl->interface_factories.find(std::string(engine_uri.scheme()));
+		_impl->interface_factories.find(std::string{engine_uri.scheme()});
 	if (i == _impl->interface_factories.end()) {
 		log().warn("Unknown URI scheme `%1%'\n", engine_uri.scheme());
 		return nullptr;
diff --git a/src/client/BlockModel.cpp b/src/client/BlockModel.cpp
index cdfb3fcd..ad216678 100644
--- a/src/client/BlockModel.cpp
+++ b/src/client/BlockModel.cpp
@@ -26,7 +26,6 @@
 #include "raul/Path.hpp"
 #include "raul/Symbol.hpp"
 
-#include <algorithm>
 #include <cassert>
 #include <cmath>
 #include <cstdlib>
diff --git a/src/client/GraphModel.cpp b/src/client/GraphModel.cpp
index d4104742..0056da63 100644
--- a/src/client/GraphModel.cpp
+++ b/src/client/GraphModel.cpp
@@ -20,7 +20,6 @@
 #include "ingen/URIs.hpp"
 #include "ingen/client/ArcModel.hpp"
 #include "ingen/client/BlockModel.hpp"
-#include "ingen/client/ObjectModel.hpp"
 #include "ingen/client/PortModel.hpp"
 #include "raul/Path.hpp"
 
diff --git a/src/client/PluginModel.cpp b/src/client/PluginModel.cpp
index 4dddd147..f530f632 100644
--- a/src/client/PluginModel.cpp
+++ b/src/client/PluginModel.cpp
@@ -24,7 +24,6 @@
 
 #include <cctype>
 #include <cstring>
-#include <iosfwd>
 #include <memory>
 #include <string>
 #include <utility>
diff --git a/src/gui/WindowFactory.cpp b/src/gui/WindowFactory.cpp
index 4e48f157..a03ed881 100644
--- a/src/gui/WindowFactory.cpp
+++ b/src/gui/WindowFactory.cpp
@@ -16,7 +16,6 @@
 
 #include "App.hpp"
 #include "GraphBox.hpp"
-#include "GraphView.hpp"
 #include "GraphWindow.hpp"
 #include "LoadGraphWindow.hpp"
 #include "LoadPluginWindow.hpp"
diff --git a/src/gui/WindowFactory.hpp b/src/gui/WindowFactory.hpp
index 581e2e0f..a93bb89f 100644
--- a/src/gui/WindowFactory.hpp
+++ b/src/gui/WindowFactory.hpp
@@ -25,6 +25,7 @@
 #include <cstddef>
 #include <map>
 #include <memory>
+#include <string>
 
 namespace ingen {
 
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>