Merge Ingen::Shared namespace into Ingen namespace and core libingen library.

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

24 files changed, 76 insertions, 91 deletions

diff --git a/src/gui/App.cpp b/src/gui/App.cpp
index 1d6381fb..2c561dfc 100644
--- a/src/gui/App.cpp
+++ b/src/gui/App.cpp
@@ -29,8 +29,8 @@
 #include "ingen/client/ObjectModel.hpp"
 #include "ingen/client/PatchModel.hpp"
 #include "ingen/client/SigClientInterface.hpp"
-#include "ingen/shared/World.hpp"
-#include "ingen/shared/runtime_paths.hpp"
+#include "ingen/World.hpp"
+#include "ingen/runtime_paths.hpp"
 #include "lilv/lilv.h"
 #include "raul/Path.hpp"
 #include "raul/log.hpp"
@@ -62,7 +62,6 @@ namespace Ingen {
 namespace Client { class PluginModel; }
 
 using namespace Client;
-using namespace Shared;
 
 namespace GUI {
 
@@ -70,7 +69,7 @@ class Port;
 
 Gtk::Main* App::_main = 0;
 
-App::App(Ingen::Shared::World* world)
+App::App(Ingen::World* world)
 	: _configuration(new Configuration(*this))
 	, _about_dialog(NULL)
 	, _window_factory(new WindowFactory(*this))
@@ -102,7 +101,7 @@ App::~App()
 }
 
 SharedPtr<App>
-App::create(Ingen::Shared::World* world)
+App::create(Ingen::World* world)
 {
 	_main = new Gtk::Main(&world->argc(), &world->argv());
 
diff --git a/src/gui/App.hpp b/src/gui/App.hpp
index 1f611a13..5d93c805 100644
--- a/src/gui/App.hpp
+++ b/src/gui/App.hpp
@@ -27,7 +27,7 @@
 #include <gtkmm/window.h>
 
 #include "ingen/Status.hpp"
-#include "ingen/shared/World.hpp"
+#include "ingen/World.hpp"
 #include "raul/Atom.hpp"
 #include "raul/Deletable.hpp"
 #include "raul/SharedPtr.hpp"
@@ -36,9 +36,7 @@
 namespace Ingen {
 	class Interface;
 	class Port;
-	namespace Shared {
-		class World;
-	}
+	class World;
 	namespace Client {
 		class ClientStore;
 		class PatchModel;
@@ -107,7 +105,7 @@ public:
 
 	Glib::RefPtr<Gdk::Pixbuf> icon_from_path(const std::string& path, int size);
 
-	Ingen::Shared::Forge&                 forge()     const { return _world->forge(); }
+	Ingen::Forge&                         forge()     const { return _world->forge(); }
 	SharedPtr<Ingen::Interface>           interface() const { return _world->interface(); }
 	SharedPtr<Client::SigClientInterface> client()    const { return _client; }
 	SharedPtr<Client::ClientStore>        store()     const { return _store; }
@@ -115,11 +113,11 @@ public:
 
 	SharedPtr<Serialisation::Serialiser> serialiser();
 
-	static SharedPtr<App> create(Ingen::Shared::World* world);
+	static SharedPtr<App> create(Ingen::World* world);
 	void run();
 
-	inline Ingen::Shared::World* world() const { return _world; }
-	inline Ingen::Shared::URIs&  uris()  const { return _world->uris(); }
+	inline Ingen::World* world() const { return _world; }
+	inline Ingen::URIs&  uris()  const { return _world->uris(); }
 
 protected:
 
@@ -137,7 +135,7 @@ protected:
 	                  LexicalCompare<std::string, int> > Icons;
 	Icons _icons;
 
-	explicit App(Ingen::Shared::World* world);
+	explicit App(Ingen::World* world);
 
 	bool animate();
 	void response(int32_t id, Ingen::Status status, const std::string& subject);
@@ -162,7 +160,7 @@ protected:
 	Gtk::AboutDialog* _about_dialog;
 	WindowFactory*    _window_factory;
 
-	Ingen::Shared::World* _world;
+	Ingen::World* _world;
 
 	uint32_t _sample_rate;
 
diff --git a/src/gui/Configuration.cpp b/src/gui/Configuration.cpp
index f3b1351b..c6737fe7 100644
--- a/src/gui/Configuration.cpp
+++ b/src/gui/Configuration.cpp
@@ -85,7 +85,7 @@ uint32_t
 Configuration::get_port_color(const Client::PortModel* p)
 {
 	assert(p != NULL);
-	const Shared::URIs& uris = _app.uris();
+	const URIs& uris = _app.uris();
 	if (p->is_a(uris.lv2_AudioPort)) {
 		return _audio_port_color;
 	} else if (p->supports(uris.atom_String)) {
diff --git a/src/gui/ConnectWindow.cpp b/src/gui/ConnectWindow.cpp
index 0c3dde27..81426620 100644
--- a/src/gui/ConnectWindow.cpp
+++ b/src/gui/ConnectWindow.cpp
@@ -28,8 +28,8 @@
 #include "ingen/client/ClientStore.hpp"
 #include "ingen/client/PatchModel.hpp"
 #include "ingen/client/ThreadedSigClientInterface.hpp"
-#include "ingen/shared/Module.hpp"
-#include "ingen/shared/World.hpp"
+#include "ingen/Module.hpp"
+#include "ingen/World.hpp"
 
 #include "App.hpp"
 #include "ConnectWindow.hpp"
@@ -72,7 +72,7 @@ ConnectWindow::ConnectWindow(BaseObjectType*                   cobject,
 }
 
 void
-ConnectWindow::start(App& app, Ingen::Shared::World* world)
+ConnectWindow::start(App& app, Ingen::World* world)
 {
 	_app = &app;
 
@@ -160,7 +160,7 @@ ConnectWindow::connect(bool existing)
 	_connect_stage = 0;
 	set_connecting_widget_states();
 
-	Ingen::Shared::World* world = _app->world();
+	Ingen::World* world = _app->world();
 
 #ifdef HAVE_SOCKET
 	if (_mode == CONNECT_REMOTE) {
diff --git a/src/gui/ConnectWindow.hpp b/src/gui/ConnectWindow.hpp
index ca27787e..2f7a43e7 100644
--- a/src/gui/ConnectWindow.hpp
+++ b/src/gui/ConnectWindow.hpp
@@ -50,7 +50,7 @@ public:
 	              const Glib::RefPtr<Gtk::Builder>& xml);
 
 	void set_connected_to(SharedPtr<Ingen::Interface> engine);
-	void start(App& app, Ingen::Shared::World* world);
+	void start(App& app, Ingen::World* world);
 	void ingen_response(int32_t id, Status status, const std::string& subject) {
 		_attached = true;
 	}
diff --git a/src/gui/LoadPatchWindow.cpp b/src/gui/LoadPatchWindow.cpp
index 94142868..7d23f5d9 100644
--- a/src/gui/LoadPatchWindow.cpp
+++ b/src/gui/LoadPatchWindow.cpp
@@ -25,7 +25,7 @@
 #include "ingen/client/ClientStore.hpp"
 #include "ingen/client/NodeModel.hpp"
 #include "ingen/client/PatchModel.hpp"
-#include "ingen/shared/runtime_paths.hpp"
+#include "ingen/runtime_paths.hpp"
 
 #include "App.hpp"
 #include "Configuration.hpp"
@@ -39,7 +39,6 @@ using namespace Raul;
 namespace Ingen {
 
 using namespace Client;
-using namespace Shared;
 
 namespace GUI {
 
@@ -89,7 +88,7 @@ LoadPatchWindow::LoadPatchWindow(BaseObjectType*                   cobject,
 	property_select_multiple() = true;
 
 	// Add global examples directory to "shortcut folders" (bookmarks)
-	const string examples_dir = Shared::data_file_path("patches");
+	const string examples_dir = Ingen::data_file_path("patches");
 	if (Glib::file_test(examples_dir, Glib::FILE_TEST_IS_DIR)) {
 		add_shortcut_folder(examples_dir);
 	}
diff --git a/src/gui/LoadPluginWindow.cpp b/src/gui/LoadPluginWindow.cpp
index 18d1a63c..cac404df 100644
--- a/src/gui/LoadPluginWindow.cpp
+++ b/src/gui/LoadPluginWindow.cpp
@@ -39,7 +39,6 @@ using namespace Raul;
 namespace Ingen {
 
 using namespace Client;
-using namespace Shared;
 
 namespace GUI {
 
diff --git a/src/gui/NodeModule.cpp b/src/gui/NodeModule.cpp
index 1d3f6801..8e9f88e0 100644
--- a/src/gui/NodeModule.cpp
+++ b/src/gui/NodeModule.cpp
@@ -47,7 +47,6 @@ using namespace Raul;
 namespace Ingen {
 
 using namespace Client;
-using namespace Shared;
 
 namespace GUI {
 
@@ -405,7 +404,7 @@ NodeModule::store_location(double ax, double ay)
 void
 NodeModule::property_changed(const URI& key, const Atom& value)
 {
-	const Shared::URIs& uris = app().uris();
+	const URIs& uris = app().uris();
 	if (value.type() == uris.forge.Float) {
 		if (key == uris.ingen_canvasX) {
 			move_to(value.get_float(), get_y());
diff --git a/src/gui/ObjectMenu.cpp b/src/gui/ObjectMenu.cpp
index 5698bd7f..4fa99677 100644
--- a/src/gui/ObjectMenu.cpp
+++ b/src/gui/ObjectMenu.cpp
@@ -29,7 +29,6 @@ using namespace Raul;
 namespace Ingen {
 
 using namespace Client;
-using namespace Shared;
 
 namespace GUI {
 
diff --git a/src/gui/PatchBox.cpp b/src/gui/PatchBox.cpp
index ce2d23db..7c9483f2 100644
--- a/src/gui/PatchBox.cpp
+++ b/src/gui/PatchBox.cpp
@@ -453,7 +453,7 @@ PatchBox::message_dialog(const Glib::ustring& message,
 void
 PatchBox::event_save_as()
 {
-	const Shared::URIs& uris = _app->uris();
+	const URIs& uris = _app->uris();
 	while (true) {
 		Gtk::FileChooserDialog dialog("Save Patch", Gtk::FILE_CHOOSER_ACTION_SAVE);
 		if (_window) {
diff --git a/src/gui/PatchCanvas.cpp b/src/gui/PatchCanvas.cpp
index f9e65390..fbbe88b1 100644
--- a/src/gui/PatchCanvas.cpp
+++ b/src/gui/PatchCanvas.cpp
@@ -30,9 +30,9 @@
 #include "ingen/client/PatchModel.hpp"
 #include "ingen/client/PluginModel.hpp"
 #include "ingen/serialisation/Serialiser.hpp"
-#include "ingen/shared/Builder.hpp"
-#include "ingen/shared/ClashAvoider.hpp"
-#include "ingen/shared/World.hpp"
+#include "ingen/Builder.hpp"
+#include "ingen/ClashAvoider.hpp"
+#include "ingen/World.hpp"
 #include "lv2/lv2plug.in/ns/ext/atom/atom.h"
 #include "raul/log.hpp"
 
@@ -62,7 +62,6 @@ using namespace Raul;
 namespace Ingen {
 
 using namespace Client;
-using namespace Shared;
 
 namespace GUI {
 
diff --git a/src/gui/PatchPortModule.cpp b/src/gui/PatchPortModule.cpp
index 3c04d29e..5e57adb5 100644
--- a/src/gui/PatchPortModule.cpp
+++ b/src/gui/PatchPortModule.cpp
@@ -39,7 +39,6 @@ using namespace Raul;
 namespace Ingen {
 
 using namespace Client;
-using namespace Shared;
 
 namespace GUI {
 
diff --git a/src/gui/PatchTreeWindow.cpp b/src/gui/PatchTreeWindow.cpp
index 29dc3721..b6c67211 100644
--- a/src/gui/PatchTreeWindow.cpp
+++ b/src/gui/PatchTreeWindow.cpp
@@ -32,7 +32,6 @@ using namespace Raul;
 namespace Ingen {
 
 using namespace Client;
-using namespace Shared;
 
 namespace GUI {
 
diff --git a/src/gui/Port.cpp b/src/gui/Port.cpp
index 5e847400..7a4ed0c8 100644
--- a/src/gui/Port.cpp
+++ b/src/gui/Port.cpp
@@ -36,7 +36,6 @@ using namespace std;
 using namespace Raul;
 
 namespace Ingen {
-using namespace Shared;
 namespace GUI {
 
 Port*
@@ -146,7 +145,7 @@ Port::on_value_changed(GVariant* value)
 
 	const Raul::Atom atom = _app.forge().make(float(g_variant_get_double(value)));
 	if (atom != model()->value()) {
-		Ingen::Shared::World* const world = _app.world();
+		Ingen::World* const world = _app.world();
 		_app.interface()->set_property(model()->path(),
 		                               world->uris().ingen_value,
 		                               atom);
diff --git a/src/gui/PortMenu.cpp b/src/gui/PortMenu.cpp
index cd611199..9b1f8aa0 100644
--- a/src/gui/PortMenu.cpp
+++ b/src/gui/PortMenu.cpp
@@ -28,7 +28,6 @@
 namespace Ingen {
 
 using namespace Client;
-using namespace Shared;
 
 namespace GUI {
 
diff --git a/src/gui/PortPropertiesWindow.cpp b/src/gui/PortPropertiesWindow.cpp
index 668aaa88..56996011 100644
--- a/src/gui/PortPropertiesWindow.cpp
+++ b/src/gui/PortPropertiesWindow.cpp
@@ -96,8 +96,7 @@ PortPropertiesWindow::present(SharedPtr<const PortModel> pm)
 void
 PortPropertiesWindow::property_changed(const URI& key, const Atom& value)
 {
-	const Shared::URIs& uris = _app->uris();
-
+	const URIs& uris = _app->uris();
 	if (value.type() == uris.forge.Float) {
 		if (key == uris.lv2_minimum)
 			_min_spinner->set_value(value.get_float());
@@ -151,7 +150,7 @@ PortPropertiesWindow::cancel()
 void
 PortPropertiesWindow::ok()
 {
-	const Shared::URIs& uris = _app->uris();
+	const URIs& uris = _app->uris();
 	Resource::Properties props;
 	props.insert(
 		make_pair(uris.lv2_minimum,
diff --git a/src/gui/PropertiesWindow.cpp b/src/gui/PropertiesWindow.cpp
index 6f92d0d3..1a4228b8 100644
--- a/src/gui/PropertiesWindow.cpp
+++ b/src/gui/PropertiesWindow.cpp
@@ -22,12 +22,13 @@
 #include <gtkmm/label.h>
 #include <gtkmm/spinbutton.h>
 
-#include "raul/log.hpp"
-#include "ingen/shared/World.hpp"
-#include "ingen/client/NodeModel.hpp"
-#include "ingen/client/PluginModel.hpp"
 #include "App.hpp"
 #include "PropertiesWindow.hpp"
+#include "ingen/Interface.hpp"
+#include "ingen/World.hpp"
+#include "ingen/client/NodeModel.hpp"
+#include "ingen/client/PluginModel.hpp"
+#include "raul/log.hpp"
 
 #define LOG(s) s << "[PropertiesWindow] "
 
@@ -37,7 +38,6 @@ using namespace Raul;
 namespace Ingen {
 
 using namespace Client;
-using namespace Shared;
 
 namespace GUI {
 
@@ -105,7 +105,7 @@ PropertiesWindow::present(SharedPtr<const ObjectModel> model)
 
 /** Get all the types which this model is an instance of */
 static URISet
-get_types(Shared::World* world, SharedPtr<const ObjectModel> model)
+get_types(World* world, SharedPtr<const ObjectModel> model)
 {
 	typedef Resource::Properties::const_iterator PropIter;
 	typedef std::pair<PropIter, PropIter>        PropRange;
@@ -152,7 +152,7 @@ get_types(Shared::World* world, SharedPtr<const ObjectModel> model)
 
 /** Get all the properties with domains appropriate to this model */
 static URISet
-get_properties(Shared::World* world, SharedPtr<const ObjectModel> model)
+get_properties(World* world, SharedPtr<const ObjectModel> model)
 {
 	URISet properties;
 	URISet types = get_types(world, model);
@@ -197,7 +197,7 @@ get_properties(Shared::World* world, SharedPtr<const ObjectModel> model)
 }
 
 static Glib::ustring
-get_label(Shared::World* world, const LilvNode* node)
+get_label(World* world, const LilvNode* node)
 {
 	LilvNode* rdfs_label = lilv_new_uri(
 		world->lilv_world(), LILV_NS_RDFS "label");
@@ -215,7 +215,7 @@ get_label(Shared::World* world, const LilvNode* node)
 void
 PropertiesWindow::add_property(const Raul::URI& uri, const Raul::Atom& value)
 {
-	Shared::World* world = _app->world();
+	World* world = _app->world();
 
 	const unsigned n_rows = _table->property_n_rows() + 1;
 	_table->property_n_rows() = n_rows;
@@ -256,7 +256,7 @@ PropertiesWindow::set_object(SharedPtr<const ObjectModel> model)
 
 	set_title(model->path().chop_scheme() + " Properties - Ingen");
 
-	Shared::World* world = _app->world();
+	World* world = _app->world();
 
 	LilvNode* rdfs_range = lilv_new_uri(
 		world->lilv_world(), LILV_NS_RDFS "range");
@@ -308,7 +308,7 @@ PropertiesWindow::set_object(SharedPtr<const ObjectModel> model)
 Gtk::Widget*
 PropertiesWindow::create_value_widget(const Raul::URI& uri, const Raul::Atom& value)
 {
-	Ingen::Shared::Forge& forge = _app->forge();
+	Ingen::Forge& forge = _app->forge();
 	if (value.type() == forge.Int) {
 		Gtk::SpinButton* widget = manage(new Gtk::SpinButton(0.0, 0));
 		widget->property_numeric() = true;
@@ -449,7 +449,7 @@ bad_type:
 void
 PropertiesWindow::key_changed()
 {
-	Shared::World* world = _app->world();
+	World* world = _app->world();
 
 	const Gtk::ListStore::Row row      = *(_key_combo->get_active());
 	Glib::ustring             prop_uri = row[_combo_columns.uri_col];
diff --git a/src/gui/RenameWindow.cpp b/src/gui/RenameWindow.cpp
index 097b9aea..c8e72168 100644
--- a/src/gui/RenameWindow.cpp
+++ b/src/gui/RenameWindow.cpp
@@ -117,8 +117,7 @@ RenameWindow::cancel_clicked()
 void
 RenameWindow::ok_clicked()
 {
-	const Shared::URIs& uris = _app->uris();
-
+	const URIs&   uris       = _app->uris();
 	const string& symbol_str = _symbol_entry->get_text();
 	const string& label      = _label_entry->get_text();
 	Path          path       = _object->path();
diff --git a/src/gui/SubpatchModule.cpp b/src/gui/SubpatchModule.cpp
index dcc55e20..8b9dfe5e 100644
--- a/src/gui/SubpatchModule.cpp
+++ b/src/gui/SubpatchModule.cpp
@@ -66,7 +66,7 @@ SubpatchModule::store_location(double ax, double ay)
 	const Atom x(app().forge().make(static_cast<float>(ax)));
 	const Atom y(app().forge().make(static_cast<float>(ay)));
 
-	const Shared::URIs& uris = app().uris();
+	const URIs& uris = app().uris();
 
 	const Atom& existing_x = _node->get_property(uris.ingen_canvasX);
 	const Atom& existing_y = _node->get_property(uris.ingen_canvasY);
diff --git a/src/gui/ThreadedLoader.cpp b/src/gui/ThreadedLoader.cpp
index 1867b8d5..054838c6 100644
--- a/src/gui/ThreadedLoader.cpp
+++ b/src/gui/ThreadedLoader.cpp
@@ -16,8 +16,8 @@
 
 #include <string>
 #include "raul/log.hpp"
-#include "ingen/shared/World.hpp"
-#include "ingen/shared/Module.hpp"
+#include "ingen/World.hpp"
+#include "ingen/Module.hpp"
 #include "App.hpp"
 #include "ThreadedLoader.hpp"
 #include "ingen/client/PatchModel.hpp"
@@ -43,7 +43,7 @@ ThreadedLoader::ThreadedLoader(App& app, SharedPtr<Interface> engine)
 SharedPtr<Serialisation::Parser>
 ThreadedLoader::parser()
 {
-	Ingen::Shared::World* world = _app.world();
+	Ingen::World* world = _app.world();
 
 	if (!world->parser())
 		world->load_module("serialisation");
@@ -73,7 +73,7 @@ ThreadedLoader::load_patch(bool                              merge,
 {
 	_mutex.lock();
 
-	Ingen::Shared::World* world = _app.world();
+	Ingen::World* world = _app.world();
 
 	Glib::ustring engine_base = "";
 	if (engine_parent) {
diff --git a/src/gui/WidgetFactory.cpp b/src/gui/WidgetFactory.cpp
index 572b3870..5e5b987a 100644
--- a/src/gui/WidgetFactory.cpp
+++ b/src/gui/WidgetFactory.cpp
@@ -19,7 +19,7 @@
 
 #include "raul/log.hpp"
 
-#include "ingen/shared/runtime_paths.hpp"
+#include "ingen/runtime_paths.hpp"
 
 #include "WidgetFactory.hpp"
 
@@ -44,7 +44,7 @@ void
 WidgetFactory::find_ui_file()
 {
 	// Try file in bundle (directory where executable resides)
-	ui_filename = Shared::bundle_file_path("ingen_gui.ui");
+	ui_filename = Ingen::bundle_file_path("ingen_gui.ui");
 	if (is_readable(ui_filename))
 		return;
 
@@ -56,7 +56,7 @@ WidgetFactory::find_ui_file()
 	}
 
 	// Try the default system installed path
-	ui_filename = Shared::data_file_path("ingen_gui.ui");
+	ui_filename = Ingen::data_file_path("ingen_gui.ui");
 	if (is_readable(ui_filename))
 		return;
 
diff --git a/src/gui/ingen_gui.cpp b/src/gui/ingen_gui.cpp
index a2aa906e..d5c15ca9 100644
--- a/src/gui/ingen_gui.cpp
+++ b/src/gui/ingen_gui.cpp
@@ -14,14 +14,14 @@
   along with Ingen.  If not, see <http://www.gnu.org/licenses/>.
 */
 
-#include "ingen/shared/Module.hpp"
+#include "ingen/Module.hpp"
 #include "App.hpp"
 
-struct IngenGUIModule : public Ingen::Shared::Module {
-	void load(Ingen::Shared::World* world) {
+struct IngenGUIModule : public Ingen::Module {
+	void load(Ingen::World* world) {
 		app = Ingen::GUI::App::create(world);
 	}
-	void run(Ingen::Shared::World* world) {
+	void run(Ingen::World* world) {
 		app->run();
 	}
 
@@ -30,7 +30,7 @@ struct IngenGUIModule : public Ingen::Shared::Module {
 
 extern "C" {
 
-Ingen::Shared::Module*
+Ingen::Module*
 ingen_module_load()
 {
 	return new IngenGUIModule();
diff --git a/src/gui/ingen_gui_lv2.cpp b/src/gui/ingen_gui_lv2.cpp
index cead2acb..a9eff24d 100644
--- a/src/gui/ingen_gui_lv2.cpp
+++ b/src/gui/ingen_gui_lv2.cpp
@@ -17,11 +17,11 @@
 #include "ingen/client/ClientStore.hpp"
 #include "ingen/client/PatchModel.hpp"
 #include "ingen/client/SigClientInterface.hpp"
-#include "ingen/shared/AtomReader.hpp"
-#include "ingen/shared/AtomSink.hpp"
-#include "ingen/shared/AtomWriter.hpp"
-#include "ingen/shared/World.hpp"
-#include "ingen/shared/runtime_paths.hpp"
+#include "ingen/AtomReader.hpp"
+#include "ingen/AtomSink.hpp"
+#include "ingen/AtomWriter.hpp"
+#include "ingen/World.hpp"
+#include "ingen/runtime_paths.hpp"
 #include "lv2/lv2plug.in/ns/extensions/ui/ui.h"
 
 #include "App.hpp"
@@ -30,8 +30,8 @@
 #define INGEN_LV2_UI_URI "http://drobilla.net/ns/ingen#PatchUIGtk2"
 
 /** A sink that writes atoms to a port via the UI extension. */
-struct IngenLV2AtomSink : public Ingen::Shared::AtomSink {
-	IngenLV2AtomSink(Ingen::Shared::URIs& uris,
+struct IngenLV2AtomSink : public Ingen::AtomSink {
+	IngenLV2AtomSink(Ingen::URIs&         uris,
 	                 LV2UI_Write_Function ui_write,
 	                 LV2UI_Controller     ui_controller)
 		: _uris(uris)
@@ -48,7 +48,7 @@ struct IngenLV2AtomSink : public Ingen::Shared::AtomSink {
 		return true;
 	}
 
-	Ingen::Shared::URIs& _uris;
+	Ingen::URIs&         _uris;
 	LV2UI_Write_Function _ui_write;
 	LV2UI_Controller     _ui_controller;
 };
@@ -64,13 +64,13 @@ struct IngenLV2UI {
 
 	int                                          argc;
 	char**                                       argv;
-	Ingen::Shared::Forge*                        forge;
-	Ingen::Shared::World*                        world;
+	Ingen::Forge*                                forge;
+	Ingen::World*                                world;
 	IngenLV2AtomSink*                            sink;
 	SharedPtr<Ingen::GUI::App>                   app;
 	SharedPtr<Ingen::GUI::PatchBox>              view;
 	SharedPtr<Ingen::Interface>                  engine;
-	SharedPtr<Ingen::Shared::AtomReader>         reader;
+	SharedPtr<Ingen::AtomReader>                 reader;
 	SharedPtr<Ingen::Client::SigClientInterface> client;
 };
 
@@ -83,7 +83,7 @@ instantiate(const LV2UI_Descriptor*   descriptor,
             LV2UI_Widget*             widget,
             const LV2_Feature* const* features)
 {
-	Ingen::Shared::set_bundle_path(bundle_path);
+	Ingen::set_bundle_path(bundle_path);
 
 	IngenLV2UI* ui = new IngenLV2UI();
 
@@ -97,10 +97,9 @@ instantiate(const LV2UI_Descriptor*   descriptor,
 		}
 	}
 
-	ui->world = new Ingen::Shared::World(
-		ui->argc, ui->argv, map, unmap);
+	ui->world = new Ingen::World(ui->argc, ui->argv, map, unmap);
 
-	ui->forge = new Ingen::Shared::Forge(ui->world->uri_map());
+	ui->forge = new Ingen::Forge(ui->world->uri_map());
 
 	if (!ui->world->load_module("client")) {
 		delete ui;
@@ -112,7 +111,7 @@ instantiate(const LV2UI_Descriptor*   descriptor,
 
 	// Set up an engine interface that writes LV2 atoms
 	ui->engine = SharedPtr<Ingen::Interface>(
-		new Ingen::Shared::AtomWriter(
+		new Ingen::AtomWriter(
 			ui->world->uri_map(), ui->world->uris(), *ui->sink));
 
 	ui->world->set_interface(ui->engine);
@@ -123,11 +122,11 @@ instantiate(const LV2UI_Descriptor*   descriptor,
 		new Ingen::Client::SigClientInterface());
 	ui->app->attach(ui->client);
 
-	ui->reader = SharedPtr<Ingen::Shared::AtomReader>(
-		new Ingen::Shared::AtomReader(ui->world->uri_map(),
-		                              ui->world->uris(),
-		                              ui->world->forge(),
-		                              *ui->client.get()));
+	ui->reader = SharedPtr<Ingen::AtomReader>(
+		new Ingen::AtomReader(ui->world->uri_map(),
+		                      ui->world->uris(),
+		                      ui->world->forge(),
+		                      *ui->client.get()));
 
 	// Create empty root patch model
 	Ingen::Resource::Properties props;
diff --git a/src/gui/wscript b/src/gui/wscript
index 6aa80389..5b5ae362 100644
--- a/src/gui/wscript
+++ b/src/gui/wscript
@@ -9,7 +9,7 @@ def build(bld):
               name            = 'libingen_gui',
               target          = 'ingen_gui',
               install_path    = '${LIBDIR}',
-              use             = 'libingen_shared libingen_client libingen_serialisation')
+              use             = 'libingen libingen_client libingen_serialisation')
     autowaf.use_lib(bld, obj, '''
             GANV
             GLADEMM
@@ -73,5 +73,5 @@ def build(bld):
               name         = 'ingen_gui_lv2',
               target       = 'ingen_gui_lv2',
               install_path = '${LV2DIR}/ingen.lv2/',
-              use          = 'libingen_gui libingen_shared')
+              use          = 'libingen libingen_gui')
     autowaf.use_lib(bld, obj, 'LV2')