6 files changed, 6 insertions, 12 deletions
diff --git a/include/ingen/ClientInterface.hpp b/include/ingen/ClientInterface.hpp
index a2086926..a72c4743 100644
--- a/include/ingen/ClientInterface.hpp
+++ b/include/ingen/ClientInterface.hpp
@@ -40,8 +40,6 @@ class ClientInterface : public CommonInterface
 public:
 	virtual ~ClientInterface() {}
 
-	virtual Raul::URI uri() const = 0;
-
 	virtual void response_ok(int32_t id) = 0;
 
 	virtual void response_error(int32_t id, const std::string& msg) = 0;
diff --git a/include/ingen/CommonInterface.hpp b/include/ingen/CommonInterface.hpp
index 8b4713ab..398fbd3b 100644
--- a/include/ingen/CommonInterface.hpp
+++ b/include/ingen/CommonInterface.hpp
@@ -34,6 +34,8 @@ class CommonInterface
 public:
 	virtual ~CommonInterface() {}
 
+	virtual Raul::URI uri() const = 0;
+
 	/** Begin an atomic bundle */
 	virtual void bundle_begin() = 0;
 
diff --git a/include/ingen/ServerInterface.hpp b/include/ingen/ServerInterface.hpp
index bf0b45ec..25016416 100644
--- a/include/ingen/ServerInterface.hpp
+++ b/include/ingen/ServerInterface.hpp
@@ -36,8 +36,6 @@ class ServerInterface : public CommonInterface
 public:
 	virtual ~ServerInterface() {}
 
-	virtual Raul::URI uri() const = 0;
-
 	// Responses
 	virtual void respond_to(ClientInterface* client, int32_t id) = 0;
 	virtual void disable_responses() = 0;
diff --git a/include/ingen/client/ClientStore.hpp b/include/ingen/client/ClientStore.hpp
index a79b235c..12392db6 100644
--- a/include/ingen/client/ClientStore.hpp
+++ b/include/ingen/client/ClientStore.hpp
@@ -60,6 +60,8 @@ public:
 		SharedPtr<ServerInterface>    engine=SharedPtr<ServerInterface>(),
 		SharedPtr<SigClientInterface> emitter=SharedPtr<SigClientInterface>());
 
+	Raul::URI uri() const { return "ingen:ClientStore"; }
+
 	SharedPtr<const ObjectModel> object(const Raul::Path& path) const;
 	SharedPtr<const PluginModel> plugin(const Raul::URI& uri)   const;
 	SharedPtr<const Resource>    resource(const Raul::URI& uri) const;
diff --git a/include/ingen/shared/ClashAvoider.hpp b/include/ingen/shared/ClashAvoider.hpp
index 6c8e2018..4f5d8ec1 100644
--- a/include/ingen/shared/ClashAvoider.hpp
+++ b/include/ingen/shared/ClashAvoider.hpp
@@ -40,6 +40,8 @@ public:
 	ClashAvoider(Store& store, CommonInterface& target, Store* also_avoid=NULL)
 		: _store(store), _target(target), _also_avoid(also_avoid) {}
 
+	Raul::URI uri() const { return "ingen:ClientStore"; }
+
 	void set_target(CommonInterface& target) { _target = target; }
 
 	// Bundles
diff --git a/src/server/OSCEngineReceiver.cpp b/src/server/OSCEngineReceiver.cpp
index 6c462d7a..8451f4ee 100644
--- a/src/server/OSCEngineReceiver.cpp
+++ b/src/server/OSCEngineReceiver.cpp
@@ -15,8 +15,6 @@
  * 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
-//#define ENABLE_AVAHI 1
-
 #include <stdlib.h>
 #include <stdio.h>
 
@@ -70,9 +68,6 @@ OSCEngineReceiver::OSCEngineReceiver(Engine&                    engine,
 	snprintf(port_str, sizeof(port_str), "%u", port);
 
 	_server = lo_server_new(port_str, error_cb);
-#ifdef ENABLE_AVAHI
-	lo_server_avahi_init(_server, "ingen");
-#endif
 
 	if (_server == NULL) {
 		LOG(error) << "Could not start OSC server.  Aborting." << endl;
@@ -135,9 +130,6 @@ OSCEngineReceiver::~OSCEngineReceiver()
 	delete _receive_thread;
 
 	if (_server != NULL)  {
-#ifdef ENABLE_AVAHI
-		lo_server_avahi_free(_server);
-#endif
 		lo_server_free(_server);
 		_server = NULL;
 	}