Move appropriate client headers to public include directory.

git-svn-id: http://svn.drobilla.net/lad/trunk/ingen@3319 a436a847-0d15-0410-975c-d299462d15a1

62 files changed, 142 insertions, 123 deletions

diff --git a/src/client/ClientStore.hpp b/include/ingen/client/ClientStore.hpp
index 011bb38c..75f12ec1 100644
--- a/src/client/ClientStore.hpp
+++ b/include/ingen/client/ClientStore.hpp
@@ -22,14 +22,15 @@
 #include <list>
 #include <string>
 
-#include "raul/SharedPtr.hpp"
-
-#include "ingen/ServerInterface.hpp"
 #include "raul/Path.hpp"
 #include "raul/PathTable.hpp"
+#include "raul/SharedPtr.hpp"
 #include "raul/TableImpl.hpp"
+
+#include "ingen/ServerInterface.hpp"
+#include "ingen/client/signal.hpp"
+#include "shared/LV2URIMap.hpp"
 #include "shared/Store.hpp"
-#include "client/signal.hpp"
 
 namespace Raul { class Atom; }
 
diff --git a/src/client/ConnectionModel.hpp b/include/ingen/client/ConnectionModel.hpp
index 9a51d309..1c719914 100644
--- a/src/client/ConnectionModel.hpp
+++ b/include/ingen/client/ConnectionModel.hpp
@@ -24,8 +24,7 @@
 #include "raul/SharedPtr.hpp"
 
 #include "ingen/Connection.hpp"
-
-#include "client/PortModel.hpp"
+#include "ingen/client/PortModel.hpp"
 
 namespace Ingen {
 namespace Client {
diff --git a/src/client/NodeModel.hpp b/include/ingen/client/NodeModel.hpp
index e57d02d6..efc8514a 100644
--- a/src/client/NodeModel.hpp
+++ b/include/ingen/client/NodeModel.hpp
@@ -21,12 +21,14 @@
 #include <cstdlib>
 #include <string>
 #include <vector>
+
 #include "raul/SharedPtr.hpp"
+
 #include "ingen/Node.hpp"
 #include "ingen/Port.hpp"
-#include "ObjectModel.hpp"
-#include "PortModel.hpp"
-#include "PluginModel.hpp"
+#include "ingen/client/ObjectModel.hpp"
+#include "ingen/client/PortModel.hpp"
+#include "ingen/client/PluginModel.hpp"
 
 namespace Raul { class Path; }
 
diff --git a/src/client/ObjectModel.hpp b/include/ingen/client/ObjectModel.hpp
index 18f013fa..7a975637 100644
--- a/src/client/ObjectModel.hpp
+++ b/include/ingen/client/ObjectModel.hpp
@@ -26,8 +26,8 @@
 #include "raul/SharedPtr.hpp"
 #include "raul/URI.hpp"
 
-#include "client/signal.hpp"
 #include "ingen/GraphObject.hpp"
+#include "ingen/client/signal.hpp"
 #include "shared/ResourceImpl.hpp"
 
 namespace Ingen {
diff --git a/src/client/PatchModel.hpp b/include/ingen/client/PatchModel.hpp
index 1b9e4a48..3e873cfc 100644
--- a/src/client/PatchModel.hpp
+++ b/include/ingen/client/PatchModel.hpp
@@ -21,7 +21,7 @@
 #include "raul/SharedPtr.hpp"
 
 #include "ingen/Patch.hpp"
-#include "NodeModel.hpp"
+#include "ingen/client/NodeModel.hpp"
 
 namespace Ingen {
 
diff --git a/src/client/PluginModel.hpp b/include/ingen/client/PluginModel.hpp
index c76960fe..99657fbc 100644
--- a/src/client/PluginModel.hpp
+++ b/include/ingen/client/PluginModel.hpp
@@ -23,11 +23,11 @@
 #include "raul/Symbol.hpp"
 #include "sord/sordmm.hpp"
 
-#include "ingen/ServerInterface.hpp"
 #include "ingen/Plugin.hpp"
-#include "shared/World.hpp"
+#include "ingen/ServerInterface.hpp"
+#include "ingen/client/signal.hpp"
 #include "shared/ResourceImpl.hpp"
-#include "client/signal.hpp"
+#include "shared/World.hpp"
 
 namespace Ingen {
 
diff --git a/src/client/PluginUI.hpp b/include/ingen/client/PluginUI.hpp
index b93f4f3a..bf0094e7 100644
--- a/src/client/PluginUI.hpp
+++ b/include/ingen/client/PluginUI.hpp
@@ -24,7 +24,7 @@
 
 #include "suil/suil.h"
 
-#include "LV2Features.hpp"
+#include "shared/LV2Features.hpp"
 
 namespace Ingen {
 
diff --git a/src/client/PortModel.hpp b/include/ingen/client/PortModel.hpp
index fd4a679e..e8e74f8a 100644
--- a/src/client/PortModel.hpp
+++ b/include/ingen/client/PortModel.hpp
@@ -20,10 +20,12 @@
 
 #include <cstdlib>
 #include <string>
-#include "raul/log.hpp"
+
 #include "raul/SharedPtr.hpp"
+#include "raul/log.hpp"
+
 #include "ingen/Port.hpp"
-#include "ObjectModel.hpp"
+#include "ingen/client/ObjectModel.hpp"
 
 namespace Raul { class Path; }
 
diff --git a/src/client/SigClientInterface.hpp b/include/ingen/client/SigClientInterface.hpp
index 116ec0dc..2241425b 100644
--- a/src/client/SigClientInterface.hpp
+++ b/include/ingen/client/SigClientInterface.hpp
@@ -22,8 +22,8 @@
 
 #include "raul/Path.hpp"
 
-#include "client/signal.hpp"
 #include "ingen/ClientInterface.hpp"
+#include "ingen/client/signal.hpp"
 
 namespace Ingen {
 namespace Client {
diff --git a/src/client/ThreadedSigClientInterface.hpp b/include/ingen/client/ThreadedSigClientInterface.hpp
index 373fb14d..c30b62da 100644
--- a/src/client/ThreadedSigClientInterface.hpp
+++ b/include/ingen/client/ThreadedSigClientInterface.hpp
@@ -18,15 +18,19 @@
 #ifndef INGEN_CLIENT_THREADEDSIGCLIENTINTERFACE_HPP
 #define INGEN_CLIENT_THREADEDSIGCLIENTINTERFACE_HPP
 
-#include <inttypes.h>
+#include <stdint.h>
+
 #include <string>
+
 #include <sigc++/sigc++.h>
 #include <glibmm/thread.h>
+
 #include "raul/Atom.hpp"
-#include "ingen/ClientInterface.hpp"
-#include "SigClientInterface.hpp"
 #include "raul/SRSWQueue.hpp"
 
+#include "ingen/ClientInterface.hpp"
+#include "ingen/client/SigClientInterface.hpp"
+
 /** Returns nothing and takes no parameters (because they have all been bound) */
 typedef sigc::slot<void> Closure;
 
diff --git a/src/client/signal.hpp b/include/ingen/client/signal.hpp
index f40c6a57..f40c6a57 100644
--- a/src/client/signal.hpp
+++ b/include/ingen/client/signal.hpp
diff --git a/src/client/ClientStore.cpp b/src/client/ClientStore.cpp
index 681893bb..2d7f0a4b 100644
--- a/src/client/ClientStore.cpp
+++ b/src/client/ClientStore.cpp
@@ -20,15 +20,14 @@
 
 #include "shared/LV2URIMap.hpp"
 
-#include "ClientStore.hpp"
-#include "ConnectionModel.hpp"
-#include "NodeModel.hpp"
-#include "ObjectModel.hpp"
-#include "PatchModel.hpp"
-#include "PatchModel.hpp"
-#include "PluginModel.hpp"
-#include "PortModel.hpp"
-#include "SigClientInterface.hpp"
+#include "ingen/client/ClientStore.hpp"
+#include "ingen/client/ConnectionModel.hpp"
+#include "ingen/client/NodeModel.hpp"
+#include "ingen/client/ObjectModel.hpp"
+#include "ingen/client/PatchModel.hpp"
+#include "ingen/client/PluginModel.hpp"
+#include "ingen/client/PortModel.hpp"
+#include "ingen/client/SigClientInterface.hpp"
 
 #define LOG(s) s << "[ClientStore] "
 
diff --git a/src/client/NodeModel.cpp b/src/client/NodeModel.cpp
index 8adbfe90..ff9a92cd 100644
--- a/src/client/NodeModel.cpp
+++ b/src/client/NodeModel.cpp
@@ -21,7 +21,7 @@
 #include "ingen/Port.hpp"
 #include "shared/World.hpp"
 #include "shared/LV2URIMap.hpp"
-#include "NodeModel.hpp"
+#include "ingen/client/NodeModel.hpp"
 
 using namespace std;
 using namespace Raul;
diff --git a/src/client/ObjectModel.cpp b/src/client/ObjectModel.cpp
index 2478e786..69b40154 100644
--- a/src/client/ObjectModel.cpp
+++ b/src/client/ObjectModel.cpp
@@ -18,7 +18,7 @@
 #include "raul/TableImpl.hpp"
 #include "ingen/GraphObject.hpp"
 #include "shared/LV2URIMap.hpp"
-#include "ObjectModel.hpp"
+#include "ingen/client/ObjectModel.hpp"
 
 using namespace std;
 using namespace Raul;
diff --git a/src/client/PatchModel.cpp b/src/client/PatchModel.cpp
index 5dcf4ab0..1e02e747 100644
--- a/src/client/PatchModel.cpp
+++ b/src/client/PatchModel.cpp
@@ -17,11 +17,13 @@
 
 #include <cassert>
 #include "raul/log.hpp"
+
 #include "shared/LV2URIMap.hpp"
-#include "PatchModel.hpp"
-#include "NodeModel.hpp"
-#include "ConnectionModel.hpp"
-#include "ClientStore.hpp"
+
+#include "ingen/client/PatchModel.hpp"
+#include "ingen/client/NodeModel.hpp"
+#include "ingen/client/ConnectionModel.hpp"
+#include "ingen/client/ClientStore.hpp"
 
 using namespace std;
 using namespace Raul;
diff --git a/src/client/PluginModel.cpp b/src/client/PluginModel.cpp
index 59f68caa..c9395ccd 100644
--- a/src/client/PluginModel.cpp
+++ b/src/client/PluginModel.cpp
@@ -22,11 +22,12 @@
 #include "raul/Atom.hpp"
 #include "raul/Path.hpp"
 
-#include "PatchModel.hpp"
-#include "PluginModel.hpp"
-#include "PluginUI.hpp"
 #include "shared/LV2URIMap.hpp"
 
+#include "ingen/client/PatchModel.hpp"
+#include "ingen/client/PluginModel.hpp"
+#include "ingen/client/PluginUI.hpp"
+
 using namespace std;
 using namespace Raul;
 
diff --git a/src/client/PluginUI.cpp b/src/client/PluginUI.cpp
index 466ee320..cfcad147 100644
--- a/src/client/PluginUI.cpp
+++ b/src/client/PluginUI.cpp
@@ -24,9 +24,9 @@
 #include "shared/LV2Atom.hpp"
 #include "shared/LV2URIMap.hpp"
 
-#include "NodeModel.hpp"
-#include "PluginUI.hpp"
-#include "PortModel.hpp"
+#include "ingen/client/NodeModel.hpp"
+#include "ingen/client/PluginUI.hpp"
+#include "ingen/client/PortModel.hpp"
 
 using namespace std;
 using namespace Raul;
diff --git a/src/client/PortModel.cpp b/src/client/PortModel.cpp
index f6edba20..50731ef0 100644
--- a/src/client/PortModel.cpp
+++ b/src/client/PortModel.cpp
@@ -16,8 +16,8 @@
  */
 
 #include "shared/LV2URIMap.hpp"
-#include "PortModel.hpp"
-#include "NodeModel.hpp"
+#include "ingen/client/PortModel.hpp"
+#include "ingen/client/NodeModel.hpp"
 
 namespace Ingen {
 namespace Client {
diff --git a/src/client/ThreadedSigClientInterface.cpp b/src/client/ThreadedSigClientInterface.cpp
index 5a0fe93d..fa452902 100644
--- a/src/client/ThreadedSigClientInterface.cpp
+++ b/src/client/ThreadedSigClientInterface.cpp
@@ -19,7 +19,7 @@
 #include "ingen/Patch.hpp"
 #include "ingen/Plugin.hpp"
 #include "ingen/Port.hpp"
-#include "ThreadedSigClientInterface.hpp"
+#include "ingen/client/ThreadedSigClientInterface.hpp"
 
 using namespace std;
 using namespace Raul;
diff --git a/src/client/wscript b/src/client/wscript
index 99b1c1b6..9da924ec 100644
--- a/src/client/wscript
+++ b/src/client/wscript
@@ -31,7 +31,7 @@ def build(bld):
         '''
 
     obj.includes        = ['.', '..', '../..', '../../include']
-    obj.export_includes = ['.']
+    obj.export_includes = ['../../include']
     obj.name            = 'libingen_client'
     obj.target          = 'ingen_client'
     obj.install_path    = '${LIBDIR}'
diff --git a/src/gui/App.cpp b/src/gui/App.cpp
index f1e590cb..d76ca7d6 100644
--- a/src/gui/App.cpp
+++ b/src/gui/App.cpp
@@ -32,10 +32,10 @@
 #include "ingen/ServerInterface.hpp"
 #include "shared/runtime_paths.hpp"
 #include "shared/LV2URIMap.hpp"
-#include "client/ObjectModel.hpp"
-#include "client/PatchModel.hpp"
-#include "client/ClientStore.hpp"
-#include "client/SigClientInterface.hpp"
+#include "ingen/client/ObjectModel.hpp"
+#include "ingen/client/PatchModel.hpp"
+#include "ingen/client/ClientStore.hpp"
+#include "ingen/client/SigClientInterface.hpp"
 #include "NodeModule.hpp"
 #include "ControlPanel.hpp"
 #include "SubpatchModule.hpp"
diff --git a/src/gui/BreadCrumbs.cpp b/src/gui/BreadCrumbs.cpp
index 6e7f9b39..65c9630e 100644
--- a/src/gui/BreadCrumbs.cpp
+++ b/src/gui/BreadCrumbs.cpp
@@ -15,7 +15,8 @@
  * 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
-#include "client/SigClientInterface.hpp"
+#include "ingen/client/SigClientInterface.hpp"
+
 #include "App.hpp"
 #include "BreadCrumbs.hpp"
 
diff --git a/src/gui/BreadCrumbs.hpp b/src/gui/BreadCrumbs.hpp
index 700ac226..69c82a7c 100644
--- a/src/gui/BreadCrumbs.hpp
+++ b/src/gui/BreadCrumbs.hpp
@@ -25,7 +25,7 @@
 #include "raul/Path.hpp"
 #include "raul/SharedPtr.hpp"
 
-#include "client/PatchModel.hpp"
+#include "ingen/client/PatchModel.hpp"
 
 #include "PatchView.hpp"
 
diff --git a/src/gui/Configuration.cpp b/src/gui/Configuration.cpp
index 1fcbfe88..f0e9a6ad 100644
--- a/src/gui/Configuration.cpp
+++ b/src/gui/Configuration.cpp
@@ -21,8 +21,8 @@
 #include <fstream>
 #include <map>
 #include "raul/log.hpp"
-#include "client/PortModel.hpp"
-#include "client/PluginModel.hpp"
+#include "ingen/client/PortModel.hpp"
+#include "ingen/client/PluginModel.hpp"
 #include "serialisation/Parser.hpp"
 #include "shared/LV2URIMap.hpp"
 #include "flowcanvas/Port.hpp"
diff --git a/src/gui/ConnectWindow.cpp b/src/gui/ConnectWindow.cpp
index 56acc52b..04cd9bc0 100644
--- a/src/gui/ConnectWindow.cpp
+++ b/src/gui/ConnectWindow.cpp
@@ -29,9 +29,9 @@
 #include "shared/Module.hpp"
 #include "shared/World.hpp"
 #include "server/Engine.hpp"
-#include "client/ClientStore.hpp"
-#include "client/PatchModel.hpp"
-#include "client/ThreadedSigClientInterface.hpp"
+#include "ingen/client/ClientStore.hpp"
+#include "ingen/client/PatchModel.hpp"
+#include "ingen/client/ThreadedSigClientInterface.hpp"
 
 #include "App.hpp"
 #include "ConnectWindow.hpp"
diff --git a/src/gui/Connection.cpp b/src/gui/Connection.cpp
index f9e079c0..60380537 100644
--- a/src/gui/Connection.cpp
+++ b/src/gui/Connection.cpp
@@ -15,10 +15,11 @@
  * 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
-#include "client/ConnectionModel.hpp"
 #include "Connection.hpp"
 #include "Port.hpp"
 
+#include "ingen/client/ConnectionModel.hpp"
+
 using namespace std;
 
 namespace Ingen {
diff --git a/src/gui/ControlPanel.cpp b/src/gui/ControlPanel.cpp
index 667157ce..7916af9e 100644
--- a/src/gui/ControlPanel.cpp
+++ b/src/gui/ControlPanel.cpp
@@ -18,9 +18,9 @@
 #include "ingen/ServerInterface.hpp"
 #include "ingen/PortType.hpp"
 #include "shared/LV2URIMap.hpp"
-#include "client/NodeModel.hpp"
-#include "client/PortModel.hpp"
-#include "client/PluginModel.hpp"
+#include "ingen/client/NodeModel.hpp"
+#include "ingen/client/PortModel.hpp"
+#include "ingen/client/PluginModel.hpp"
 #include "App.hpp"
 #include "ControlPanel.hpp"
 #include "Controls.hpp"
diff --git a/src/gui/Controls.cpp b/src/gui/Controls.cpp
index 6ab0b3c3..98b1c726 100644
--- a/src/gui/Controls.cpp
+++ b/src/gui/Controls.cpp
@@ -20,9 +20,9 @@
 #include "raul/log.hpp"
 #include "ingen/ServerInterface.hpp"
 #include "shared/LV2URIMap.hpp"
-#include "client/PluginModel.hpp"
-#include "client/NodeModel.hpp"
-#include "client/PortModel.hpp"
+#include "ingen/client/PluginModel.hpp"
+#include "ingen/client/NodeModel.hpp"
+#include "ingen/client/PortModel.hpp"
 #include "App.hpp"
 #include "ControlPanel.hpp"
 #include "Controls.hpp"
diff --git a/src/gui/Controls.hpp b/src/gui/Controls.hpp
index 66969393..7ea5e6c3 100644
--- a/src/gui/Controls.hpp
+++ b/src/gui/Controls.hpp
@@ -24,7 +24,7 @@
 
 #include "raul/SharedPtr.hpp"
 
-#include "client/PortModel.hpp"
+#include "ingen/client/PortModel.hpp"
 
 namespace Ingen { namespace Client { class PortModel; } }
 
diff --git a/src/gui/LoadPatchWindow.cpp b/src/gui/LoadPatchWindow.cpp
index 1b5e3c80..c15512a9 100644
--- a/src/gui/LoadPatchWindow.cpp
+++ b/src/gui/LoadPatchWindow.cpp
@@ -22,9 +22,9 @@
 #include <glibmm/miscutils.h>
 #include "ingen/ServerInterface.hpp"
 #include "shared/LV2URIMap.hpp"
-#include "client/NodeModel.hpp"
-#include "client/PatchModel.hpp"
-#include "client/ClientStore.hpp"
+#include "ingen/client/NodeModel.hpp"
+#include "ingen/client/PatchModel.hpp"
+#include "ingen/client/ClientStore.hpp"
 #include "shared/runtime_paths.hpp"
 #include "serialisation/names.hpp"
 #include "App.hpp"
diff --git a/src/gui/LoadPluginWindow.cpp b/src/gui/LoadPluginWindow.cpp
index 135f63f1..5ee2585f 100644
--- a/src/gui/LoadPluginWindow.cpp
+++ b/src/gui/LoadPluginWindow.cpp
@@ -15,19 +15,23 @@
  * 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
+#include <stddef.h>
+
 #include <cassert>
 #include <algorithm>
-#include <ctype.h>
-#include "ingen-config.h"
+
 #include "ingen/ServerInterface.hpp"
+#include "ingen/client/ClientStore.hpp"
+#include "ingen/client/PatchModel.hpp"
 #include "shared/LV2URIMap.hpp"
-#include "client/PatchModel.hpp"
-#include "client/ClientStore.hpp"
+
 #include "App.hpp"
 #include "LoadPluginWindow.hpp"
-#include "PatchWindow.hpp"
-#include "PatchView.hpp"
 #include "PatchCanvas.hpp"
+#include "PatchView.hpp"
+#include "PatchWindow.hpp"
+
+#include "ingen-config.h"
 
 using namespace std;
 using namespace Raul;
diff --git a/src/gui/LoadPluginWindow.hpp b/src/gui/LoadPluginWindow.hpp
index c637db82..7029bdc3 100644
--- a/src/gui/LoadPluginWindow.hpp
+++ b/src/gui/LoadPluginWindow.hpp
@@ -27,7 +27,7 @@
 
 #include "ingen-config.h"
 #include "ingen/GraphObject.hpp"
-#include "client/ClientStore.hpp"
+#include "ingen/client/ClientStore.hpp"
 
 #include "Window.hpp"
 
diff --git a/src/gui/LoadRemotePatchWindow.cpp b/src/gui/LoadRemotePatchWindow.cpp
index 0ca984b3..10689bd3 100644
--- a/src/gui/LoadRemotePatchWindow.cpp
+++ b/src/gui/LoadRemotePatchWindow.cpp
@@ -18,7 +18,7 @@
 #include <sys/types.h>
 #include <dirent.h>
 #include <boost/optional/optional.hpp>
-#include "client/PatchModel.hpp"
+#include "ingen/client/PatchModel.hpp"
 #include "ingen/ServerInterface.hpp"
 #include "shared/World.hpp"
 #include "App.hpp"
diff --git a/src/gui/NewSubpatchWindow.cpp b/src/gui/NewSubpatchWindow.cpp
index 4ea7c172..d0c0f0da 100644
--- a/src/gui/NewSubpatchWindow.cpp
+++ b/src/gui/NewSubpatchWindow.cpp
@@ -18,8 +18,8 @@
 #include "App.hpp"
 #include "ingen/ServerInterface.hpp"
 #include "shared/LV2URIMap.hpp"
-#include "client/PatchModel.hpp"
-#include "client/ClientStore.hpp"
+#include "ingen/client/PatchModel.hpp"
+#include "ingen/client/ClientStore.hpp"
 #include "NewSubpatchWindow.hpp"
 #include "PatchView.hpp"
 
diff --git a/src/gui/NodeControlWindow.cpp b/src/gui/NodeControlWindow.cpp
index 547c2e1f..29ea2267 100644
--- a/src/gui/NodeControlWindow.cpp
+++ b/src/gui/NodeControlWindow.cpp
@@ -18,7 +18,7 @@
 #include <cmath>
 #include "ingen/ServerInterface.hpp"
 #include "shared/LV2URIMap.hpp"
-#include "client/NodeModel.hpp"
+#include "ingen/client/NodeModel.hpp"
 #include "App.hpp"
 #include "NodeControlWindow.hpp"
 #include "WidgetFactory.hpp"
diff --git a/src/gui/NodeMenu.cpp b/src/gui/NodeMenu.cpp
index e1d59f8f..c55050cc 100644
--- a/src/gui/NodeMenu.cpp
+++ b/src/gui/NodeMenu.cpp
@@ -18,8 +18,8 @@
 #include <gtkmm.h>
 #include "ingen/ServerInterface.hpp"
 #include "shared/LV2URIMap.hpp"
-#include "client/NodeModel.hpp"
-#include "client/PluginModel.hpp"
+#include "ingen/client/NodeModel.hpp"
+#include "ingen/client/PluginModel.hpp"
 #include "App.hpp"
 #include "NodeMenu.hpp"
 #include "WindowFactory.hpp"
diff --git a/src/gui/NodeMenu.hpp b/src/gui/NodeMenu.hpp
index 78ad886f..382bd164 100644
--- a/src/gui/NodeMenu.hpp
+++ b/src/gui/NodeMenu.hpp
@@ -21,7 +21,7 @@
 #include <string>
 #include <gtkmm.h>
 #include "raul/SharedPtr.hpp"
-#include "client/NodeModel.hpp"
+#include "ingen/client/NodeModel.hpp"
 #include "ObjectMenu.hpp"
 
 using Ingen::Client::NodeModel;
diff --git a/src/gui/NodeModule.cpp b/src/gui/NodeModule.cpp
index c4d75519..a0a147c8 100644
--- a/src/gui/NodeModule.cpp
+++ b/src/gui/NodeModule.cpp
@@ -20,10 +20,10 @@
 #include "raul/Atom.hpp"
 #include "ingen/ServerInterface.hpp"
 #include "shared/LV2URIMap.hpp"
-#include "client/PatchModel.hpp"
-#include "client/NodeModel.hpp"
-#include "client/PluginModel.hpp"
-#include "client/PluginUI.hpp"
+#include "ingen/client/PatchModel.hpp"
+#include "ingen/client/NodeModel.hpp"
+#include "ingen/client/PluginModel.hpp"
+#include "ingen/client/PluginUI.hpp"
 #include "App.hpp"
 #include "WidgetFactory.hpp"
 #include "NodeControlWindow.hpp"
diff --git a/src/gui/ObjectMenu.cpp b/src/gui/ObjectMenu.cpp
index 2991f2d1..2fa14778 100644
--- a/src/gui/ObjectMenu.cpp
+++ b/src/gui/ObjectMenu.cpp
@@ -19,7 +19,7 @@
 #include <gtkmm.h>
 #include "ingen/ServerInterface.hpp"
 #include "shared/LV2URIMap.hpp"
-#include "client/ObjectModel.hpp"
+#include "ingen/client/ObjectModel.hpp"
 #include "App.hpp"
 #include "ObjectMenu.hpp"
 #include "WindowFactory.hpp"
diff --git a/src/gui/ObjectMenu.hpp b/src/gui/ObjectMenu.hpp
index 8bd5fc97..91743c3a 100644
--- a/src/gui/ObjectMenu.hpp
+++ b/src/gui/ObjectMenu.hpp
@@ -24,7 +24,7 @@
 
 #include "raul/SharedPtr.hpp"
 
-#include "client/ObjectModel.hpp"
+#include "ingen/client/ObjectModel.hpp"
 
 using Ingen::Client::ObjectModel;
 
diff --git a/src/gui/PatchCanvas.cpp b/src/gui/PatchCanvas.cpp
index a994662d..6cf461e7 100644
--- a/src/gui/PatchCanvas.cpp
+++ b/src/gui/PatchCanvas.cpp
@@ -27,10 +27,10 @@
 #include "shared/Builder.hpp"
 #include "shared/ClashAvoider.hpp"
 #include "serialisation/Serialiser.hpp"
-#include "client/PluginModel.hpp"
-#include "client/PatchModel.hpp"
-#include "client/NodeModel.hpp"
-#include "client/ClientStore.hpp"
+#include "ingen/client/PluginModel.hpp"
+#include "ingen/client/PatchModel.hpp"
+#include "ingen/client/NodeModel.hpp"
+#include "ingen/client/ClientStore.hpp"
 #include "shared/World.hpp"
 #include "App.hpp"
 #include "PatchCanvas.hpp"
diff --git a/src/gui/PatchCanvas.hpp b/src/gui/PatchCanvas.hpp
index 1f831624..2e876e4f 100644
--- a/src/gui/PatchCanvas.hpp
+++ b/src/gui/PatchCanvas.hpp
@@ -31,7 +31,7 @@
 #include "raul/SharedPtr.hpp"
 #include "raul/Path.hpp"
 
-#include "client/ConnectionModel.hpp"
+#include "ingen/client/ConnectionModel.hpp"
 #include "ingen/GraphObject.hpp"
 #include "NodeModule.hpp"
 
diff --git a/src/gui/PatchPortModule.cpp b/src/gui/PatchPortModule.cpp
index df74626b..14861069 100644
--- a/src/gui/PatchPortModule.cpp
+++ b/src/gui/PatchPortModule.cpp
@@ -20,8 +20,8 @@
 #include "PatchPortModule.hpp"
 #include "ingen/ServerInterface.hpp"
 #include "shared/LV2URIMap.hpp"
-#include "client/PatchModel.hpp"
-#include "client/NodeModel.hpp"
+#include "ingen/client/PatchModel.hpp"
+#include "ingen/client/NodeModel.hpp"
 #include "App.hpp"
 #include "Configuration.hpp"
 #include "WidgetFactory.hpp"
diff --git a/src/gui/PatchTreeWindow.cpp b/src/gui/PatchTreeWindow.cpp
index 0e19590f..18d6610a 100644
--- a/src/gui/PatchTreeWindow.cpp
+++ b/src/gui/PatchTreeWindow.cpp
@@ -19,8 +19,8 @@
 #include "raul/Path.hpp"
 #include "ingen/ServerInterface.hpp"
 #include "shared/LV2URIMap.hpp"
-#include "client/ClientStore.hpp"
-#include "client/PatchModel.hpp"
+#include "ingen/client/ClientStore.hpp"
+#include "ingen/client/PatchModel.hpp"
 #include "App.hpp"
 #include "PatchTreeWindow.hpp"
 #include "SubpatchModule.hpp"
diff --git a/src/gui/PatchView.cpp b/src/gui/PatchView.cpp
index 6431afb4..f15d0667 100644
--- a/src/gui/PatchView.cpp
+++ b/src/gui/PatchView.cpp
@@ -20,7 +20,7 @@
 #include "raul/log.hpp"
 #include "ingen/ServerInterface.hpp"
 #include "shared/LV2URIMap.hpp"
-#include "client/PatchModel.hpp"
+#include "ingen/client/PatchModel.hpp"
 #include "App.hpp"
 #include "PatchView.hpp"
 #include "PatchCanvas.hpp"
diff --git a/src/gui/PatchWindow.cpp b/src/gui/PatchWindow.cpp
index 0bbeddfa..657d2874 100644
--- a/src/gui/PatchWindow.cpp
+++ b/src/gui/PatchWindow.cpp
@@ -24,8 +24,8 @@
 #include "raul/AtomRDF.hpp"
 #include "ingen/ServerInterface.hpp"
 #include "shared/LV2URIMap.hpp"
-#include "client/PatchModel.hpp"
-#include "client/ClientStore.hpp"
+#include "ingen/client/PatchModel.hpp"
+#include "ingen/client/ClientStore.hpp"
 #include "serialisation/names.hpp"
 #include "App.hpp"
 #include "PatchCanvas.hpp"
diff --git a/src/gui/Port.cpp b/src/gui/Port.cpp
index 484c461b..330e051a 100644
--- a/src/gui/Port.cpp
+++ b/src/gui/Port.cpp
@@ -20,8 +20,8 @@
 #include "flowcanvas/Module.hpp"
 #include "ingen/ServerInterface.hpp"
 #include "shared/LV2URIMap.hpp"
-#include "client/PatchModel.hpp"
-#include "client/PortModel.hpp"
+#include "ingen/client/PatchModel.hpp"
+#include "ingen/client/PortModel.hpp"
 #include "App.hpp"
 #include "Configuration.hpp"
 #include "WidgetFactory.hpp"
diff --git a/src/gui/Port.hpp b/src/gui/Port.hpp
index a84f9e69..3d8fc763 100644
--- a/src/gui/Port.hpp
+++ b/src/gui/Port.hpp
@@ -24,7 +24,7 @@
 #include "raul/SharedPtr.hpp"
 #include "raul/WeakPtr.hpp"
 
-namespace Raul { class Atom; }
+namespace Raul { class Atom; class URI; }
 
 namespace Ingen {
 
diff --git a/src/gui/PortMenu.cpp b/src/gui/PortMenu.cpp
index a5d00a3e..973f7277 100644
--- a/src/gui/PortMenu.cpp
+++ b/src/gui/PortMenu.cpp
@@ -20,8 +20,8 @@
 #include "raul/SharedPtr.hpp"
 #include "ingen/ServerInterface.hpp"
 #include "shared/LV2URIMap.hpp"
-#include "client/PatchModel.hpp"
-#include "client/PortModel.hpp"
+#include "ingen/client/PatchModel.hpp"
+#include "ingen/client/PortModel.hpp"
 #include "App.hpp"
 #include "PortMenu.hpp"
 #include "WindowFactory.hpp"
diff --git a/src/gui/PortMenu.hpp b/src/gui/PortMenu.hpp
index ed06f571..5efb8e2a 100644
--- a/src/gui/PortMenu.hpp
+++ b/src/gui/PortMenu.hpp
@@ -21,7 +21,7 @@
 #include <string>
 #include <gtkmm.h>
 #include "raul/SharedPtr.hpp"
-#include "client/PortModel.hpp"
+#include "ingen/client/PortModel.hpp"
 #include "ObjectMenu.hpp"
 
 using Ingen::Client::PortModel;
diff --git a/src/gui/PortPropertiesWindow.cpp b/src/gui/PortPropertiesWindow.cpp
index cdc4c17a..a584939c 100644
--- a/src/gui/PortPropertiesWindow.cpp
+++ b/src/gui/PortPropertiesWindow.cpp
@@ -19,8 +19,8 @@
 #include <string>
 #include "ingen/ServerInterface.hpp"
 #include "shared/LV2URIMap.hpp"
-#include "client/NodeModel.hpp"
-#include "client/PluginModel.hpp"
+#include "ingen/client/NodeModel.hpp"
+#include "ingen/client/PluginModel.hpp"
 #include "App.hpp"
 #include "Controls.hpp"
 #include "PortPropertiesWindow.hpp"
diff --git a/src/gui/PortPropertiesWindow.hpp b/src/gui/PortPropertiesWindow.hpp
index 74c26e7b..34a639f1 100644
--- a/src/gui/PortPropertiesWindow.hpp
+++ b/src/gui/PortPropertiesWindow.hpp
@@ -22,7 +22,7 @@
 
 #include "raul/SharedPtr.hpp"
 
-#include "client/PortModel.hpp"
+#include "ingen/client/PortModel.hpp"
 
 #include "Window.hpp"
 
diff --git a/src/gui/PropertiesWindow.cpp b/src/gui/PropertiesWindow.cpp
index 2886b9a9..dea0e78f 100644
--- a/src/gui/PropertiesWindow.cpp
+++ b/src/gui/PropertiesWindow.cpp
@@ -19,8 +19,8 @@
 #include <string>
 #include "raul/log.hpp"
 #include "shared/World.hpp"
-#include "client/NodeModel.hpp"
-#include "client/PluginModel.hpp"
+#include "ingen/client/NodeModel.hpp"
+#include "ingen/client/PluginModel.hpp"
 #include "App.hpp"
 #include "PropertiesWindow.hpp"
 
diff --git a/src/gui/PropertiesWindow.hpp b/src/gui/PropertiesWindow.hpp
index e8e48fc7..43ed4023 100644
--- a/src/gui/PropertiesWindow.hpp
+++ b/src/gui/PropertiesWindow.hpp
@@ -22,7 +22,7 @@
 
 #include "raul/SharedPtr.hpp"
 
-#include "client/NodeModel.hpp"
+#include "ingen/client/NodeModel.hpp"
 
 #include "Window.hpp"
 
diff --git a/src/gui/RenameWindow.cpp b/src/gui/RenameWindow.cpp
index 65230c70..18fca3de 100644
--- a/src/gui/RenameWindow.cpp
+++ b/src/gui/RenameWindow.cpp
@@ -17,10 +17,13 @@
 
 #include <cassert>
 #include <string>
-#include "ingen/ServerInterface.hpp"
+
 #include "shared/LV2URIMap.hpp"
-#include "client/ObjectModel.hpp"
-#include "client/ClientStore.hpp"
+
+#include "ingen/ServerInterface.hpp"
+#include "ingen/client/ObjectModel.hpp"
+#include "ingen/client/ClientStore.hpp"
+
 #include "App.hpp"
 #include "RenameWindow.hpp"
 
diff --git a/src/gui/RenameWindow.hpp b/src/gui/RenameWindow.hpp
index d7a09e6d..e41b147b 100644
--- a/src/gui/RenameWindow.hpp
+++ b/src/gui/RenameWindow.hpp
@@ -22,7 +22,7 @@
 
 #include "raul/SharedPtr.hpp"
 
-#include "client/ObjectModel.hpp"
+#include "ingen/client/ObjectModel.hpp"
 
 #include "Window.hpp"
 
diff --git a/src/gui/SubpatchModule.cpp b/src/gui/SubpatchModule.cpp
index b0f43fa7..f26128af 100644
--- a/src/gui/SubpatchModule.cpp
+++ b/src/gui/SubpatchModule.cpp
@@ -18,7 +18,7 @@
 #include "SubpatchModule.hpp"
 #include <cassert>
 #include "ingen/ServerInterface.hpp"
-#include "client/PatchModel.hpp"
+#include "ingen/client/PatchModel.hpp"
 #include "App.hpp"
 #include "NodeModule.hpp"
 #include "NodeControlWindow.hpp"
diff --git a/src/gui/ThreadedLoader.cpp b/src/gui/ThreadedLoader.cpp
index 31f77893..3cba5f97 100644
--- a/src/gui/ThreadedLoader.cpp
+++ b/src/gui/ThreadedLoader.cpp
@@ -22,7 +22,7 @@
 #include "serialisation/names.hpp"
 #include "App.hpp"
 #include "ThreadedLoader.hpp"
-#include "client/PatchModel.hpp"
+#include "ingen/client/PatchModel.hpp"
 
 using namespace std;
 using namespace Raul;
diff --git a/src/gui/UploadPatchWindow.cpp b/src/gui/UploadPatchWindow.cpp
index ef014f31..9bf4ec52 100644
--- a/src/gui/UploadPatchWindow.cpp
+++ b/src/gui/UploadPatchWindow.cpp
@@ -23,11 +23,11 @@
 #include <curl/curl.h>
 #include "shared/World.hpp"
 #include "shared/LV2URIMap.hpp"
-#include "client/ClientStore.hpp"
+#include "ingen/client/ClientStore.hpp"
 #include "ingen/ServerInterface.hpp"
 #include "serialisation/Serialiser.hpp"
 #include "serialisation/names.hpp"
-#include "client/PatchModel.hpp"
+#include "ingen/client/PatchModel.hpp"
 #include "UploadPatchWindow.hpp"
 #include "App.hpp"
 #include "Configuration.hpp"
diff --git a/src/gui/UploadPatchWindow.hpp b/src/gui/UploadPatchWindow.hpp
index f0dce373..98d1b6c1 100644
--- a/src/gui/UploadPatchWindow.hpp
+++ b/src/gui/UploadPatchWindow.hpp
@@ -28,7 +28,7 @@
 #include "raul/Thread.hpp"
 #include "raul/AtomicInt.hpp"
 
-#include "client/PluginModel.hpp"
+#include "ingen/client/PluginModel.hpp"
 
 #include "Window.hpp"
 
diff --git a/src/gui/WindowFactory.cpp b/src/gui/WindowFactory.cpp
index 15788243..1bdda4c3 100644
--- a/src/gui/WindowFactory.cpp
+++ b/src/gui/WindowFactory.cpp
@@ -17,7 +17,7 @@
 
 #include <string>
 #include "ingen-config.h"
-#include "client/PatchModel.hpp"
+#include "ingen/client/PatchModel.hpp"
 #include "App.hpp"
 #include "WidgetFactory.hpp"
 #include "LoadPatchWindow.hpp"
diff --git a/src/ingen/main.cpp b/src/ingen/main.cpp
index 8df67e92..48f445a3 100644
--- a/src/ingen/main.cpp
+++ b/src/ingen/main.cpp
@@ -45,7 +45,7 @@
 #include "shared/Configuration.hpp"
 #include "shared/World.hpp"
 #include "shared/runtime_paths.hpp"
-#include "client/ThreadedSigClientInterface.hpp"
+#include "ingen/client/ThreadedSigClientInterface.hpp"
 #ifdef WITH_BINDINGS
 #include "bindings/ingen_bindings.hpp"
 #endif