Consistent local or installed includes for interface headers.

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

120 files changed, 198 insertions, 190 deletions

diff --git a/doc/reference.doxygen.in b/doc/reference.doxygen.in
index bf6ac870..b31da458 100644
--- a/doc/reference.doxygen.in
+++ b/doc/reference.doxygen.in
@@ -569,9 +569,8 @@ WARN_LOGFILE           =
 # with spaces.
 
 INPUT                  = \
+	@INGEN_SRCDIR@/include/ingen \
 	@INGEN_SRCDIR@/src/client \
-	@INGEN_SRCDIR@/src/common \
-	@INGEN_SRCDIR@/src/common/interface \
 	@INGEN_SRCDIR@/src/engine \
 	@INGEN_SRCDIR@/src/gui \
 	@INGEN_SRCDIR@/src/ingen \
diff --git a/src/common/interface/ClientInterface.hpp b/include/ingen/ClientInterface.hpp
index 39a121b1..3fb81f0e 100644
--- a/src/common/interface/ClientInterface.hpp
+++ b/include/ingen/ClientInterface.hpp
@@ -18,10 +18,11 @@
 #ifndef INGEN_INTERFACE_CLIENTINTERFACE_HPP
 #define INGEN_INTERFACE_CLIENTINTERFACE_HPP
 
-#include <stdio.h>
+#include <stdint.h>
+
 #include <string>
-#include <inttypes.h>
-#include "interface/CommonInterface.hpp"
+
+#include "ingen/CommonInterface.hpp"
 
 namespace Raul { class Path; class URI; }
 
diff --git a/src/common/interface/CommonInterface.hpp b/include/ingen/CommonInterface.hpp
index cbf3573c..18ee87db 100644
--- a/src/common/interface/CommonInterface.hpp
+++ b/include/ingen/CommonInterface.hpp
@@ -18,10 +18,11 @@
 #ifndef INGEN_INTERFACE_COMMONINTERFACE_HPP
 #define INGEN_INTERFACE_COMMONINTERFACE_HPP
 
-#include <inttypes.h>
-#include <string>
-#include "interface/CommonInterface.hpp"
-#include "interface/GraphObject.hpp"
+#include "raul/Path.hpp"
+#include "raul/URI.hpp"
+
+#include "ingen/CommonInterface.hpp"
+#include "ingen/GraphObject.hpp"
 
 namespace Raul { class Atom; class Path; class URI; }
 
diff --git a/src/common/interface/Connection.hpp b/include/ingen/Connection.hpp
index 8e429631..8e429631 100644
--- a/src/common/interface/Connection.hpp
+++ b/include/ingen/Connection.hpp
diff --git a/src/common/interface/EngineInterface.hpp b/include/ingen/EngineInterface.hpp
index 384c500d..685d5488 100644
--- a/src/common/interface/EngineInterface.hpp
+++ b/include/ingen/EngineInterface.hpp
@@ -18,8 +18,9 @@
 #ifndef INGEN_INTERFACE_ENGINEINTERFACE_HPP
 #define INGEN_INTERFACE_ENGINEINTERFACE_HPP
 
-#include <inttypes.h>
-#include "interface/CommonInterface.hpp"
+#include <stdint.h>
+
+#include "ingen/CommonInterface.hpp"
 
 namespace Ingen {
 namespace Shared {
diff --git a/src/common/interface/EventType.hpp b/include/ingen/EventType.hpp
index 8a19ba42..8a19ba42 100644
--- a/src/common/interface/EventType.hpp
+++ b/include/ingen/EventType.hpp
diff --git a/src/common/interface/GraphObject.hpp b/include/ingen/GraphObject.hpp
index ed592971..6a8513fc 100644
--- a/src/common/interface/GraphObject.hpp
+++ b/include/ingen/GraphObject.hpp
@@ -19,11 +19,10 @@
 #define INGEN_INTERFACE_GRAPHOBJECT_HPP
 
 #include "raul/Deletable.hpp"
-#include "raul/Path.hpp"
-#include "raul/Symbol.hpp"
-#include "interface/Resource.hpp"
 
-namespace Raul { class Atom; }
+#include "ingen/Resource.hpp"
+
+namespace Raul { class Atom; class Path; class Symbol; }
 
 namespace Ingen {
 namespace Shared {
diff --git a/src/common/interface/Node.hpp b/include/ingen/Node.hpp
index e7669761..c97d1643 100644
--- a/src/common/interface/Node.hpp
+++ b/include/ingen/Node.hpp
@@ -19,7 +19,8 @@
 #define INGEN_INTERFACE_NODE_HPP
 
 #include <stdint.h>
-#include "GraphObject.hpp"
+
+#include "ingen/GraphObject.hpp"
 
 namespace Ingen {
 namespace Shared {
diff --git a/src/common/interface/Patch.hpp b/include/ingen/Patch.hpp
index 87f12bca..f948c102 100644
--- a/src/common/interface/Patch.hpp
+++ b/include/ingen/Patch.hpp
@@ -19,9 +19,11 @@
 #define INGEN_INTERFACE_PATCH_HPP
 
 #include <map>
+#include <utility>
+
 #include "raul/SharedPtr.hpp"
-#include "raul/List.hpp"
-#include "interface/Node.hpp"
+
+#include "ingen/Node.hpp"
 
 namespace Ingen {
 namespace Shared {
diff --git a/src/common/interface/Plugin.hpp b/include/ingen/Plugin.hpp
index 0dfd85d3..358e6adb 100644
--- a/src/common/interface/Plugin.hpp
+++ b/include/ingen/Plugin.hpp
@@ -18,9 +18,9 @@
 #ifndef INGEN_INTERFACE_PLUGIN_HPP
 #define INGEN_INTERFACE_PLUGIN_HPP
 
-#include <string>
 #include "raul/URI.hpp"
-#include "interface/Resource.hpp"
+
+#include "ingen/Resource.hpp"
 
 namespace Ingen {
 namespace Shared {
diff --git a/src/common/interface/Port.hpp b/include/ingen/Port.hpp
index 1ddcc0a9..9bd0437f 100644
--- a/src/common/interface/Port.hpp
+++ b/include/ingen/Port.hpp
@@ -18,10 +18,12 @@
 #ifndef INGEN_INTERFACE_PORT_HPP
 #define INGEN_INTERFACE_PORT_HPP
 
-#include <set>
 #include <stdint.h>
-#include "GraphObject.hpp"
-#include "PortType.hpp"
+
+#include <set>
+
+#include "ingen/GraphObject.hpp"
+#include "ingen/PortType.hpp"
 
 namespace Raul { class Atom; }
 
diff --git a/src/common/interface/PortType.hpp b/include/ingen/PortType.hpp
index fa28bfa4..92b86332 100644
--- a/src/common/interface/PortType.hpp
+++ b/include/ingen/PortType.hpp
@@ -18,7 +18,7 @@
 #ifndef INGEN_INTERFACE_PORTTYPE_HPP
 #define INGEN_INTERFACE_PORTTYPE_HPP
 
-#include <raul/URI.hpp>
+#include "raul/URI.hpp"
 
 namespace Ingen {
 namespace Shared {
diff --git a/src/common/interface/Resource.hpp b/include/ingen/Resource.hpp
index 3b2f9aa6..66183951 100644
--- a/src/common/interface/Resource.hpp
+++ b/include/ingen/Resource.hpp
@@ -18,10 +18,11 @@
 #ifndef INGEN_INTERFACE_RESOURCE_HPP
 #define INGEN_INTERFACE_RESOURCE_HPP
 
-#include <string>
 #include <map>
+#include <string>
 
-namespace Raul { class Atom; class URI; }
+#include "raul/Atom.hpp"
+#include "raul/URI.hpp"
 
 namespace Ingen {
 namespace Shared {
diff --git a/src/bindings/Client.hpp b/src/bindings/Client.hpp
index f752a807..8ca234cc 100644
--- a/src/bindings/Client.hpp
+++ b/src/bindings/Client.hpp
@@ -1,4 +1,4 @@
-#include "interface/Resource.hpp"
+#include "ingen/Resource.hpp"
 
 /** Need a stub ClientInterface without pure virtual methods
  * to allow inheritance in the script
diff --git a/src/bindings/build.sh b/src/bindings/build.sh
index d279433a..5723df35 100755
--- a/src/bindings/build.sh
+++ b/src/bindings/build.sh
@@ -1,4 +1,4 @@
 #!/bin/sh
 swig -c++ -python ./ingen.i
 
-gcc -shared -o _ingen.so ./ingen_wrap.cxx ./ingen_bindings.cpp -I.. -I../common `pkg-config --cflags --libs glibmm-2.4` `python-config --cflags --ldflags` -fPIC
+gcc -shared -o _ingen.so ./ingen_wrap.cxx ./ingen_bindings.cpp -I.. -I../../include `pkg-config --cflags --libs glibmm-2.4` `python-config --cflags --ldflags` -fPIC
diff --git a/src/bindings/ingen.i b/src/bindings/ingen.i
index 19c4b1f1..bafc1704 100644
--- a/src/bindings/ingen.i
+++ b/src/bindings/ingen.i
@@ -1,9 +1,9 @@
 %include "stl.i"
 %module(directors="1") ingen
 %{
-#include "common/interface/CommonInterface.hpp"
-#include "common/interface/ClientInterface.hpp"
-#include "common/interface/EngineInterface.hpp"
+#include "ingen/CommonInterface.hpp"
+#include "ingen/ClientInterface.hpp"
+#include "ingen/EngineInterface.hpp"
 #include "module/World.hpp"
 #include "ingen_bindings.hpp"
 #include "Client.hpp"
@@ -11,10 +11,10 @@
 
 /*%ignore Ingen::Shared::EngineInterface;*/
 
-%include "../common/interface/CommonInterface.hpp"
-%include "../common/interface/ClientInterface.hpp"
-%include "../common/interface/EngineInterface.hpp"
-%include "../module/World.hpp"
+%include "../../include/ingen/CommonInterface.hpp"
+%include "../../include/ingen/ClientInterface.hpp"
+%include "../../include/ingen/EngineInterface.hpp"
+%include "../../includemodule/World.hpp"
 //%include "../module/module.h"
 %include "ingen_bindings.hpp"
 
diff --git a/src/client/ClientStore.hpp b/src/client/ClientStore.hpp
index c7448f7c..b245f403 100644
--- a/src/client/ClientStore.hpp
+++ b/src/client/ClientStore.hpp
@@ -26,7 +26,7 @@
 
 #include <sigc++/sigc++.h>
 
-#include "interface/EngineInterface.hpp"
+#include "ingen/EngineInterface.hpp"
 #include "raul/Path.hpp"
 #include "raul/PathTable.hpp"
 #include "raul/TableImpl.hpp"
diff --git a/src/client/ConnectionModel.hpp b/src/client/ConnectionModel.hpp
index 112922db..5481b713 100644
--- a/src/client/ConnectionModel.hpp
+++ b/src/client/ConnectionModel.hpp
@@ -23,7 +23,7 @@
 #include <list>
 #include "raul/Path.hpp"
 #include "raul/SharedPtr.hpp"
-#include "interface/Connection.hpp"
+#include "ingen/Connection.hpp"
 #include "PortModel.hpp"
 
 namespace Ingen {
diff --git a/src/client/HTTPClientReceiver.hpp b/src/client/HTTPClientReceiver.hpp
index 5e09d2e4..415ac8a1 100644
--- a/src/client/HTTPClientReceiver.hpp
+++ b/src/client/HTTPClientReceiver.hpp
@@ -25,7 +25,7 @@
 #include "raul/Deletable.hpp"
 #include "raul/SharedPtr.hpp"
 #include "raul/Thread.hpp"
-#include "interface/ClientInterface.hpp"
+#include "ingen/ClientInterface.hpp"
 #include "serialisation/Parser.hpp"
 
 typedef struct _SoupSession SoupSession;
diff --git a/src/client/HTTPEngineSender.hpp b/src/client/HTTPEngineSender.hpp
index 2b31701f..207d644f 100644
--- a/src/client/HTTPEngineSender.hpp
+++ b/src/client/HTTPEngineSender.hpp
@@ -25,7 +25,7 @@
 #include "raul/Path.hpp"
 #include "sord/sordmm.hpp"
 
-#include "interface/EngineInterface.hpp"
+#include "ingen/EngineInterface.hpp"
 
 typedef struct _SoupSession SoupSession;
 
diff --git a/src/client/NodeModel.cpp b/src/client/NodeModel.cpp
index 1ff3cae6..6850b06c 100644
--- a/src/client/NodeModel.cpp
+++ b/src/client/NodeModel.cpp
@@ -18,7 +18,7 @@
 #include <cassert>
 #include <cmath>
 #include "ingen-config.h"
-#include "interface/Port.hpp"
+#include "ingen/Port.hpp"
 #include "module/World.hpp"
 #include "shared/LV2URIMap.hpp"
 #include "NodeModel.hpp"
diff --git a/src/client/NodeModel.hpp b/src/client/NodeModel.hpp
index 939197b1..cc47a25d 100644
--- a/src/client/NodeModel.hpp
+++ b/src/client/NodeModel.hpp
@@ -23,8 +23,8 @@
 #include <vector>
 #include <sigc++/sigc++.h>
 #include "raul/SharedPtr.hpp"
-#include "interface/Node.hpp"
-#include "interface/Port.hpp"
+#include "ingen/Node.hpp"
+#include "ingen/Port.hpp"
 #include "ObjectModel.hpp"
 #include "PortModel.hpp"
 #include "PluginModel.hpp"
diff --git a/src/client/OSCClientReceiver.cpp b/src/client/OSCClientReceiver.cpp
index bbf4f882..00d8cc32 100644
--- a/src/client/OSCClientReceiver.cpp
+++ b/src/client/OSCClientReceiver.cpp
@@ -15,13 +15,17 @@
  * 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
+#include <assert.h>
+#include <stdio.h>
+#include <string.h>
+
 #include <list>
-#include <cassert>
-#include <cstring>
 #include <sstream>
-#include "ingen-config.h"
+
 #include "raul/log.hpp"
 #include "raul/AtomLiblo.hpp"
+
+#include "ingen-config.h"
 #include "OSCClientReceiver.hpp"
 
 #define LOG(s) s << "[OSCClientReceiver] "
diff --git a/src/client/OSCClientReceiver.hpp b/src/client/OSCClientReceiver.hpp
index e1bec2b6..9f9b8088 100644
--- a/src/client/OSCClientReceiver.hpp
+++ b/src/client/OSCClientReceiver.hpp
@@ -23,7 +23,7 @@
 #include <lo/lo.h>
 #include "raul/Deletable.hpp"
 #include "raul/SharedPtr.hpp"
-#include "interface/ClientInterface.hpp"
+#include "ingen/ClientInterface.hpp"
 
 namespace Ingen {
 namespace Client {
diff --git a/src/client/OSCEngineSender.cpp b/src/client/OSCEngineSender.cpp
index 42e2a09a..70b40e7d 100644
--- a/src/client/OSCEngineSender.cpp
+++ b/src/client/OSCEngineSender.cpp
@@ -19,9 +19,9 @@
 #include "raul/AtomLiblo.hpp"
 #include "raul/Path.hpp"
 
-#include "common/interface/Patch.hpp"
-#include "common/interface/Port.hpp"
-#include "common/interface/Plugin.hpp"
+#include "ingen/Patch.hpp"
+#include "ingen/Port.hpp"
+#include "ingen/Plugin.hpp"
 
 #include "OSCEngineSender.hpp"
 
diff --git a/src/client/OSCEngineSender.hpp b/src/client/OSCEngineSender.hpp
index c696eb1b..fddfdbce 100644
--- a/src/client/OSCEngineSender.hpp
+++ b/src/client/OSCEngineSender.hpp
@@ -21,7 +21,7 @@
 #include <inttypes.h>
 #include <string>
 #include <lo/lo.h>
-#include "interface/EngineInterface.hpp"
+#include "ingen/EngineInterface.hpp"
 #include "shared/OSCSender.hpp"
 
 namespace Ingen {
diff --git a/src/client/ObjectModel.cpp b/src/client/ObjectModel.cpp
index 728d530e..16859216 100644
--- a/src/client/ObjectModel.cpp
+++ b/src/client/ObjectModel.cpp
@@ -16,7 +16,7 @@
  */
 
 #include "raul/TableImpl.hpp"
-#include "interface/GraphObject.hpp"
+#include "ingen/GraphObject.hpp"
 #include "shared/LV2URIMap.hpp"
 #include "ObjectModel.hpp"
 
diff --git a/src/client/ObjectModel.hpp b/src/client/ObjectModel.hpp
index 0899ed99..0ee11ba1 100644
--- a/src/client/ObjectModel.hpp
+++ b/src/client/ObjectModel.hpp
@@ -27,7 +27,7 @@
 #include "raul/Path.hpp"
 #include "raul/URI.hpp"
 #include "raul/SharedPtr.hpp"
-#include "interface/GraphObject.hpp"
+#include "ingen/GraphObject.hpp"
 #include "shared/ResourceImpl.hpp"
 
 namespace Ingen {
diff --git a/src/client/PatchModel.hpp b/src/client/PatchModel.hpp
index 534c329a..91719df3 100644
--- a/src/client/PatchModel.hpp
+++ b/src/client/PatchModel.hpp
@@ -21,7 +21,7 @@
 #include <cassert>
 #include <sigc++/sigc++.h>
 #include "raul/SharedPtr.hpp"
-#include "interface/Patch.hpp"
+#include "ingen/Patch.hpp"
 #include "NodeModel.hpp"
 
 #include "ConnectionModel.hpp"
diff --git a/src/client/PluginModel.hpp b/src/client/PluginModel.hpp
index 006c53d9..6be9dfc4 100644
--- a/src/client/PluginModel.hpp
+++ b/src/client/PluginModel.hpp
@@ -26,8 +26,8 @@
 #ifdef HAVE_SLV2
 #include "slv2/slv2.h"
 #endif
-#include "interface/EngineInterface.hpp"
-#include "interface/Plugin.hpp"
+#include "ingen/EngineInterface.hpp"
+#include "ingen/Plugin.hpp"
 #include "module/World.hpp"
 #include "shared/ResourceImpl.hpp"
 
diff --git a/src/client/PortModel.hpp b/src/client/PortModel.hpp
index 8688e2e9..f41416f2 100644
--- a/src/client/PortModel.hpp
+++ b/src/client/PortModel.hpp
@@ -23,7 +23,7 @@
 #include <sigc++/sigc++.h>
 #include "raul/log.hpp"
 #include "raul/SharedPtr.hpp"
-#include "interface/Port.hpp"
+#include "ingen/Port.hpp"
 #include "ObjectModel.hpp"
 
 namespace Raul { class Path; }
diff --git a/src/client/SigClientInterface.hpp b/src/client/SigClientInterface.hpp
index 55965fd2..8a53a2cb 100644
--- a/src/client/SigClientInterface.hpp
+++ b/src/client/SigClientInterface.hpp
@@ -21,7 +21,7 @@
 #include <inttypes.h>
 #include <sigc++/sigc++.h>
 #include "raul/Path.hpp"
-#include "interface/ClientInterface.hpp"
+#include "ingen/ClientInterface.hpp"
 
 namespace Ingen {
 namespace Client {
diff --git a/src/client/ThreadedSigClientInterface.cpp b/src/client/ThreadedSigClientInterface.cpp
index 13a36882..50b0b7e7 100644
--- a/src/client/ThreadedSigClientInterface.cpp
+++ b/src/client/ThreadedSigClientInterface.cpp
@@ -16,9 +16,9 @@
  */
 
 #include "raul/log.hpp"
-#include "common/interface/Patch.hpp"
-#include "common/interface/Plugin.hpp"
-#include "common/interface/Port.hpp"
+#include "ingen/Patch.hpp"
+#include "ingen/Plugin.hpp"
+#include "ingen/Port.hpp"
 #include "ThreadedSigClientInterface.hpp"
 
 using namespace std;
diff --git a/src/client/ThreadedSigClientInterface.hpp b/src/client/ThreadedSigClientInterface.hpp
index 06a8da73..c852dfd0 100644
--- a/src/client/ThreadedSigClientInterface.hpp
+++ b/src/client/ThreadedSigClientInterface.hpp
@@ -23,7 +23,7 @@
 #include <sigc++/sigc++.h>
 #include <glibmm/thread.h>
 #include "raul/Atom.hpp"
-#include "interface/ClientInterface.hpp"
+#include "ingen/ClientInterface.hpp"
 #include "SigClientInterface.hpp"
 #include "raul/SRSWQueue.hpp"
 
diff --git a/src/client/wscript b/src/client/wscript
index 496c7219..06258b67 100644
--- a/src/client/wscript
+++ b/src/client/wscript
@@ -30,7 +30,7 @@ def build(bld):
 			OSCEngineSender.cpp
 		'''
 
-	obj.includes        = ['.', '..', '../..', '../common']
+	obj.includes        = ['.', '..', '../..', '../../include']
 	obj.export_includes = ['.']
 	obj.name            = 'libingen_client'
 	obj.target          = 'ingen_client'
diff --git a/src/common/interface/README b/src/common/interface/README
deleted file mode 100644
index f79bdc2a..00000000
--- a/src/common/interface/README
+++ /dev/null
@@ -1,11 +0,0 @@
-This directory contains the core engine/client interfaces, code used on
-both the engine side and client side.
-
-It's very, very important that nothing here gets messed up that violates
-client/engine separation.  All interfaces use simple messages composed of
-serializable types.
-
-The interface here maps directly on to the OSC interface - except it can
-happen in the same process as well, with only (virtual) function call
-overhead.
-
diff --git a/src/engine/Buffer.hpp b/src/engine/Buffer.hpp
index 8013fa32..76d47e26 100644
--- a/src/engine/Buffer.hpp
+++ b/src/engine/Buffer.hpp
@@ -24,7 +24,7 @@
 #include <boost/intrusive_ptr.hpp>
 #include "raul/Deletable.hpp"
 #include "raul/SharedPtr.hpp"
-#include "interface/PortType.hpp"
+#include "ingen/PortType.hpp"
 #include "types.hpp"
 #include "BufferFactory.hpp"
 
diff --git a/src/engine/BufferFactory.hpp b/src/engine/BufferFactory.hpp
index e2ac98bb..959e7e73 100644
--- a/src/engine/BufferFactory.hpp
+++ b/src/engine/BufferFactory.hpp
@@ -20,7 +20,7 @@
 
 #include <map>
 #include <boost/intrusive_ptr.hpp>
-#include "interface/PortType.hpp"
+#include "ingen/PortType.hpp"
 #include "glibmm/thread.h"
 #include "raul/RingBuffer.hpp"
 #include "raul/AtomicPtr.hpp"
diff --git a/src/engine/ClientBroadcaster.cpp b/src/engine/ClientBroadcaster.cpp
index b3a90628..f83b56a6 100644
--- a/src/engine/ClientBroadcaster.cpp
+++ b/src/engine/ClientBroadcaster.cpp
@@ -18,7 +18,7 @@
 #include <cassert>
 #include <unistd.h>
 #include "raul/log.hpp"
-#include "interface/ClientInterface.hpp"
+#include "ingen/ClientInterface.hpp"
 #include "ClientBroadcaster.hpp"
 #include "PluginImpl.hpp"
 #include "ConnectionImpl.hpp"
diff --git a/src/engine/ClientBroadcaster.hpp b/src/engine/ClientBroadcaster.hpp
index 11668218..4d1a460d 100644
--- a/src/engine/ClientBroadcaster.hpp
+++ b/src/engine/ClientBroadcaster.hpp
@@ -23,7 +23,7 @@
 #include <map>
 #include <pthread.h>
 #include "raul/SharedPtr.hpp"
-#include "interface/ClientInterface.hpp"
+#include "ingen/ClientInterface.hpp"
 #include "NodeFactory.hpp"
 
 using namespace std;
diff --git a/src/engine/ConnectionImpl.hpp b/src/engine/ConnectionImpl.hpp
index ea38226f..09dd208a 100644
--- a/src/engine/ConnectionImpl.hpp
+++ b/src/engine/ConnectionImpl.hpp
@@ -23,8 +23,8 @@
 #include "raul/log.hpp"
 #include "raul/Deletable.hpp"
 #include "raul/IntrusivePtr.hpp"
-#include "interface/PortType.hpp"
-#include "interface/Connection.hpp"
+#include "ingen/PortType.hpp"
+#include "ingen/Connection.hpp"
 #include "lv2/lv2plug.in/ns/ext/atom/atom.h"
 #include "PortImpl.hpp"
 
diff --git a/src/engine/Driver.hpp b/src/engine/Driver.hpp
index f87ec338..c744b54f 100644
--- a/src/engine/Driver.hpp
+++ b/src/engine/Driver.hpp
@@ -21,8 +21,8 @@
 #include <string>
 #include <boost/utility.hpp>
 #include "raul/Deletable.hpp"
-#include "interface/PortType.hpp"
-#include "interface/EventType.hpp"
+#include "ingen/PortType.hpp"
+#include "ingen/EventType.hpp"
 #include "DuplexPort.hpp"
 
 namespace Raul { class Path; }
diff --git a/src/engine/Engine.cpp b/src/engine/Engine.cpp
index 514e286f..3979cfa9 100644
--- a/src/engine/Engine.cpp
+++ b/src/engine/Engine.cpp
@@ -23,7 +23,7 @@
 #include "raul/Maid.hpp"
 #include "raul/SharedPtr.hpp"
 #include "lv2/lv2plug.in/ns/ext/uri-map/uri-map.h"
-#include "common/interface/EventType.hpp"
+#include "ingen/EventType.hpp"
 #include "events/CreatePatch.hpp"
 #include "events/CreatePort.hpp"
 #include "module/World.hpp"
diff --git a/src/engine/Engine.hpp b/src/engine/Engine.hpp
index e79dbb9f..920acfa3 100644
--- a/src/engine/Engine.hpp
+++ b/src/engine/Engine.hpp
@@ -26,8 +26,8 @@
 
 #include "raul/SharedPtr.hpp"
 
-#include "interface/PortType.hpp"
-#include "interface/EventType.hpp"
+#include "ingen/PortType.hpp"
+#include "ingen/EventType.hpp"
 
 namespace Raul { class Maid; }
 
diff --git a/src/engine/EventBuffer.hpp b/src/engine/EventBuffer.hpp
index 567abcab..9757ace7 100644
--- a/src/engine/EventBuffer.hpp
+++ b/src/engine/EventBuffer.hpp
@@ -21,7 +21,7 @@
 #include "lv2/lv2plug.in/ns/ext/atom/atom.h"
 #include "lv2/lv2plug.in/ns/ext/event/event.h"
 #include "lv2/lv2plug.in/ns/ext/event/event-helpers.h"
-#include "interface/PortType.hpp"
+#include "ingen/PortType.hpp"
 #include "Buffer.hpp"
 
 namespace Ingen {
diff --git a/src/engine/GraphObjectImpl.hpp b/src/engine/GraphObjectImpl.hpp
index 59f28b3e..251559f3 100644
--- a/src/engine/GraphObjectImpl.hpp
+++ b/src/engine/GraphObjectImpl.hpp
@@ -25,7 +25,7 @@
 #include "raul/Deletable.hpp"
 #include "raul/Path.hpp"
 #include "raul/SharedPtr.hpp"
-#include "interface/GraphObject.hpp"
+#include "ingen/GraphObject.hpp"
 #include "shared/ResourceImpl.hpp"
 
 namespace Raul { class Maid; }
diff --git a/src/engine/HTTPClientSender.hpp b/src/engine/HTTPClientSender.hpp
index 630bdd5a..4d74358f 100644
--- a/src/engine/HTTPClientSender.hpp
+++ b/src/engine/HTTPClientSender.hpp
@@ -22,7 +22,7 @@
 #include <string>
 #include <pthread.h>
 #include "raul/Thread.hpp"
-#include "interface/ClientInterface.hpp"
+#include "ingen/ClientInterface.hpp"
 #include "shared/HTTPSender.hpp"
 
 namespace Ingen {
diff --git a/src/engine/HTTPEngineReceiver.cpp b/src/engine/HTTPEngineReceiver.cpp
index 81481f02..b2678754 100644
--- a/src/engine/HTTPEngineReceiver.cpp
+++ b/src/engine/HTTPEngineReceiver.cpp
@@ -26,7 +26,7 @@
 #include "raul/SharedPtr.hpp"
 #include "raul/log.hpp"
 
-#include "interface/ClientInterface.hpp"
+#include "ingen/ClientInterface.hpp"
 #include "module/Module.hpp"
 #include "serialisation/Parser.hpp"
 #include "serialisation/Serialiser.hpp"
diff --git a/src/engine/InputPort.cpp b/src/engine/InputPort.cpp
index f82b522a..f65b9a5a 100644
--- a/src/engine/InputPort.cpp
+++ b/src/engine/InputPort.cpp
@@ -18,7 +18,7 @@
 #include "InputPort.hpp"
 #include <cstdlib>
 #include <cassert>
-#include "interface/Patch.hpp"
+#include "ingen/Patch.hpp"
 #include "shared/LV2URIMap.hpp"
 #include "AudioBuffer.hpp"
 #include "BufferFactory.hpp"
diff --git a/src/engine/NodeImpl.hpp b/src/engine/NodeImpl.hpp
index d57861c9..4d98bb2a 100644
--- a/src/engine/NodeImpl.hpp
+++ b/src/engine/NodeImpl.hpp
@@ -23,7 +23,7 @@
 #include "raul/AtomicInt.hpp"
 #include "raul/IntrusivePtr.hpp"
 #include "raul/Semaphore.hpp"
-#include "interface/Node.hpp"
+#include "ingen/Node.hpp"
 #include "GraphObjectImpl.hpp"
 #include "types.hpp"
 
diff --git a/src/engine/OSCClientSender.cpp b/src/engine/OSCClientSender.cpp
index 75f330b3..786f9ee9 100644
--- a/src/engine/OSCClientSender.cpp
+++ b/src/engine/OSCClientSender.cpp
@@ -29,7 +29,7 @@
 #include "PatchImpl.hpp"
 #include "PluginImpl.hpp"
 #include "PortImpl.hpp"
-#include "interface/ClientInterface.hpp"
+#include "ingen/ClientInterface.hpp"
 #include "util.hpp"
 
 using namespace std;
diff --git a/src/engine/OSCClientSender.hpp b/src/engine/OSCClientSender.hpp
index 7df10d15..5b775846 100644
--- a/src/engine/OSCClientSender.hpp
+++ b/src/engine/OSCClientSender.hpp
@@ -22,8 +22,8 @@
 #include <string>
 #include <lo/lo.h>
 #include <pthread.h>
-#include "interface/ClientInterface.hpp"
-#include "interface/GraphObject.hpp"
+#include "ingen/ClientInterface.hpp"
+#include "ingen/GraphObject.hpp"
 #include "shared/OSCSender.hpp"
 
 namespace Ingen {
diff --git a/src/engine/OSCEngineReceiver.cpp b/src/engine/OSCEngineReceiver.cpp
index 50dcb78f..60cf483e 100644
--- a/src/engine/OSCEngineReceiver.cpp
+++ b/src/engine/OSCEngineReceiver.cpp
@@ -17,19 +17,25 @@
 
 //#define ENABLE_AVAHI 1
 
-#include <cstdlib>
+#include <stdlib.h>
+#include <stdio.h>
+
 #include <string>
+
 #include <lo/lo.h>
-#include "ingen-config.h"
-#include "raul/log.hpp"
+
 #include "raul/AtomLiblo.hpp"
 #include "raul/SharedPtr.hpp"
-#include "interface/ClientInterface.hpp"
+#include "raul/log.hpp"
+
+#include "ingen-config.h"
+#include "ingen/ClientInterface.hpp"
+
 #include "ClientBroadcaster.hpp"
 #include "Engine.hpp"
+#include "EventSource.hpp"
 #include "OSCClientSender.hpp"
 #include "OSCEngineReceiver.hpp"
-#include "EventSource.hpp"
 #include "ThreadManager.hpp"
 
 #define LOG(s) s << "[OSCEngineReceiver] "
diff --git a/src/engine/ObjectBuffer.hpp b/src/engine/ObjectBuffer.hpp
index 9854e025..7066c025 100644
--- a/src/engine/ObjectBuffer.hpp
+++ b/src/engine/ObjectBuffer.hpp
@@ -19,7 +19,7 @@
 #define INGEN_ENGINE_OBJECTBUFFER_HPP
 
 #include "lv2/lv2plug.in/ns/ext/atom/atom.h"
-#include "interface/PortType.hpp"
+#include "ingen/PortType.hpp"
 #include "Buffer.hpp"
 
 namespace Ingen {
diff --git a/src/engine/ObjectSender.cpp b/src/engine/ObjectSender.cpp
index b962da2e..ee977fdc 100644
--- a/src/engine/ObjectSender.cpp
+++ b/src/engine/ObjectSender.cpp
@@ -16,7 +16,7 @@
  */
 
 #include "ObjectSender.hpp"
-#include "interface/ClientInterface.hpp"
+#include "ingen/ClientInterface.hpp"
 #include "shared/LV2URIMap.hpp"
 #include "EngineStore.hpp"
 #include "PatchImpl.hpp"
@@ -24,7 +24,7 @@
 #include "PortImpl.hpp"
 #include "ConnectionImpl.hpp"
 #include "NodeFactory.hpp"
-#include "interface/PortType.hpp"
+#include "ingen/PortType.hpp"
 #include "AudioBuffer.hpp"
 
 using namespace std;
diff --git a/src/engine/OutputPort.cpp b/src/engine/OutputPort.cpp
index a4e997a5..d647fbdd 100644
--- a/src/engine/OutputPort.cpp
+++ b/src/engine/OutputPort.cpp
@@ -15,7 +15,7 @@
  * 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
-#include "interface/Patch.hpp"
+#include "ingen/Patch.hpp"
 #include "shared/LV2URIMap.hpp"
 #include "Buffer.hpp"
 #include "NodeImpl.hpp"
diff --git a/src/engine/PatchImpl.hpp b/src/engine/PatchImpl.hpp
index 77f2cb43..1ecb5bae 100644
--- a/src/engine/PatchImpl.hpp
+++ b/src/engine/PatchImpl.hpp
@@ -21,8 +21,8 @@
 #include <cstdlib>
 #include <string>
 #include "raul/List.hpp"
-#include "interface/PortType.hpp"
-#include "interface/Patch.hpp"
+#include "ingen/PortType.hpp"
+#include "ingen/Patch.hpp"
 #include "NodeImpl.hpp"
 #include "PluginImpl.hpp"
 #include "CompiledPatch.hpp"
diff --git a/src/engine/PluginImpl.hpp b/src/engine/PluginImpl.hpp
index bf6be506..fca6320e 100644
--- a/src/engine/PluginImpl.hpp
+++ b/src/engine/PluginImpl.hpp
@@ -24,7 +24,7 @@
 #include <boost/utility.hpp>
 #include <glibmm/module.h>
 
-#include "interface/Plugin.hpp"
+#include "ingen/Plugin.hpp"
 #include "shared/ResourceImpl.hpp"
 
 namespace Ingen {
diff --git a/src/engine/PortImpl.cpp b/src/engine/PortImpl.cpp
index 29ac4b31..a2bb594b 100644
--- a/src/engine/PortImpl.cpp
+++ b/src/engine/PortImpl.cpp
@@ -19,7 +19,7 @@
 #include "raul/Maid.hpp"
 #include "shared/LV2URIMap.hpp"
 #include "lv2/lv2plug.in/ns/ext/contexts/contexts.h"
-#include "interface/PortType.hpp"
+#include "ingen/PortType.hpp"
 #include "events/SendPortValue.hpp"
 #include "events/SendPortActivity.hpp"
 #include "AudioBuffer.hpp"
diff --git a/src/engine/PortImpl.hpp b/src/engine/PortImpl.hpp
index c9b74ca4..58fd6ea5 100644
--- a/src/engine/PortImpl.hpp
+++ b/src/engine/PortImpl.hpp
@@ -23,10 +23,10 @@
 #include <set>
 #include "raul/Array.hpp"
 #include "raul/Atom.hpp"
-#include "interface/Port.hpp"
+#include "ingen/Port.hpp"
 #include "types.hpp"
 #include "GraphObjectImpl.hpp"
-#include "interface/PortType.hpp"
+#include "ingen/PortType.hpp"
 #include "Buffer.hpp"
 #include "Context.hpp"
 
diff --git a/src/engine/QueuedEngineInterface.hpp b/src/engine/QueuedEngineInterface.hpp
index 2c1e94b9..6cdb618d 100644
--- a/src/engine/QueuedEngineInterface.hpp
+++ b/src/engine/QueuedEngineInterface.hpp
@@ -22,9 +22,9 @@
 #include <string>
 #include <memory>
 #include "raul/SharedPtr.hpp"
-#include "interface/ClientInterface.hpp"
-#include "interface/EngineInterface.hpp"
-#include "interface/Resource.hpp"
+#include "ingen/ClientInterface.hpp"
+#include "ingen/EngineInterface.hpp"
+#include "ingen/Resource.hpp"
 #include "EventSource.hpp"
 #include "Request.hpp"
 #include "tuning.hpp"
diff --git a/src/engine/Request.hpp b/src/engine/Request.hpp
index 9f68d7f9..17930554 100644
--- a/src/engine/Request.hpp
+++ b/src/engine/Request.hpp
@@ -20,7 +20,7 @@
 
 #include <inttypes.h>
 #include <string>
-#include "interface/ClientInterface.hpp"
+#include "ingen/ClientInterface.hpp"
 #include "EventSource.hpp"
 
 namespace Ingen {
diff --git a/src/engine/events/CreateNode.hpp b/src/engine/events/CreateNode.hpp
index 456bcc04..1e341c1a 100644
--- a/src/engine/events/CreateNode.hpp
+++ b/src/engine/events/CreateNode.hpp
@@ -20,7 +20,7 @@
 
 #include <string>
 #include "QueuedEvent.hpp"
-#include "interface/Resource.hpp"
+#include "ingen/Resource.hpp"
 
 namespace Ingen {
 
diff --git a/src/engine/events/CreatePatch.hpp b/src/engine/events/CreatePatch.hpp
index d10bb605..84c0c0aa 100644
--- a/src/engine/events/CreatePatch.hpp
+++ b/src/engine/events/CreatePatch.hpp
@@ -19,7 +19,7 @@
 #define INGEN_EVENTS_CREATEPATCH_HPP
 
 #include "QueuedEvent.hpp"
-#include "interface/Resource.hpp"
+#include "ingen/Resource.hpp"
 
 namespace Ingen {
 
diff --git a/src/engine/events/CreatePort.hpp b/src/engine/events/CreatePort.hpp
index 9fd56530..1bee8be6 100644
--- a/src/engine/events/CreatePort.hpp
+++ b/src/engine/events/CreatePort.hpp
@@ -21,8 +21,8 @@
 #include "QueuedEvent.hpp"
 #include "raul/Path.hpp"
 #include "raul/Array.hpp"
-#include "interface/PortType.hpp"
-#include "interface/Resource.hpp"
+#include "ingen/PortType.hpp"
+#include "ingen/Resource.hpp"
 
 namespace Ingen {
 
diff --git a/src/engine/events/Get.cpp b/src/engine/events/Get.cpp
index 93b81b24..17c4699d 100644
--- a/src/engine/events/Get.cpp
+++ b/src/engine/events/Get.cpp
@@ -16,7 +16,7 @@
  */
 
 #include "Get.hpp"
-#include "interface/ClientInterface.hpp"
+#include "ingen/ClientInterface.hpp"
 #include "Request.hpp"
 #include "Engine.hpp"
 #include "EngineStore.hpp"
diff --git a/src/engine/events/RegisterClient.hpp b/src/engine/events/RegisterClient.hpp
index 1dbd3b06..2703484c 100644
--- a/src/engine/events/RegisterClient.hpp
+++ b/src/engine/events/RegisterClient.hpp
@@ -19,7 +19,7 @@
 #define INGEN_EVENTS_REGISTERCLIENT_HPP
 
 #include "raul/URI.hpp"
-#include "interface/ClientInterface.hpp"
+#include "ingen/ClientInterface.hpp"
 #include "QueuedEvent.hpp"
 
 namespace Ingen {
diff --git a/src/engine/events/RequestMetadata.cpp b/src/engine/events/RequestMetadata.cpp
index e16bf57a..b8adc34e 100644
--- a/src/engine/events/RequestMetadata.cpp
+++ b/src/engine/events/RequestMetadata.cpp
@@ -16,7 +16,7 @@
  */
 
 #include "raul/IntrusivePtr.hpp"
-#include "interface/ClientInterface.hpp"
+#include "ingen/ClientInterface.hpp"
 #include "events/RequestMetadata.hpp"
 #include "shared/LV2Atom.hpp"
 #include "shared/LV2URIMap.hpp"
diff --git a/src/engine/events/SetMetadata.cpp b/src/engine/events/SetMetadata.cpp
index ef192b96..afd4a226 100644
--- a/src/engine/events/SetMetadata.cpp
+++ b/src/engine/events/SetMetadata.cpp
@@ -19,7 +19,7 @@
 #include <boost/format.hpp>
 #include "raul/log.hpp"
 #include "raul/Maid.hpp"
-#include "interface/PortType.hpp"
+#include "ingen/PortType.hpp"
 #include "shared/LV2URIMap.hpp"
 #include "ClientBroadcaster.hpp"
 #include "ControlBindings.hpp"
diff --git a/src/engine/events/UnregisterClient.cpp b/src/engine/events/UnregisterClient.cpp
index ed5fe5e5..6f0b6357 100644
--- a/src/engine/events/UnregisterClient.cpp
+++ b/src/engine/events/UnregisterClient.cpp
@@ -15,7 +15,7 @@
  * 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
-#include "interface/ClientInterface.hpp"
+#include "ingen/ClientInterface.hpp"
 #include "Request.hpp"
 #include "UnregisterClient.hpp"
 #include "Engine.hpp"
diff --git a/src/engine/ingen_lv2.cpp b/src/engine/ingen_lv2.cpp
index 8b9fd90d..b259de11 100644
--- a/src/engine/ingen_lv2.cpp
+++ b/src/engine/ingen_lv2.cpp
@@ -39,7 +39,7 @@
 #include "engine/ProcessContext.hpp"
 #include "engine/QueuedEngineInterface.hpp"
 #include "engine/ThreadManager.hpp"
-#include "interface/EngineInterface.hpp"
+#include "ingen/EngineInterface.hpp"
 #include "module/World.hpp"
 #include "module/ingen_module.hpp"
 #include "serialisation/Parser.hpp"
diff --git a/src/engine/mix.hpp b/src/engine/mix.hpp
index a6c8fbab..072c7d3c 100644
--- a/src/engine/mix.hpp
+++ b/src/engine/mix.hpp
@@ -19,7 +19,7 @@
 #define INGEN_ENGINE_MIX_HPP
 
 #include "raul/log.hpp"
-#include "interface/PortType.hpp"
+#include "ingen/PortType.hpp"
 #include "Buffer.hpp"
 #include "Context.hpp"
 
diff --git a/src/engine/wscript b/src/engine/wscript
index 47a55079..61be8c01 100644
--- a/src/engine/wscript
+++ b/src/engine/wscript
@@ -65,7 +65,7 @@ def build(bld):
 	obj = bld(features = 'cxx cxxshlib')
 	obj.source = core_source
 	obj.export_includes = ['.']
-	obj.includes        = ['.', '..', '../..', '../common']
+	obj.includes        = ['.', '..', '../..', '../../include']
 	obj.name            = 'libingen_engine'
 	obj.target          = 'ingen_engine'
 	obj.install_path    = '${LIBDIR}'
@@ -82,7 +82,7 @@ def build(bld):
 			HTTPEngineReceiver.cpp
 			ingen_http.cpp
 		'''
-		obj.includes     = ['.', '..', '../..', '../common', '../engine']
+		obj.includes     = ['.', '..', '../..', '../../include', '../engine']
 		obj.name         = 'libingen_http'
 		obj.target       = 'ingen_http'
 		obj.install_path = '${LIBDIR}'
@@ -98,7 +98,7 @@ def build(bld):
 			ingen_osc.cpp
 		'''
 		obj.export_includes = ['.']
-		obj.includes        = ['.', '..', '../..', '../common', '../engine']
+		obj.includes        = ['.', '..', '../..', '../../include', '../engine']
 		obj.name            = 'libingen_osc'
 		obj.target          = 'ingen_osc'
 		obj.install_path    = '${LIBDIR}'
@@ -108,7 +108,7 @@ def build(bld):
 		obj = bld(features = 'cxx cxxshlib')
 		obj.source = 'JackDriver.cpp ingen_jack.cpp'
 		obj.export_includes = ['.']
-		obj.includes        = ['.', '..', '../..', '../common', '../engine']
+		obj.includes        = ['.', '..', '../..', '../../include', '../engine']
 		obj.name            = 'libingen_jack'
 		obj.target          = 'ingen_jack'
 		obj.install_path    = '${LIBDIR}'
@@ -119,7 +119,7 @@ def build(bld):
 	obj = bld(features = 'cxx cxxshlib')
 	obj.source = ' ingen_lv2.cpp '
 	obj.export_includes = ['.']
-	obj.includes	    = ['.', '..', '../..', '../common']
+	obj.includes	    = ['.', '..', '../..', '../../include']
 	obj.name	    = 'libingen_lv2'
 	obj.target	    = 'ingen_lv2'
 	obj.install_path    = '${LIBDIR}'
diff --git a/src/gui/App.cpp b/src/gui/App.cpp
index 28e72a5f..cd14d037 100644
--- a/src/gui/App.cpp
+++ b/src/gui/App.cpp
@@ -29,7 +29,7 @@
 #include "flowcanvas/Connection.hpp"
 #include "module/World.hpp"
 #include "engine/Engine.hpp"
-#include "interface/EngineInterface.hpp"
+#include "ingen/EngineInterface.hpp"
 #include "shared/runtime_paths.hpp"
 #include "shared/LV2URIMap.hpp"
 #include "client/ObjectModel.hpp"
diff --git a/src/gui/ConnectWindow.cpp b/src/gui/ConnectWindow.cpp
index 9e1a33b4..dc24498e 100644
--- a/src/gui/ConnectWindow.cpp
+++ b/src/gui/ConnectWindow.cpp
@@ -24,7 +24,7 @@
 #include "raul/log.hpp"
 #include "raul/Process.hpp"
 #include "ingen-config.h"
-#include "interface/EngineInterface.hpp"
+#include "ingen/EngineInterface.hpp"
 #include "module/Module.hpp"
 #include "module/World.hpp"
 #include "engine/tuning.hpp"
diff --git a/src/gui/ControlPanel.cpp b/src/gui/ControlPanel.cpp
index 9434ba0e..236cb92a 100644
--- a/src/gui/ControlPanel.cpp
+++ b/src/gui/ControlPanel.cpp
@@ -15,8 +15,8 @@
  * 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
-#include "interface/EngineInterface.hpp"
-#include "interface/PortType.hpp"
+#include "ingen/EngineInterface.hpp"
+#include "ingen/PortType.hpp"
 #include "shared/LV2URIMap.hpp"
 #include "client/NodeModel.hpp"
 #include "client/PortModel.hpp"
diff --git a/src/gui/Controls.cpp b/src/gui/Controls.cpp
index 1a443ec7..ed16350e 100644
--- a/src/gui/Controls.cpp
+++ b/src/gui/Controls.cpp
@@ -18,7 +18,7 @@
 #include <cmath>
 #include <algorithm>
 #include "raul/log.hpp"
-#include "interface/EngineInterface.hpp"
+#include "ingen/EngineInterface.hpp"
 #include "shared/LV2URIMap.hpp"
 #include "client/PluginModel.hpp"
 #include "client/NodeModel.hpp"
diff --git a/src/gui/LoadPatchWindow.cpp b/src/gui/LoadPatchWindow.cpp
index 81066a8c..c4229f61 100644
--- a/src/gui/LoadPatchWindow.cpp
+++ b/src/gui/LoadPatchWindow.cpp
@@ -20,7 +20,7 @@
 #include <cassert>
 #include <boost/optional.hpp>
 #include <glibmm/miscutils.h>
-#include "interface/EngineInterface.hpp"
+#include "ingen/EngineInterface.hpp"
 #include "shared/LV2URIMap.hpp"
 #include "client/NodeModel.hpp"
 #include "client/PatchModel.hpp"
diff --git a/src/gui/LoadPatchWindow.hpp b/src/gui/LoadPatchWindow.hpp
index 73f0d686..51a21332 100644
--- a/src/gui/LoadPatchWindow.hpp
+++ b/src/gui/LoadPatchWindow.hpp
@@ -21,7 +21,7 @@
 #include <libglademm/xml.h>
 #include <gtkmm.h>
 #include "raul/SharedPtr.hpp"
-#include "interface/GraphObject.hpp"
+#include "ingen/GraphObject.hpp"
 using namespace Ingen::Shared;
 
 namespace Ingen {
diff --git a/src/gui/LoadPluginWindow.cpp b/src/gui/LoadPluginWindow.cpp
index 3952397a..080520c4 100644
--- a/src/gui/LoadPluginWindow.cpp
+++ b/src/gui/LoadPluginWindow.cpp
@@ -19,7 +19,7 @@
 #include <algorithm>
 #include <ctype.h>
 #include "ingen-config.h"
-#include "interface/EngineInterface.hpp"
+#include "ingen/EngineInterface.hpp"
 #include "shared/LV2URIMap.hpp"
 #include "client/PatchModel.hpp"
 #include "client/ClientStore.hpp"
diff --git a/src/gui/LoadPluginWindow.hpp b/src/gui/LoadPluginWindow.hpp
index 6d97ea91..f04ed903 100644
--- a/src/gui/LoadPluginWindow.hpp
+++ b/src/gui/LoadPluginWindow.hpp
@@ -25,7 +25,7 @@
 #include "raul/SharedPtr.hpp"
 #include "raul/Table.hpp"
 #include "ingen-config.h"
-#include "interface/GraphObject.hpp"
+#include "ingen/GraphObject.hpp"
 #include "client/ClientStore.hpp"
 #include "Window.hpp"
 
diff --git a/src/gui/LoadRemotePatchWindow.cpp b/src/gui/LoadRemotePatchWindow.cpp
index f48bd0bc..d3b0f456 100644
--- a/src/gui/LoadRemotePatchWindow.cpp
+++ b/src/gui/LoadRemotePatchWindow.cpp
@@ -19,7 +19,7 @@
 #include <dirent.h>
 #include <boost/optional/optional.hpp>
 #include "client/PatchModel.hpp"
-#include "interface/EngineInterface.hpp"
+#include "ingen/EngineInterface.hpp"
 #include "module/World.hpp"
 #include "App.hpp"
 #include "Configuration.hpp"
diff --git a/src/gui/LoadRemotePatchWindow.hpp b/src/gui/LoadRemotePatchWindow.hpp
index 9c549588..32ff32b6 100644
--- a/src/gui/LoadRemotePatchWindow.hpp
+++ b/src/gui/LoadRemotePatchWindow.hpp
@@ -21,7 +21,7 @@
 #include <libglademm/xml.h>
 #include <gtkmm.h>
 #include "raul/SharedPtr.hpp"
-#include "interface/GraphObject.hpp"
+#include "ingen/GraphObject.hpp"
 #include "Window.hpp"
 using namespace Ingen::Shared;
 
diff --git a/src/gui/NewSubpatchWindow.cpp b/src/gui/NewSubpatchWindow.cpp
index 13ea0c47..b91bf306 100644
--- a/src/gui/NewSubpatchWindow.cpp
+++ b/src/gui/NewSubpatchWindow.cpp
@@ -16,7 +16,7 @@
  */
 
 #include "App.hpp"
-#include "interface/EngineInterface.hpp"
+#include "ingen/EngineInterface.hpp"
 #include "shared/LV2URIMap.hpp"
 #include "client/PatchModel.hpp"
 #include "client/ClientStore.hpp"
diff --git a/src/gui/NewSubpatchWindow.hpp b/src/gui/NewSubpatchWindow.hpp
index e7f31313..2375d5d9 100644
--- a/src/gui/NewSubpatchWindow.hpp
+++ b/src/gui/NewSubpatchWindow.hpp
@@ -21,7 +21,7 @@
 #include <libglademm/xml.h>
 #include <gtkmm.h>
 #include "raul/SharedPtr.hpp"
-#include "interface/GraphObject.hpp"
+#include "ingen/GraphObject.hpp"
 #include "Window.hpp"
 
 namespace Ingen {
diff --git a/src/gui/NodeControlWindow.cpp b/src/gui/NodeControlWindow.cpp
index 548f69c1..64c8371a 100644
--- a/src/gui/NodeControlWindow.cpp
+++ b/src/gui/NodeControlWindow.cpp
@@ -16,7 +16,7 @@
  */
 
 #include <cmath>
-#include "interface/EngineInterface.hpp"
+#include "ingen/EngineInterface.hpp"
 #include "shared/LV2URIMap.hpp"
 #include "client/NodeModel.hpp"
 #include "App.hpp"
diff --git a/src/gui/NodeMenu.cpp b/src/gui/NodeMenu.cpp
index 806282fb..3eb361e3 100644
--- a/src/gui/NodeMenu.cpp
+++ b/src/gui/NodeMenu.cpp
@@ -17,7 +17,7 @@
 
 #include <gtkmm.h>
 #include "ingen-config.h"
-#include "interface/EngineInterface.hpp"
+#include "ingen/EngineInterface.hpp"
 #include "shared/LV2URIMap.hpp"
 #include "client/NodeModel.hpp"
 #include "client/PluginModel.hpp"
diff --git a/src/gui/NodeModule.cpp b/src/gui/NodeModule.cpp
index d7523083..f85ad2f4 100644
--- a/src/gui/NodeModule.cpp
+++ b/src/gui/NodeModule.cpp
@@ -19,7 +19,7 @@
 #include "ingen-config.h"
 #include "raul/log.hpp"
 #include "raul/Atom.hpp"
-#include "interface/EngineInterface.hpp"
+#include "ingen/EngineInterface.hpp"
 #include "shared/LV2URIMap.hpp"
 #include "client/PatchModel.hpp"
 #include "client/NodeModel.hpp"
diff --git a/src/gui/ObjectMenu.cpp b/src/gui/ObjectMenu.cpp
index b0c20af9..e821e846 100644
--- a/src/gui/ObjectMenu.cpp
+++ b/src/gui/ObjectMenu.cpp
@@ -17,7 +17,7 @@
 
 #include <utility>
 #include <gtkmm.h>
-#include "interface/EngineInterface.hpp"
+#include "ingen/EngineInterface.hpp"
 #include "shared/LV2URIMap.hpp"
 #include "client/ObjectModel.hpp"
 #include "App.hpp"
diff --git a/src/gui/PatchCanvas.cpp b/src/gui/PatchCanvas.cpp
index d3d8c5c4..ce5de9d5 100644
--- a/src/gui/PatchCanvas.cpp
+++ b/src/gui/PatchCanvas.cpp
@@ -22,7 +22,7 @@
 #include "raul/log.hpp"
 #include "flowcanvas/Canvas.hpp"
 #include "flowcanvas/Ellipse.hpp"
-#include "interface/EngineInterface.hpp"
+#include "ingen/EngineInterface.hpp"
 #include "shared/LV2URIMap.hpp"
 #include "shared/Builder.hpp"
 #include "shared/ClashAvoider.hpp"
diff --git a/src/gui/PatchCanvas.hpp b/src/gui/PatchCanvas.hpp
index 702f90bb..b0e8491d 100644
--- a/src/gui/PatchCanvas.hpp
+++ b/src/gui/PatchCanvas.hpp
@@ -28,7 +28,7 @@
 #include "raul/SharedPtr.hpp"
 #include "raul/Path.hpp"
 #include "client/ConnectionModel.hpp"
-#include "interface/GraphObject.hpp"
+#include "ingen/GraphObject.hpp"
 #include "NodeModule.hpp"
 
 using namespace FlowCanvas;
diff --git a/src/gui/PatchPortModule.cpp b/src/gui/PatchPortModule.cpp
index b8e74a8f..ba243b75 100644
--- a/src/gui/PatchPortModule.cpp
+++ b/src/gui/PatchPortModule.cpp
@@ -18,7 +18,7 @@
 #include <cassert>
 #include <utility>
 #include "PatchPortModule.hpp"
-#include "interface/EngineInterface.hpp"
+#include "ingen/EngineInterface.hpp"
 #include "shared/LV2URIMap.hpp"
 #include "client/PatchModel.hpp"
 #include "client/NodeModel.hpp"
diff --git a/src/gui/PatchTreeWindow.cpp b/src/gui/PatchTreeWindow.cpp
index 3111f54c..b1462459 100644
--- a/src/gui/PatchTreeWindow.cpp
+++ b/src/gui/PatchTreeWindow.cpp
@@ -17,7 +17,7 @@
 
 #include "raul/log.hpp"
 #include "raul/Path.hpp"
-#include "interface/EngineInterface.hpp"
+#include "ingen/EngineInterface.hpp"
 #include "shared/LV2URIMap.hpp"
 #include "client/ClientStore.hpp"
 #include "client/PatchModel.hpp"
diff --git a/src/gui/PatchView.cpp b/src/gui/PatchView.cpp
index 1313f65e..5fd643a2 100644
--- a/src/gui/PatchView.cpp
+++ b/src/gui/PatchView.cpp
@@ -18,7 +18,7 @@
 #include <cassert>
 #include <fstream>
 #include "raul/log.hpp"
-#include "interface/EngineInterface.hpp"
+#include "ingen/EngineInterface.hpp"
 #include "shared/LV2URIMap.hpp"
 #include "client/PatchModel.hpp"
 #include "App.hpp"
diff --git a/src/gui/PatchWindow.cpp b/src/gui/PatchWindow.cpp
index c64d72b9..ca045f2f 100644
--- a/src/gui/PatchWindow.cpp
+++ b/src/gui/PatchWindow.cpp
@@ -22,7 +22,7 @@
 #include <glib/gstdio.h>
 #include <glibmm/fileutils.h>
 #include "raul/AtomRDF.hpp"
-#include "interface/EngineInterface.hpp"
+#include "ingen/EngineInterface.hpp"
 #include "shared/LV2URIMap.hpp"
 #include "client/PatchModel.hpp"
 #include "client/ClientStore.hpp"
diff --git a/src/gui/Port.cpp b/src/gui/Port.cpp
index 949e459d..14769ee0 100644
--- a/src/gui/Port.cpp
+++ b/src/gui/Port.cpp
@@ -18,7 +18,7 @@
 #include <cassert>
 #include "raul/log.hpp"
 #include "flowcanvas/Module.hpp"
-#include "interface/EngineInterface.hpp"
+#include "ingen/EngineInterface.hpp"
 #include "shared/LV2URIMap.hpp"
 #include "client/PatchModel.hpp"
 #include "client/PortModel.hpp"
diff --git a/src/gui/PortMenu.cpp b/src/gui/PortMenu.cpp
index 068d8ccc..6b0591dc 100644
--- a/src/gui/PortMenu.cpp
+++ b/src/gui/PortMenu.cpp
@@ -18,7 +18,7 @@
 #include <math.h>
 #include <gtkmm.h>
 #include "raul/SharedPtr.hpp"
-#include "interface/EngineInterface.hpp"
+#include "ingen/EngineInterface.hpp"
 #include "shared/LV2URIMap.hpp"
 #include "client/PatchModel.hpp"
 #include "client/PortModel.hpp"
diff --git a/src/gui/PortPropertiesWindow.cpp b/src/gui/PortPropertiesWindow.cpp
index 5cfe33ef..3805dad1 100644
--- a/src/gui/PortPropertiesWindow.cpp
+++ b/src/gui/PortPropertiesWindow.cpp
@@ -17,7 +17,7 @@
 
 #include <cassert>
 #include <string>
-#include "interface/EngineInterface.hpp"
+#include "ingen/EngineInterface.hpp"
 #include "shared/LV2URIMap.hpp"
 #include "client/NodeModel.hpp"
 #include "client/PluginModel.hpp"
diff --git a/src/gui/RenameWindow.cpp b/src/gui/RenameWindow.cpp
index bafa23b6..e9a92dfa 100644
--- a/src/gui/RenameWindow.cpp
+++ b/src/gui/RenameWindow.cpp
@@ -17,7 +17,7 @@
 
 #include <cassert>
 #include <string>
-#include "interface/EngineInterface.hpp"
+#include "ingen/EngineInterface.hpp"
 #include "shared/LV2URIMap.hpp"
 #include "client/ObjectModel.hpp"
 #include "client/ClientStore.hpp"
diff --git a/src/gui/SubpatchModule.cpp b/src/gui/SubpatchModule.cpp
index 957496ca..695f7459 100644
--- a/src/gui/SubpatchModule.cpp
+++ b/src/gui/SubpatchModule.cpp
@@ -17,7 +17,7 @@
 
 #include "SubpatchModule.hpp"
 #include <cassert>
-#include "interface/EngineInterface.hpp"
+#include "ingen/EngineInterface.hpp"
 #include "client/PatchModel.hpp"
 #include "App.hpp"
 #include "NodeModule.hpp"
diff --git a/src/gui/ThreadedLoader.hpp b/src/gui/ThreadedLoader.hpp
index 96c64af3..2e49b4d4 100644
--- a/src/gui/ThreadedLoader.hpp
+++ b/src/gui/ThreadedLoader.hpp
@@ -25,7 +25,7 @@
 #include "raul/Thread.hpp"
 #include "raul/Slave.hpp"
 #include <glibmm/thread.h>
-#include "interface/EngineInterface.hpp"
+#include "ingen/EngineInterface.hpp"
 #include "serialisation/Serialiser.hpp"
 #include "serialisation/Parser.hpp"
 using std::string;
diff --git a/src/gui/UploadPatchWindow.cpp b/src/gui/UploadPatchWindow.cpp
index d2982bc3..bce639b9 100644
--- a/src/gui/UploadPatchWindow.cpp
+++ b/src/gui/UploadPatchWindow.cpp
@@ -24,7 +24,7 @@
 #include "module/World.hpp"
 #include "shared/LV2URIMap.hpp"
 #include "client/ClientStore.hpp"
-#include "interface/EngineInterface.hpp"
+#include "ingen/EngineInterface.hpp"
 #include "serialisation/Serialiser.hpp"
 #include "serialisation/names.hpp"
 #include "client/PatchModel.hpp"
diff --git a/src/gui/WindowFactory.hpp b/src/gui/WindowFactory.hpp
index a00ffc1e..e8eb7837 100644
--- a/src/gui/WindowFactory.hpp
+++ b/src/gui/WindowFactory.hpp
@@ -21,7 +21,7 @@
 #include <map>
 #include <gtkmm.h>
 #include "raul/SharedPtr.hpp"
-#include "interface/GraphObject.hpp"
+#include "ingen/GraphObject.hpp"
 
 using namespace Ingen::Shared;
 
diff --git a/src/gui/wscript b/src/gui/wscript
index 81965960..49d19fa1 100644
--- a/src/gui/wscript
+++ b/src/gui/wscript
@@ -46,7 +46,7 @@ def build(bld):
 		obj.source += 'UploadPatchWindow.cpp'
 
 	obj.export_includes = ['.']
-	obj.includes        = ['.', '..', '../..', '../common', '../client', '../module']
+	obj.includes        = ['.', '..', '../..', '../../include', '../client', '../module']
 	obj.name            = 'libingen_gui'
 	obj.target          = 'ingen_gui'
 	obj.install_path    = '${LIBDIR}'
diff --git a/src/ingen/main.cpp b/src/ingen/main.cpp
index 0f4339fd..3a27b46b 100644
--- a/src/ingen/main.cpp
+++ b/src/ingen/main.cpp
@@ -38,7 +38,7 @@
 #include "ingen-config.h"
 
 #include "engine/Engine.hpp"
-#include "interface/EngineInterface.hpp"
+#include "ingen/EngineInterface.hpp"
 #include "module/World.hpp"
 #include "module/ingen_module.hpp"
 #include "serialisation/Parser.hpp"
diff --git a/src/ingen/wscript b/src/ingen/wscript
index 56b1b3dd..53ccef7b 100644
--- a/src/ingen/wscript
+++ b/src/ingen/wscript
@@ -5,7 +5,7 @@ def build(bld):
 	obj = bld(features = 'c cxx cxxprogram')
 	obj.target       = 'ingen'
 	obj.source       = 'main.cpp'
-	obj.includes     = ['..', '../..', '../common']
+	obj.includes     = ['..', '../..', '../../include']
 	obj.defines      = 'VERSION="' + bld.env['INGEN_VERSION'] + '"'
 	obj.use          = 'libingen_module libingen_shared'
 	obj.install_path = '${BINDIR}'
diff --git a/src/module/wscript b/src/module/wscript
index 20ef57ef..c15f17b7 100644
--- a/src/module/wscript
+++ b/src/module/wscript
@@ -11,7 +11,7 @@ def build(bld):
 		ingen_module.cpp
 	'''
 	obj.export_includes = ['.']
-	obj.includes	    = ['.', '..', '../..', '../common']
+	obj.includes	    = ['.', '..', '../..', '../../include']
 	obj.name	    = 'libingen_module'
 	obj.target	    = 'ingen_module'
 	obj.vnum	    = '0.0.0'
diff --git a/src/serialisation/Parser.cpp b/src/serialisation/Parser.cpp
index 4d561721..0429b116 100644
--- a/src/serialisation/Parser.cpp
+++ b/src/serialisation/Parser.cpp
@@ -34,7 +34,7 @@
 #include "serd/serd.h"
 #include "sord/sordmm.hpp"
 
-#include "interface/EngineInterface.hpp"
+#include "ingen/EngineInterface.hpp"
 #include "module/World.hpp"
 #include "shared/LV2URIMap.hpp"
 
diff --git a/src/serialisation/Parser.hpp b/src/serialisation/Parser.hpp
index 948a2e74..7533a442 100644
--- a/src/serialisation/Parser.hpp
+++ b/src/serialisation/Parser.hpp
@@ -25,9 +25,10 @@
 
 #include <boost/optional.hpp>
 
-#include "interface/GraphObject.hpp"
+#include "raul/Path.hpp"
+
+#include "ingen/GraphObject.hpp"
 
-namespace Raul  { class Path; }
 namespace Sord  { class World; class Model; class Node; }
 namespace Ingen { namespace Shared { class CommonInterface; } }
 
diff --git a/src/serialisation/Serialiser.cpp b/src/serialisation/Serialiser.cpp
index 7da2048c..0c8cc93c 100644
--- a/src/serialisation/Serialiser.cpp
+++ b/src/serialisation/Serialiser.cpp
@@ -42,12 +42,12 @@
 
 #include "sord/sordmm.hpp"
 
-#include "interface/Connection.hpp"
-#include "interface/EngineInterface.hpp"
-#include "interface/Node.hpp"
-#include "interface/Patch.hpp"
-#include "interface/Plugin.hpp"
-#include "interface/Port.hpp"
+#include "ingen/Connection.hpp"
+#include "ingen/EngineInterface.hpp"
+#include "ingen/Node.hpp"
+#include "ingen/Patch.hpp"
+#include "ingen/Plugin.hpp"
+#include "ingen/Port.hpp"
 #include "module/World.hpp"
 #include "shared/LV2URIMap.hpp"
 #include "shared/ResourceImpl.hpp"
diff --git a/src/serialisation/Serialiser.hpp b/src/serialisation/Serialiser.hpp
index 596cb1c5..01a6109c 100644
--- a/src/serialisation/Serialiser.hpp
+++ b/src/serialisation/Serialiser.hpp
@@ -29,7 +29,7 @@
 
 #include "sord/sordmm.hpp"
 
-#include "interface/GraphObject.hpp"
+#include "ingen/GraphObject.hpp"
 #include "shared/Store.hpp"
 
 namespace Ingen {
diff --git a/src/serialisation/serialisation.cpp b/src/serialisation/serialisation.cpp
index c6141d7d..a8cf75bd 100644
--- a/src/serialisation/serialisation.cpp
+++ b/src/serialisation/serialisation.cpp
@@ -17,6 +17,7 @@
 
 #include "module/Module.hpp"
 #include "module/World.hpp"
+
 #include "Parser.hpp"
 #include "Serialiser.hpp"
 
diff --git a/src/serialisation/wscript b/src/serialisation/wscript
index 54ec7228..3c72871d 100644
--- a/src/serialisation/wscript
+++ b/src/serialisation/wscript
@@ -12,7 +12,7 @@ def build(bld):
 		serialisation.cpp
 	'''
 	obj.export_includes = ['.']
-	obj.includes        = ['.', '..', '../..', '../common']
+	obj.includes        = ['.', '..', '../..', '../../include']
 	obj.name            = 'libingen_serialisation'
 	obj.target          = 'ingen_serialisation'
 	obj.install_path    = '${LIBDIR}'
diff --git a/src/shared/Builder.cpp b/src/shared/Builder.cpp
index 98ce3879..369be71b 100644
--- a/src/shared/Builder.cpp
+++ b/src/shared/Builder.cpp
@@ -16,12 +16,12 @@
  */
 
 #include "raul/Atom.hpp"
-#include "common/interface/CommonInterface.hpp"
-#include "common/interface/Patch.hpp"
-#include "common/interface/Node.hpp"
-#include "common/interface/Port.hpp"
-#include "common/interface/Connection.hpp"
-#include "common/interface/Plugin.hpp"
+#include "ingen/CommonInterface.hpp"
+#include "ingen/Patch.hpp"
+#include "ingen/Node.hpp"
+#include "ingen/Port.hpp"
+#include "ingen/Connection.hpp"
+#include "ingen/Plugin.hpp"
 #include "shared/LV2URIMap.hpp"
 #include "Builder.hpp"
 
diff --git a/src/shared/ClashAvoider.hpp b/src/shared/ClashAvoider.hpp
index 6c43bd72..dd5987ca 100644
--- a/src/shared/ClashAvoider.hpp
+++ b/src/shared/ClashAvoider.hpp
@@ -21,7 +21,7 @@
 #include <inttypes.h>
 #include <string>
 #include <map>
-#include "interface/CommonInterface.hpp"
+#include "ingen/CommonInterface.hpp"
 
 namespace Raul { class Atom; class Path; }
 
diff --git a/src/shared/ResourceImpl.hpp b/src/shared/ResourceImpl.hpp
index 6ce6cd26..75b58d21 100644
--- a/src/shared/ResourceImpl.hpp
+++ b/src/shared/ResourceImpl.hpp
@@ -21,8 +21,8 @@
 #include <map>
 #include "raul/URI.hpp"
 #include "raul/SharedPtr.hpp"
-#include "interface/Resource.hpp"
-#include "interface/PortType.hpp"
+#include "ingen/Resource.hpp"
+#include "ingen/PortType.hpp"
 
 namespace Ingen {
 namespace Shared {
diff --git a/src/shared/Store.cpp b/src/shared/Store.cpp
index 4edaa001..fc366376 100644
--- a/src/shared/Store.cpp
+++ b/src/shared/Store.cpp
@@ -19,8 +19,8 @@
 #include "raul/log.hpp"
 #include "raul/PathTable.hpp"
 #include "raul/TableImpl.hpp"
-#include "common/interface/Node.hpp"
-#include "common/interface/Port.hpp"
+#include "ingen/Node.hpp"
+#include "ingen/Port.hpp"
 #include "Store.hpp"
 
 using namespace std;
diff --git a/src/shared/Store.hpp b/src/shared/Store.hpp
index 3d279211..5a019a5c 100644
--- a/src/shared/Store.hpp
+++ b/src/shared/Store.hpp
@@ -21,7 +21,7 @@
 #include <string>
 #include <glibmm/thread.h>
 #include "raul/PathTable.hpp"
-#include "interface/GraphObject.hpp"
+#include "ingen/GraphObject.hpp"
 
 namespace Ingen {
 namespace Shared {
diff --git a/src/shared/wscript b/src/shared/wscript
index 928a77f8..811ed45e 100644
--- a/src/shared/wscript
+++ b/src/shared/wscript
@@ -23,7 +23,7 @@ def build(bld):
 		autowaf.use_lib(bld, obj, 'SOUP')
 		obj.source += ' HTTPSender.cpp '
 	obj.export_includes = ['.']
-	obj.includes        = ['.', '..', '../..', '../common']
+	obj.includes        = ['.', '..', '../..', '../../include']
 	obj.name            = 'libingen_shared'
 	obj.target          = 'ingen_shared'
 	obj.vnum            = '0.0.0'
diff --git a/wscript b/wscript
index 950973a3..6b4f72ef 100644
--- a/wscript
+++ b/wscript
@@ -124,8 +124,8 @@ def build(bld):
 	opts.moduledir = opts.moduledir or bld.env['PREFIX'] + 'lib/ingen'
 
 	# Headers
-	bld.install_files('${INCLUDEDIR}/ingen/interface',
-			  bld.path.ant_glob('src/common/interface/*.hpp'))
+	bld.install_files('${INCLUDEDIR}/ingen',
+	                  bld.path.ant_glob('include/ingen/*.hpp'))
 
 	# Modules
 	bld.recurse('src/engine')
@@ -141,7 +141,7 @@ def build(bld):
 	obj = bld(features = 'c cxx cxxprogram')
 	obj.target       = 'ingen'
 	obj.source       = 'src/ingen/main.cpp'
-	obj.includes     = ['.', 'src', 'src/common']
+	obj.includes     = ['.', 'src', 'include']
 	obj.defines      = 'VERSION="' + bld.env['INGEN_VERSION'] + '"'
 	obj.use          = 'libingen_module libingen_shared'
 	obj.install_path = '${BINDIR}'