8 files changed, 34 insertions, 22 deletions
diff --git a/include/ingen/client/ArcModel.hpp b/include/ingen/client/ArcModel.hpp
index 05f104e4..635c2d41 100644
--- a/include/ingen/client/ArcModel.hpp
+++ b/include/ingen/client/ArcModel.hpp
@@ -24,12 +24,12 @@
 
 #include <cassert>
 #include <memory>
+#include <string>
+#include <utility>
 
 namespace ingen {
 namespace client {
 
-class ClientStore;
-
 /** Class to represent a port->port connections in the engine.
  *
  * @ingroup IngenClient
diff --git a/include/ingen/client/BlockModel.hpp b/include/ingen/client/BlockModel.hpp
index 0a0cded9..ee2c88d8 100644
--- a/include/ingen/client/BlockModel.hpp
+++ b/include/ingen/client/BlockModel.hpp
@@ -18,10 +18,9 @@
 #define INGEN_CLIENT_BLOCKMODEL_HPP
 
 #include "ingen/Node.hpp"
-#include "ingen/Resource.hpp"
 #include "ingen/URI.hpp"
 #include "ingen/client/ObjectModel.hpp"
-#include "ingen/client/PluginModel.hpp"
+#include "ingen/client/PluginModel.hpp" // IWYU pragma: keep
 #include "ingen/client/signal.hpp"
 #include "ingen/ingen.h"
 
@@ -37,6 +36,7 @@ class Symbol;
 
 namespace ingen {
 
+class Resource;
 class URIs;
 
 namespace client {
diff --git a/include/ingen/client/ClientStore.hpp b/include/ingen/client/ClientStore.hpp
index 6fa040b2..b1d40881 100644
--- a/include/ingen/client/ClientStore.hpp
+++ b/include/ingen/client/ClientStore.hpp
@@ -23,10 +23,10 @@
 #include "ingen/URI.hpp"
 #include "ingen/client/signal.hpp"
 #include "ingen/ingen.h"
-#include "raul/Path.hpp"
 
 #include <map>
 #include <memory>
+#include <utility>
 
 namespace Raul {
 class Path;
@@ -36,17 +36,14 @@ namespace ingen {
 
 class Atom;
 class Log;
-class Node;
 class Resource;
 class URIs;
 
 namespace client {
 
-class BlockModel;
 class GraphModel;
 class ObjectModel;
 class PluginModel;
-class PortModel;
 class SigClientInterface;
 
 /** Automatically manages models of objects in the engine.
diff --git a/include/ingen/client/GraphModel.hpp b/include/ingen/client/GraphModel.hpp
index 3ddf2342..fb95b716 100644
--- a/include/ingen/client/GraphModel.hpp
+++ b/include/ingen/client/GraphModel.hpp
@@ -26,11 +26,19 @@
 #include <cstdint>
 #include <memory>
 
+namespace Raul {
+class Path;
+} // namespace Raul
+
 namespace ingen {
+
+class URI;
+
 namespace client {
 
 class ArcModel;
-class ClientStore;
+class ObjectModel;
+class PortModel;
 
 /** Client's model of a graph.
  *
diff --git a/include/ingen/client/PluginModel.hpp b/include/ingen/client/PluginModel.hpp
index 5acb1707..07905ebb 100644
--- a/include/ingen/client/PluginModel.hpp
+++ b/include/ingen/client/PluginModel.hpp
@@ -17,9 +17,12 @@
 #ifndef INGEN_CLIENT_PLUGINMODEL_HPP
 #define INGEN_CLIENT_PLUGINMODEL_HPP
 
+#include "ingen/Atom.hpp"
 #include "ingen/Forge.hpp"
+#include "ingen/Properties.hpp"
 #include "ingen/Resource.hpp"
-#include "ingen/World.hpp"
+#include "ingen/URI.hpp"
+#include "ingen/URIs.hpp"
 #include "ingen/client/signal.hpp"
 #include "ingen/ingen.h"
 #include "lilv/lilv.h"
@@ -36,11 +39,10 @@ class World;
 
 namespace ingen {
 
-class URIs;
+class World;
 
 namespace client {
 
-class GraphModel;
 class BlockModel;
 class PluginUI;
 
diff --git a/include/ingen/client/PortModel.hpp b/include/ingen/client/PortModel.hpp
index 61b223df..b081a74d 100644
--- a/include/ingen/client/PortModel.hpp
+++ b/include/ingen/client/PortModel.hpp
@@ -17,18 +17,22 @@
 #ifndef INGEN_CLIENT_PORTMODEL_HPP
 #define INGEN_CLIENT_PORTMODEL_HPP
 
+#include "ingen/Node.hpp"
+#include "ingen/URI.hpp"
+#include "ingen/URIs.hpp"
 #include "ingen/client/ObjectModel.hpp"
+#include "ingen/client/signal.hpp"
 #include "ingen/ingen.h"
-#include "lv2/core/lv2.h"
-#include "lv2/port-props/port-props.h"
+#include "raul/Path.hpp"
 
-#include <cstdlib>
+#include <cstdint>
 #include <memory>
 #include <string>
 
-namespace Raul { class Path; }
-
 namespace ingen {
+
+class Atom;
+
 namespace client {
 
 /** Model of a port.
diff --git a/include/ingen/client/SigClientInterface.hpp b/include/ingen/client/SigClientInterface.hpp
index 674714a3..51e05b50 100644
--- a/include/ingen/client/SigClientInterface.hpp
+++ b/include/ingen/client/SigClientInterface.hpp
@@ -18,12 +18,10 @@
 #define INGEN_CLIENT_SIGCLIENTINTERFACE_HPP
 
 #include "ingen/Interface.hpp"
+#include "ingen/Message.hpp"
+#include "ingen/URI.hpp"
 #include "ingen/client/signal.hpp"
 #include "ingen/ingen.h"
-#include "raul/Path.hpp"
-
-#include <cstdint>
-#include <string>
 
 namespace ingen {
 namespace client {
diff --git a/include/ingen/client/signal.hpp b/include/ingen/client/signal.hpp
index ba5b017b..ea382549 100644
--- a/include/ingen/client/signal.hpp
+++ b/include/ingen/client/signal.hpp
@@ -17,7 +17,10 @@
 #ifndef INGEN_CLIENT_SIGNAL_HPP
 #define INGEN_CLIENT_SIGNAL_HPP
 
-#include <sigc++/sigc++.h>
+// IWYU pragma: begin_exports
+#include <sigc++/signal.h>
+#include <sigc++/trackable.h>
+// IWYU pragma: end_exports
 
 #define INGEN_SIGNAL(name, ...) \
 protected: \