8 files changed, 55 insertions, 10 deletions
diff --git a/src/client/BlockModel.cpp b/src/client/BlockModel.cpp
index 898a1799..a6e4a0a6 100644
--- a/src/client/BlockModel.cpp
+++ b/src/client/BlockModel.cpp
@@ -16,16 +16,24 @@
 
 #include "ingen/client/BlockModel.hpp"
 
+#include "ingen/Atom.hpp"
+#include "ingen/Forge.hpp"
 #include "ingen/URIs.hpp"
-#include "ingen/World.hpp"
+#include "ingen/client/PluginModel.hpp"
 #include "ingen/client/PortModel.hpp"
+#include "lilv/lilv.h"
+#include "lv2/core/lv2.h"
+#include "raul/Path.hpp"
+#include "raul/Symbol.hpp"
 
+#include <algorithm>
 #include <cassert>
 #include <cmath>
 #include <cstdlib>
 #include <cstring>
 #include <memory>
 #include <string>
+#include <utility>
 
 namespace ingen {
 namespace client {
diff --git a/src/client/ClientStore.cpp b/src/client/ClientStore.cpp
index 1a7963f3..9c577673 100644
--- a/src/client/ClientStore.cpp
+++ b/src/client/ClientStore.cpp
@@ -16,7 +16,13 @@
 
 #include "ingen/client/ClientStore.hpp"
 
+#include "ingen/Atom.hpp"
+#include "ingen/Forge.hpp"
 #include "ingen/Log.hpp"
+#include "ingen/Node.hpp"
+#include "ingen/Properties.hpp"
+#include "ingen/Resource.hpp"
+#include "ingen/URIs.hpp"
 #include "ingen/client/ArcModel.hpp"
 #include "ingen/client/BlockModel.hpp"
 #include "ingen/client/GraphModel.hpp"
@@ -24,8 +30,11 @@
 #include "ingen/client/PluginModel.hpp"
 #include "ingen/client/PortModel.hpp"
 #include "ingen/client/SigClientInterface.hpp"
+#include "ingen/paths.hpp"
+#include "raul/Path.hpp"
 
 #include <boost/variant/apply_visitor.hpp>
+#include <sigc++/functors/mem_fun.h>
 
 #include <cassert>
 #include <cstdint>
diff --git a/src/client/GraphModel.cpp b/src/client/GraphModel.cpp
index 3bc08dfd..d4104742 100644
--- a/src/client/GraphModel.cpp
+++ b/src/client/GraphModel.cpp
@@ -16,12 +16,16 @@
 
 #include "ingen/client/GraphModel.hpp"
 
+#include "ingen/Atom.hpp"
 #include "ingen/URIs.hpp"
 #include "ingen/client/ArcModel.hpp"
 #include "ingen/client/BlockModel.hpp"
-#include "ingen/client/ClientStore.hpp"
+#include "ingen/client/ObjectModel.hpp"
+#include "ingen/client/PortModel.hpp"
+#include "raul/Path.hpp"
 
 #include <cassert>
+#include <map>
 #include <memory>
 #include <string>
 #include <utility>
diff --git a/src/client/ObjectModel.cpp b/src/client/ObjectModel.cpp
index 00da2c62..b769d5f1 100644
--- a/src/client/ObjectModel.cpp
+++ b/src/client/ObjectModel.cpp
@@ -16,11 +16,16 @@
 
 #include "ingen/client/ObjectModel.hpp"
 
+#include "ingen/Atom.hpp"
 #include "ingen/Node.hpp"
+#include "ingen/Properties.hpp"
+#include "ingen/Resource.hpp"
 #include "ingen/URIs.hpp"
+#include "ingen/paths.hpp"
 
 #include <cassert>
 #include <cstdint>
+#include <map>
 #include <string>
 #include <utility>
 
diff --git a/src/client/PluginModel.cpp b/src/client/PluginModel.cpp
index d2347027..ca044114 100644
--- a/src/client/PluginModel.cpp
+++ b/src/client/PluginModel.cpp
@@ -17,10 +17,8 @@
 #include "ingen/client/PluginModel.hpp"
 
 #include "ingen/Atom.hpp"
-#include "ingen/client/GraphModel.hpp"
 #include "ingen/client/PluginUI.hpp"
-#include "ingen_config.h"
-#include "raul/Path.hpp"
+#include "lv2/core/lv2.h"
 
 #include <boost/optional/optional.hpp>
 
diff --git a/src/client/PluginUI.cpp b/src/client/PluginUI.cpp
index 122c2af6..7292d8b2 100644
--- a/src/client/PluginUI.cpp
+++ b/src/client/PluginUI.cpp
@@ -16,13 +16,20 @@
 
 #include "ingen/client/PluginUI.hpp"
 
-#include "ingen/Interface.hpp"
+#include "ingen/Atom.hpp"
+#include "ingen/Forge.hpp"
 #include "ingen/Log.hpp"
+#include "ingen/URI.hpp"
 #include "ingen/URIs.hpp"
+#include "ingen/World.hpp"
 #include "ingen/client/BlockModel.hpp"
 #include "ingen/client/PortModel.hpp"
 #include "lv2/atom/atom.h"
+#include "lv2/core/lv2.h"
 #include "lv2/ui/ui.h"
+#include "raul/Symbol.hpp"
+
+#include <sigc++/signal.h>
 
 #include <cstring>
 #include <memory>
diff --git a/src/client/PortModel.cpp b/src/client/PortModel.cpp
index d58a2b49..0d695a54 100644
--- a/src/client/PortModel.cpp
+++ b/src/client/PortModel.cpp
@@ -14,10 +14,16 @@
   along with Ingen.  If not, see <http://www.gnu.org/licenses/>.
 */
 
-#include "ingen/client/BlockModel.hpp"
 #include "ingen/client/PortModel.hpp"
 
+#include "ingen/Properties.hpp"
+#include "ingen/URI.hpp"
+#include "ingen/URIs.hpp"
+#include "ingen/client/ObjectModel.hpp"
+#include "lv2/urid/urid.h"
+
 #include <cstdint>
+#include <map>
 #include <memory>
 #include <utility>
 
diff --git a/src/client/ingen_client.cpp b/src/client/ingen_client.cpp
index c6c49080..f4d6bbc7 100644
--- a/src/client/ingen_client.cpp
+++ b/src/client/ingen_client.cpp
@@ -15,18 +15,26 @@
 */
 
 #include "ingen/Module.hpp"
-#include "ingen/World.hpp"
 
-struct IngenClientModule : public ingen::Module {
+namespace ingen {
+
+class World;
+
+namespace client {
+
+struct ClientModule : public ingen::Module {
 	void load(ingen::World& world) override {}
 };
 
+} // namespace client
+} // namespace ingen
+
 extern "C" {
 
 ingen::Module*
 ingen_module_load()
 {
-	return new IngenClientModule();
+	return new ingen::client::ClientModule();
 }
 
 } // extern "C"