6 files changed, 11 insertions, 12 deletions
diff --git a/src/common/interface/ClientInterface.hpp b/src/common/interface/ClientInterface.hpp
index d904ea9d..ee5f4791 100644
--- a/src/common/interface/ClientInterface.hpp
+++ b/src/common/interface/ClientInterface.hpp
@@ -21,7 +21,6 @@
 #include <stdio.h>
 #include <string>
 #include <inttypes.h>
-#include "raul/Atom.hpp"
 #include "interface/CommonInterface.hpp"
 
 namespace Ingen {
diff --git a/src/common/interface/CommonInterface.hpp b/src/common/interface/CommonInterface.hpp
index a68cf175..bf4486b1 100644
--- a/src/common/interface/CommonInterface.hpp
+++ b/src/common/interface/CommonInterface.hpp
@@ -20,11 +20,11 @@
 
 #include <inttypes.h>
 #include <string>
-#include "raul/SharedPtr.hpp"
-#include "raul/Atom.hpp"
 #include "interface/CommonInterface.hpp"
 #include "interface/GraphObject.hpp"
 
+namespace Raul { class Atom; }
+
 namespace Ingen {
 namespace Shared {
 
diff --git a/src/common/interface/EngineInterface.hpp b/src/common/interface/EngineInterface.hpp
index 55153d63..dc5be1dc 100644
--- a/src/common/interface/EngineInterface.hpp
+++ b/src/common/interface/EngineInterface.hpp
@@ -20,7 +20,6 @@
 
 #include <inttypes.h>
 #include <string>
-#include "raul/SharedPtr.hpp"
 #include "interface/CommonInterface.hpp"
 
 namespace Ingen {
diff --git a/src/common/interface/GraphObject.hpp b/src/common/interface/GraphObject.hpp
index cf623c3c..eac5bf86 100644
--- a/src/common/interface/GraphObject.hpp
+++ b/src/common/interface/GraphObject.hpp
@@ -23,12 +23,11 @@
 #include "raul/Deletable.hpp"
 #include "raul/PathTable.hpp"
 #include "raul/Symbol.hpp"
-#include "raul/Atom.hpp"
 #include "raul/SharedPtr.hpp"
 #include "raul/WeakPtr.hpp"
 #include "interface/Resource.hpp"
 
-using Raul::PathTable;
+namespace Raul { class Atom; }
 
 namespace Ingen {
 namespace Shared {
@@ -46,7 +45,7 @@ class GraphObject : public Raul::Deletable
 public:
 	typedef std::map<std::string, Raul::Atom> Variables;
 
-	typedef PathTable< SharedPtr<GraphObject> >::const_iterator const_iterator;
+	typedef Raul::PathTable< SharedPtr<GraphObject> >::const_iterator const_iterator;
 		
 	virtual void set_path(const Raul::Path& path) = 0;
 
diff --git a/src/common/interface/Port.hpp b/src/common/interface/Port.hpp
index 6977d249..f4d7ea67 100644
--- a/src/common/interface/Port.hpp
+++ b/src/common/interface/Port.hpp
@@ -15,13 +15,14 @@
  * 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
-#ifndef PORT_H
-#define PORT_H
+#ifndef INGEN_INTERFACE_PORT_HPP
+#define INGEN_INTERFACE_PORT_HPP
 
-#include "raul/Atom.hpp"
 #include "GraphObject.hpp"
 #include "DataType.hpp"
 
+namespace Raul { class Atom; }
+
 namespace Ingen {
 namespace Shared {
 
@@ -45,4 +46,4 @@ public:
 } // namespace Shared
 } // namespace Ingen
 
-#endif // PORT_H
+#endif // INGEN_INTERFACE_PORT_HPP
diff --git a/src/common/interface/Resource.hpp b/src/common/interface/Resource.hpp
index 32c760d7..109e1021 100644
--- a/src/common/interface/Resource.hpp
+++ b/src/common/interface/Resource.hpp
@@ -20,7 +20,8 @@
 
 #include <string>
 #include <map>
-#include "raul/Atom.hpp"
+
+namespace Raul { class Atom; }
 
 namespace Ingen {
 namespace Shared {