3 files changed, 1 insertions, 4 deletions
diff --git a/include/ingen/client/GraphModel.hpp b/include/ingen/client/GraphModel.hpp
index 08251663..837a28a5 100644
--- a/include/ingen/client/GraphModel.hpp
+++ b/include/ingen/client/GraphModel.hpp
@@ -36,7 +36,6 @@ class URIs;
 namespace client {
 
 class ArcModel;
-class ObjectModel;
 class PortModel;
 
 /** Client's model of a graph.
diff --git a/include/ingen/client/ObjectModel.hpp b/include/ingen/client/ObjectModel.hpp
index 01528e3d..f9f0e041 100644
--- a/include/ingen/client/ObjectModel.hpp
+++ b/include/ingen/client/ObjectModel.hpp
@@ -22,7 +22,6 @@
 #define INGEN_CLIENT_OBJECTMODEL_HPP
 
 #include <ingen/Node.hpp>
-#include <ingen/URI.hpp>
 #include <ingen/URIs.hpp>
 #include <ingen/client/signal.hpp>
 #include <ingen/ingen.h>
@@ -34,6 +33,7 @@
 namespace ingen {
 
 class Atom;
+class URI;
 
 namespace client {
 
diff --git a/include/ingen/client/PortModel.hpp b/include/ingen/client/PortModel.hpp
index ec1e325c..c87f2f03 100644
--- a/include/ingen/client/PortModel.hpp
+++ b/include/ingen/client/PortModel.hpp
@@ -18,7 +18,6 @@
 #define INGEN_CLIENT_PORTMODEL_HPP
 
 #include <ingen/Node.hpp>
-#include <ingen/URI.hpp>
 #include <ingen/URIs.hpp>
 #include <ingen/client/ObjectModel.hpp>
 #include <ingen/client/signal.hpp>
@@ -26,7 +25,6 @@
 #include <raul/Path.hpp>
 
 #include <cstdint>
-#include <memory>
 #include <string>
 
 namespace ingen {