5 files changed, 14 insertions, 3 deletions
diff --git a/include/ingen/SocketReader.hpp b/include/ingen/SocketReader.hpp
index a8a98ddc..5efa2143 100644
--- a/include/ingen/SocketReader.hpp
+++ b/include/ingen/SocketReader.hpp
@@ -21,6 +21,7 @@
 #include "serd/serd.h"
 #include "sord/sord.h"
 
+#include <cstddef>
 #include <memory>
 #include <thread>
 
diff --git a/include/ingen/URI.hpp b/include/ingen/URI.hpp
index 78577d90..aec6587d 100644
--- a/include/ingen/URI.hpp
+++ b/include/ingen/URI.hpp
@@ -23,6 +23,7 @@
 #include "sord/sordmm.hpp"
 
 #include <boost/utility/string_view.hpp>
+#include <boost/utility/string_view_fwd.hpp>
 
 #include <cstddef>
 #include <cstdint>
diff --git a/include/ingen/client/BlockModel.hpp b/include/ingen/client/BlockModel.hpp
index 8c1645d9..0a0cded9 100644
--- a/include/ingen/client/BlockModel.hpp
+++ b/include/ingen/client/BlockModel.hpp
@@ -18,17 +18,22 @@
 #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/signal.hpp"
 #include "ingen/ingen.h"
 
-#include <algorithm>
 #include <cstdint>
 #include <memory>
 #include <string>
 #include <vector>
 
-namespace Raul { class Path; }
+namespace Raul {
+class Path;
+class Symbol;
+} // namespace Raul
 
 namespace ingen {
 
diff --git a/include/ingen/client/PluginModel.hpp b/include/ingen/client/PluginModel.hpp
index 24024a1b..5acb1707 100644
--- a/include/ingen/client/PluginModel.hpp
+++ b/include/ingen/client/PluginModel.hpp
@@ -24,13 +24,16 @@
 #include "ingen/ingen.h"
 #include "lilv/lilv.h"
 #include "raul/Symbol.hpp"
-#include "sord/sordmm.hpp"
 
 #include <cstdint>
 #include <map>
 #include <memory>
 #include <string>
 
+namespace Sord {
+class World;
+} // namespace Sord
+
 namespace ingen {
 
 class URIs;
diff --git a/include/ingen/client/SocketClient.hpp b/include/ingen/client/SocketClient.hpp
index 57c1de97..9b10ac29 100644
--- a/include/ingen/client/SocketClient.hpp
+++ b/include/ingen/client/SocketClient.hpp
@@ -17,6 +17,7 @@
 #ifndef INGEN_CLIENT_SOCKET_CLIENT_HPP
 #define INGEN_CLIENT_SOCKET_CLIENT_HPP
 
+#include "ingen/Log.hpp"
 #include "ingen/SocketReader.hpp"
 #include "ingen/SocketWriter.hpp"
 #include "ingen/ingen.h"