12 files changed, 1 insertions, 25 deletions
diff --git a/include/ingen/ClientInterface.hpp b/include/ingen/ClientInterface.hpp
index bddae32b..7e330536 100644
--- a/include/ingen/ClientInterface.hpp
+++ b/include/ingen/ClientInterface.hpp
@@ -27,7 +27,6 @@
 namespace Raul { class Path; class URI; }
 
 namespace Ingen {
-namespace Shared {
 
 /** The (only) interface the engine uses to communicate with clients.
  * Purely virtual (except for the destructor).
@@ -57,7 +56,6 @@ public:
 	virtual void activity(const Raul::Path& path) = 0;
 };
 
-} // namespace Shared
 } // namespace Ingen
 
 #endif
diff --git a/include/ingen/CommonInterface.hpp b/include/ingen/CommonInterface.hpp
index e1f7bba9..25b7231f 100644
--- a/include/ingen/CommonInterface.hpp
+++ b/include/ingen/CommonInterface.hpp
@@ -27,7 +27,6 @@
 namespace Raul { class Atom; class Path; class URI; }
 
 namespace Ingen {
-namespace Shared {
 
 /** Abstract interface common to both engine and clients.
  * Purely virtual (except for the destructor).
@@ -69,7 +68,6 @@ public:
 	                          const Raul::Atom& value) = 0;
 };
 
-} // namespace Shared
 } // namespace Ingen
 
 #endif // INGEN_INTERFACE_COMMONINTERFACE_HPP
diff --git a/include/ingen/Connection.hpp b/include/ingen/Connection.hpp
index f290d80e..59b5383d 100644
--- a/include/ingen/Connection.hpp
+++ b/include/ingen/Connection.hpp
@@ -21,7 +21,6 @@
 #include "raul/Path.hpp"
 
 namespace Ingen {
-namespace Shared {
 
 /** A connection between two ports.
  *
@@ -35,7 +34,6 @@ public:
 	virtual const Raul::Path dst_port_path() const = 0;
 };
 
-} // namespace Shared
 } // namespace Ingen
 
 #endif // INGEN_INTERFACE_CONNECTION_HPP
diff --git a/include/ingen/EngineInterface.hpp b/include/ingen/EngineInterface.hpp
index 5bc3fbee..2146251f 100644
--- a/include/ingen/EngineInterface.hpp
+++ b/include/ingen/EngineInterface.hpp
@@ -23,7 +23,6 @@
 #include "ingen/CommonInterface.hpp"
 
 namespace Ingen {
-namespace Shared {
 
 class ClientInterface;
 
@@ -68,7 +67,6 @@ public:
 	                              const Raul::URI& key) = 0;
 };
 
-} // namespace Shared
 } // namespace Ingen
 
 #endif // INGEN_INTERFACE_ENGINEINTERFACE_HPP
diff --git a/include/ingen/EventType.hpp b/include/ingen/EventType.hpp
index 396ee4b4..bbe1fef8 100644
--- a/include/ingen/EventType.hpp
+++ b/include/ingen/EventType.hpp
@@ -21,7 +21,6 @@
 #include "raul/URI.hpp"
 
 namespace Ingen {
-namespace Shared {
 
 /** A type of event (that can live in an EventBuffer).
  */
@@ -72,7 +71,6 @@ private:
 	Symbol _symbol;
 };
 
-} // namespace Shared
 } // namespace Ingen
 
 #endif // INGEN_INTERFACE_EVENTTYPE_HPP
diff --git a/include/ingen/GraphObject.hpp b/include/ingen/GraphObject.hpp
index dec28b56..393569e0 100644
--- a/include/ingen/GraphObject.hpp
+++ b/include/ingen/GraphObject.hpp
@@ -25,7 +25,6 @@
 namespace Raul { class Atom; class Path; class Symbol; }
 
 namespace Ingen {
-namespace Shared {
 
 /** An object on the audio graph - Patch, Node, Port, etc.
  *
@@ -44,7 +43,6 @@ public:
 	virtual GraphObject*        graph_parent() const = 0;
 };
 
-} // namespace Shared
 } // namespace Ingen
 
 #endif // INGEN_INTERFACE_GRAPHOBJECT_HPP
diff --git a/include/ingen/Node.hpp b/include/ingen/Node.hpp
index 6c9b9c4a..70864766 100644
--- a/include/ingen/Node.hpp
+++ b/include/ingen/Node.hpp
@@ -23,7 +23,6 @@
 #include "ingen/GraphObject.hpp"
 
 namespace Ingen {
-namespace Shared {
 
 class Port;
 class Plugin;
@@ -45,7 +44,6 @@ public:
 	virtual const Plugin* plugin()             const = 0;
 };
 
-} // namespace Shared
 } // namespace Ingen
 
 #endif // INGEN_INTERFACE_NODE_HPP
diff --git a/include/ingen/Patch.hpp b/include/ingen/Patch.hpp
index 51b243e2..83c80db4 100644
--- a/include/ingen/Patch.hpp
+++ b/include/ingen/Patch.hpp
@@ -26,7 +26,6 @@
 #include "ingen/Node.hpp"
 
 namespace Ingen {
-namespace Shared {
 
 class Connection;
 
@@ -46,7 +45,6 @@ public:
 	virtual uint32_t internal_poly() const = 0;
 };
 
-} // namespace Shared
 } // namespace Ingen
 
 #endif // INGEN_INTERFACE_PATCH_HPP
diff --git a/include/ingen/Plugin.hpp b/include/ingen/Plugin.hpp
index 80f5ba9a..9b6d87b5 100644
--- a/include/ingen/Plugin.hpp
+++ b/include/ingen/Plugin.hpp
@@ -23,7 +23,6 @@
 #include "ingen/Resource.hpp"
 
 namespace Ingen {
-namespace Shared {
 
 class Plugin : virtual public Resource
 {
@@ -57,7 +56,6 @@ public:
 	}
 };
 
-} // namespace Shared
 } // namespace Ingen
 
 #endif // INGEN_INTERFACE_PLUGIN_HPP
diff --git a/include/ingen/Port.hpp b/include/ingen/Port.hpp
index cbfecc9b..5d04d0f1 100644
--- a/include/ingen/Port.hpp
+++ b/include/ingen/Port.hpp
@@ -28,7 +28,6 @@
 namespace Raul { class Atom; }
 
 namespace Ingen {
-namespace Shared {
 
 /** A Port on a Node.
  *
@@ -39,7 +38,7 @@ namespace Shared {
 class Port : public virtual GraphObject
 {
 public:
-	typedef std::set<Shared::PortType> PortTypes;
+	typedef std::set<PortType> PortTypes;
 
 	virtual const PortTypes& types() const = 0;
 
@@ -52,7 +51,6 @@ public:
 	virtual const Raul::Atom& value()    const = 0;
 };
 
-} // namespace Shared
 } // namespace Ingen
 
 #endif // INGEN_INTERFACE_PORT_HPP
diff --git a/include/ingen/PortType.hpp b/include/ingen/PortType.hpp
index 26f78a7f..1fc9f995 100644
--- a/include/ingen/PortType.hpp
+++ b/include/ingen/PortType.hpp
@@ -21,7 +21,6 @@
 #include "raul/URI.hpp"
 
 namespace Ingen {
-namespace Shared {
 
 /** The type of a port.
  *
@@ -92,7 +91,6 @@ private:
 	Symbol _symbol;
 };
 
-} // namespace Shared
 } // namespace Ingen
 
 #endif // INGEN_INTERFACE_PORTTYPE_HPP
diff --git a/include/ingen/Resource.hpp b/include/ingen/Resource.hpp
index e403e0bb..09879501 100644
--- a/include/ingen/Resource.hpp
+++ b/include/ingen/Resource.hpp
@@ -25,7 +25,6 @@
 #include "raul/URI.hpp"
 
 namespace Ingen {
-namespace Shared {
 
 class Resource
 {
@@ -92,7 +91,6 @@ public:
 	                                       const Raul::Atom& value) const = 0;
 };
 
-} // namespace Shared
 } // namespace Ingen
 
 #endif // INGEN_INTERFACE_RESOURCE_HPP