4 files changed, 5 insertions, 111 deletions
diff --git a/src/server/ControlBindings.cpp b/src/server/ControlBindings.cpp
index 1b5459fa..da5bb6e4 100644
--- a/src/server/ControlBindings.cpp
+++ b/src/server/ControlBindings.cpp
@@ -18,7 +18,7 @@
 #include <math.h>
 #include "raul/log.hpp"
 #include "raul/midi_events.h"
-#include "shared/URIs.hpp"
+#include "ingen/shared/URIs.hpp"
 #include "shared/LV2URIMap.hpp"
 #include "ingen/shared/World.hpp"
 
diff --git a/src/shared/LV2URIMap.hpp b/src/shared/LV2URIMap.hpp
index 35baa9f8..4fd50e92 100644
--- a/src/shared/LV2URIMap.hpp
+++ b/src/shared/LV2URIMap.hpp
@@ -23,12 +23,11 @@
 
 #include <boost/utility.hpp>
 
-#include "raul/URI.hpp"
-
+#include "ingen/shared/URIs.hpp"
 #include "lv2/lv2plug.in/ns/ext/uri-map/uri-map.h"
+#include "raul/URI.hpp"
 
 #include "LV2Features.hpp"
-#include "URIs.hpp"
 
 namespace Ingen {
 namespace Shared {
diff --git a/src/shared/URIs.cpp b/src/shared/URIs.cpp
index a3a67cd2..b6f1d0f4 100644
--- a/src/shared/URIs.cpp
+++ b/src/shared/URIs.cpp
@@ -24,11 +24,9 @@
 
 #include <boost/shared_ptr.hpp>
 
-#include "raul/log.hpp"
-
+#include "ingen/shared/URIs.hpp"
 #include "lv2/lv2plug.in/ns/ext/atom/atom.h"
-
-#include "URIs.hpp"
+#include "raul/log.hpp"
 
 using namespace std;
 using namespace Raul;
diff --git a/src/shared/URIs.hpp b/src/shared/URIs.hpp
deleted file mode 100644
index 7083507e..00000000
--- a/src/shared/URIs.hpp
+++ /dev/null
@@ -1,103 +0,0 @@
-/* This file is part of Ingen.
- * Copyright 2008-2011 David Robillard <http://drobilla.net>
- *
- * Ingen is free software; you can redistribute it and/or modify it under the
- * terms of the GNU General Public License as published by the Free Software
- * Foundation; either version 2 of the License, or (at your option) any later
- * version.
- *
- * Ingen is distributed in the hope that it will be useful, but WITHOUT ANY
- * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
- * FOR A PARTICULAR PURPOSE.  See the GNU General Public License for details.
- *
- * You should have received a copy of the GNU General Public License along
- * with this program; if not, write to the Free Software Foundation, Inc.,
- * 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
- */
-
-#ifndef INGEN_SHARED_URIS_HPP
-#define INGEN_SHARED_URIS_HPP
-
-#include <boost/utility.hpp>
-
-#include "raul/URI.hpp"
-
-namespace Ingen {
-namespace Shared {
-
-class URIs : public boost::noncopyable {
-public:
-	URIs();
-
-	struct Quark : public Raul::URI {
-		Quark(const char* str);
-		const char* c_str() const;
-		uint32_t id;
-	};
-
-	const Quark atom_AtomTransfer;
-	const Quark atom_Bool;
-	const Quark atom_Float32;
-	const Quark atom_Int32;
-	const Quark atom_MessagePort;
-	const Quark atom_String;
-	const Quark atom_ValuePort;
-	const Quark atom_Vector;
-	const Quark atom_supports;
-	const Quark ctx_AudioContext;
-	const Quark ctx_MessageContext;
-	const Quark ctx_context;
-	const Quark doap_name;
-	const Quark ev_EventPort;
-	const Quark ingen_Internal;
-	const Quark ingen_Node;
-	const Quark ingen_Patch;
-	const Quark ingen_Port;
-	const Quark ingen_broadcast;
-	const Quark ingen_controlBinding;
-	const Quark ingen_document;
-	const Quark ingen_enabled;
-	const Quark ingen_engine;
-	const Quark ingen_nil;
-	const Quark ingen_node;
-	const Quark ingen_polyphonic;
-	const Quark ingen_polyphony;
-	const Quark ingen_sampleRate;
-	const Quark ingen_selected;
-	const Quark ingen_value;
-	const Quark ingenui_canvas_x;
-	const Quark ingenui_canvas_y;
-	const Quark lv2_AudioPort;
-	const Quark lv2_ControlPort;
-	const Quark lv2_InputPort;
-	const Quark lv2_OutputPort;
-	const Quark lv2_Plugin;
-	const Quark lv2_connectionOptional;
-	const Quark lv2_default;
-	const Quark lv2_index;
-	const Quark lv2_integer;
-	const Quark lv2_maximum;
-	const Quark lv2_minimum;
-	const Quark lv2_name;
-	const Quark lv2_portProperty;
-	const Quark lv2_sampleRate;
-	const Quark lv2_symbol;
-	const Quark lv2_toggled;
-	const Quark midi_Bender;
-	const Quark midi_ChannelPressure;
-	const Quark midi_Controller;
-	const Quark midi_MidiEvent;
-	const Quark midi_Note;
-	const Quark midi_controllerNumber;
-	const Quark midi_noteNumber;
-	const Quark rdf_instanceOf;
-	const Quark rdf_type;
-	const Quark rdfs_seeAlso;
-	const Quark ui_Events;
-	const Quark wildcard;
-};
-
-} // namespace Shared
-} // namespace Ingen
-
-#endif // INGEN_SHARED_LV2URIMAP_HPP