7 files changed, 25 insertions, 24 deletions
diff --git a/ingen/client/ClientStore.hpp b/ingen/client/ClientStore.hpp
index 714bdb2d..72133e34 100644
--- a/ingen/client/ClientStore.hpp
+++ b/ingen/client/ClientStore.hpp
@@ -21,16 +21,14 @@
 #include <list>
 #include <string>
 
+#include "ingen/Interface.hpp"
+#include "ingen/client/signal.hpp"
+#include "ingen/shared/Store.hpp"
 #include "raul/Path.hpp"
 #include "raul/PathTable.hpp"
 #include "raul/SharedPtr.hpp"
 #include "raul/TableImpl.hpp"
 
-#include "ingen/Interface.hpp"
-#include "ingen/client/signal.hpp"
-#include "ingen/shared/LV2URIMap.hpp"
-#include "ingen/shared/Store.hpp"
-
 namespace Raul { class Atom; }
 
 namespace Ingen {
diff --git a/ingen/shared/AtomReader.hpp b/ingen/shared/AtomReader.hpp
index ef80a4b1..30c4a8b0 100644
--- a/ingen/shared/AtomReader.hpp
+++ b/ingen/shared/AtomReader.hpp
@@ -19,7 +19,6 @@
 
 #include "ingen/Interface.hpp"
 #include "ingen/shared/AtomSink.hpp"
-#include "ingen/shared/LV2URIMap.hpp"
 #include "ingen/shared/URIs.hpp"
 #include "serd/serd.h"
 
@@ -30,12 +29,13 @@ class Forge;
 namespace Shared {
 
 class AtomSink;
+class URIMap;
 
 /** An AtomSink that calls methods on an Interface. */
 class AtomReader : public AtomSink
 {
 public:
-	AtomReader(LV2URIMap& map, URIs& uris, Forge& forge, Interface& iface);
+	AtomReader(URIMap& map, URIs& uris, Forge& forge, Interface& iface);
 	~AtomReader() {}
 
 	void write(const LV2_Atom* msg);
@@ -46,7 +46,7 @@ private:
 	void get_props(const LV2_Atom_Object*       obj,
 	               Ingen::Resource::Properties& props);
 
-	LV2URIMap& _map;
+	URIMap&    _map;
 	URIs&      _uris;
 	Forge&     _forge;
 	Interface& _iface;
diff --git a/ingen/shared/AtomWriter.hpp b/ingen/shared/AtomWriter.hpp
index 3b70bb89..32997c66 100644
--- a/ingen/shared/AtomWriter.hpp
+++ b/ingen/shared/AtomWriter.hpp
@@ -18,7 +18,6 @@
 #define INGEN_SHARED_ATOM_WRITER_HPP
 
 #include "ingen/Interface.hpp"
-#include "ingen/shared/LV2URIMap.hpp"
 #include "ingen/shared/URIs.hpp"
 #include "lv2/lv2plug.in/ns/ext/atom/forge.h"
 #include "serd/serd.h"
@@ -27,12 +26,13 @@ namespace Ingen {
 namespace Shared {
 
 class AtomSink;
+class URIMap;
 
 /** An Interface that writes LV2 atoms. */
 class AtomWriter : public Interface
 {
 public:
-	AtomWriter(LV2URIMap& map, URIs& uris, AtomSink& sink);
+	AtomWriter(URIMap& map, URIs& uris, AtomSink& sink);
 	~AtomWriter() {}
 
 	Raul::URI uri() const { return "http://drobilla.net/ns/ingen#AtomWriter"; }
@@ -83,7 +83,7 @@ private:
 	void    finish_msg();
 	int32_t next_id();
 
-	LV2URIMap&     _map;
+	URIMap&        _map;
 	URIs&          _uris;
 	AtomSink&      _sink;
 	SerdChunk      _out;
diff --git a/ingen/shared/Forge.hpp b/ingen/shared/Forge.hpp
index 084ca4fb..8f7facb2 100644
--- a/ingen/shared/Forge.hpp
+++ b/ingen/shared/Forge.hpp
@@ -18,14 +18,15 @@
 #define INGEN_FORGE_HPP
 
 #include "ingen/shared/Forge.hpp"
-#include "ingen/shared/LV2URIMap.hpp"
 #include "raul/Atom.hpp"
 
 namespace Ingen {
 
+namespace Shared { class URIMap; }
+
 class Forge : public Raul::Forge {
 public:
-	explicit Forge(Shared::LV2URIMap& map);
+	explicit Forge(Shared::URIMap& map);
 
 	std::string str(const Raul::Atom& atom);
 };
diff --git a/ingen/shared/LV2URIMap.hpp b/ingen/shared/URIMap.hpp
index bc6074d4..39f17bea 100644
--- a/ingen/shared/LV2URIMap.hpp
+++ b/ingen/shared/URIMap.hpp
@@ -30,10 +30,10 @@ namespace Ingen {
 namespace Shared {
 
 /** URI to Integer Map */
-class LV2URIMap : public boost::noncopyable {
+class URIMap : public boost::noncopyable {
 public:
-	LV2URIMap(LV2_URID_Map* map, LV2_URID_Unmap* unmap);
-	virtual ~LV2URIMap() {}
+	URIMap(LV2_URID_Map* map, LV2_URID_Unmap* unmap);
+	virtual ~URIMap() {}
 
 	uint32_t    map_uri(const char* uri);
 	const char* unmap_uri(uint32_t urid);
@@ -54,14 +54,14 @@ public:
 	};
 
 	struct URIDMapFeature : public Feature {
-		URIDMapFeature(LV2URIMap* map, LV2_URID_Map* urid_map);
+		URIDMapFeature(URIMap* map, LV2_URID_Map* urid_map);
 		LV2_URID        map(const char* uri);
 		static LV2_URID default_map(LV2_URID_Map_Handle h, const char* uri);
 		LV2_URID_Map urid_map;
 	};
 
 	struct URIDUnmapFeature : public Feature {
-		URIDUnmapFeature(LV2URIMap* map, LV2_URID_Unmap* urid_unmap);
+		URIDUnmapFeature(URIMap* map, LV2_URID_Unmap* urid_unmap);
 		const char*        unmap(const LV2_URID urid);
 		static const char* default_unmap(LV2_URID_Map_Handle h, LV2_URID uri);
 		LV2_URID_Unmap urid_unmap;
diff --git a/ingen/shared/URIs.hpp b/ingen/shared/URIs.hpp
index 9ebdbf27..17181269 100644
--- a/ingen/shared/URIs.hpp
+++ b/ingen/shared/URIs.hpp
@@ -19,8 +19,8 @@
 
 #include <boost/utility.hpp>
 
-#include "ingen/shared/LV2URIMap.hpp"
 #include "ingen/shared/Forge.hpp"
+#include "lv2/lv2plug.in/ns/ext/urid/urid.h"
 #include "raul/Atom.hpp"
 #include "raul/URI.hpp"
 
@@ -31,12 +31,14 @@ namespace Raul {
 namespace Ingen {
 namespace Shared {
 
+class URIMap;
+
 class URIs : public boost::noncopyable {
 public:
-	URIs(Ingen::Forge& forge, LV2URIMap* map);
+	URIs(Ingen::Forge& forge, URIMap* map);
 
 	struct Quark : public Raul::URI {
-		Quark(Ingen::Forge& forge, LV2URIMap* map, const char* str);
+		Quark(Ingen::Forge& forge, URIMap* map, const char* str);
 		operator LV2_URID()   const { return id; }
 		operator Raul::Atom() const { return atom; }
 		uint32_t   id;
diff --git a/ingen/shared/World.hpp b/ingen/shared/World.hpp
index 6279e31f..5f162a9b 100644
--- a/ingen/shared/World.hpp
+++ b/ingen/shared/World.hpp
@@ -46,7 +46,7 @@ namespace Shared {
 
 class LV2Features;
 class URIs;
-class LV2URIMap;
+class URIMap;
 class Store;
 
 /** The "world" all Ingen modules may share.
@@ -102,8 +102,8 @@ public:
 
 	virtual Sord::World* rdf_world();
 
-	virtual SharedPtr<URIs>      uris();
-	virtual SharedPtr<LV2URIMap> lv2_uri_map();
+	virtual SharedPtr<URIs>   uris();
+	virtual SharedPtr<URIMap> uri_map();
 
 	virtual int&    argc();
 	virtual char**& argv();