Clean up includes and forward declarations

9 files changed, 49 insertions, 43 deletions

diff --git a/ingen/client/ArcModel.hpp b/ingen/client/ArcModel.hpp
index 3016266e..e42dd7bd 100644
--- a/ingen/client/ArcModel.hpp
+++ b/ingen/client/ArcModel.hpp
@@ -17,14 +17,13 @@
 #ifndef INGEN_CLIENT_ARCMODEL_HPP
 #define INGEN_CLIENT_ARCMODEL_HPP
 
-#include <cassert>
-
-#include "ingen/types.hpp"
-#include "raul/Path.hpp"
-
 #include "ingen/Arc.hpp"
 #include "ingen/client/PortModel.hpp"
 #include "ingen/ingen.h"
+#include "ingen/types.hpp"
+#include "raul/Path.hpp"
+
+#include <cassert>
 
 namespace ingen {
 namespace client {
diff --git a/ingen/client/BlockModel.hpp b/ingen/client/BlockModel.hpp
index 4dfd35d7..6b9881c5 100644
--- a/ingen/client/BlockModel.hpp
+++ b/ingen/client/BlockModel.hpp
@@ -17,17 +17,17 @@
 #ifndef INGEN_CLIENT_BLOCKMODEL_HPP
 #define INGEN_CLIENT_BLOCKMODEL_HPP
 
-#include <cstdlib>
-#include <string>
-#include <vector>
-
 #include "ingen/Node.hpp"
 #include "ingen/client/ObjectModel.hpp"
 #include "ingen/client/PluginModel.hpp"
-#include "ingen/client/PortModel.hpp"
 #include "ingen/ingen.h"
 #include "ingen/types.hpp"
 
+#include <algorithm>
+#include <cstdint>
+#include <string>
+#include <vector>
+
 namespace Raul { class Path; }
 
 namespace ingen {
@@ -36,8 +36,7 @@ class URIs;
 
 namespace client {
 
-class PluginModel;
-class ClientStore;
+class PortModel;
 
 /** Block model class, used by the client to store engine's state.
  *
diff --git a/ingen/client/ClientStore.hpp b/ingen/client/ClientStore.hpp
index 0d7cb185..5cb097e8 100644
--- a/ingen/client/ClientStore.hpp
+++ b/ingen/client/ClientStore.hpp
@@ -17,23 +17,28 @@
 #ifndef INGEN_CLIENT_CLIENTSTORE_HPP
 #define INGEN_CLIENT_CLIENTSTORE_HPP
 
-#include <cassert>
-#include <list>
-#include <string>
-
 #include "ingen/Interface.hpp"
+#include "ingen/Message.hpp"
 #include "ingen/Store.hpp"
+#include "ingen/URI.hpp"
 #include "ingen/client/signal.hpp"
 #include "ingen/ingen.h"
 #include "ingen/types.hpp"
 #include "raul/Path.hpp"
 
-namespace Raul { class Atom; }
+#include <map>
+
+namespace Raul {
+class Path;
+class Atom;
+}
 
 namespace ingen {
 
+class Atom;
 class Log;
 class Node;
+class Resource;
 class URIs;
 
 namespace client {
diff --git a/ingen/client/GraphModel.hpp b/ingen/client/GraphModel.hpp
index 659ded9e..8713b6a9 100644
--- a/ingen/client/GraphModel.hpp
+++ b/ingen/client/GraphModel.hpp
@@ -17,10 +17,15 @@
 #ifndef INGEN_CLIENT_GRAPHMODEL_HPP
 #define INGEN_CLIENT_GRAPHMODEL_HPP
 
+#include "ingen/Node.hpp"
+#include "ingen/URIs.hpp"
 #include "ingen/client/BlockModel.hpp"
+#include "ingen/client/signal.hpp"
 #include "ingen/ingen.h"
 #include "ingen/types.hpp"
 
+#include <cstdint>
+
 namespace ingen {
 namespace client {
 
diff --git a/ingen/client/ObjectModel.hpp b/ingen/client/ObjectModel.hpp
index 0c517ccf..94906dec 100644
--- a/ingen/client/ObjectModel.hpp
+++ b/ingen/client/ObjectModel.hpp
@@ -21,26 +21,21 @@
 #ifndef INGEN_CLIENT_OBJECTMODEL_HPP
 #define INGEN_CLIENT_OBJECTMODEL_HPP
 
-#include <algorithm>
-#include <cassert>
-#include <cstdlib>
-
-#include "ingen/types.hpp"
-#include "raul/Path.hpp"
-
 #include "ingen/Node.hpp"
-#include "ingen/Resource.hpp"
+#include "ingen/URI.hpp"
+#include "ingen/URIs.hpp"
 #include "ingen/client/signal.hpp"
 #include "ingen/ingen.h"
+#include "ingen/types.hpp"
+#include "raul/Path.hpp"
+#include "raul/Symbol.hpp"
 
 namespace ingen {
 
-class URIs;
+class Atom;
 
 namespace client {
 
-class ClientStore;
-
 /** Base class for all Node models (BlockModel, GraphModel, PortModel).
  *
  * There are no non-const public methods intentionally, models are not allowed
diff --git a/ingen/client/PluginModel.hpp b/ingen/client/PluginModel.hpp
index 08a0fec9..468816aa 100644
--- a/ingen/client/PluginModel.hpp
+++ b/ingen/client/PluginModel.hpp
@@ -17,11 +17,6 @@
 #ifndef INGEN_CLIENT_PLUGINMODEL_HPP
 #define INGEN_CLIENT_PLUGINMODEL_HPP
 
-#include <list>
-#include <map>
-#include <string>
-#include <utility>
-
 #include "ingen/Forge.hpp"
 #include "ingen/Resource.hpp"
 #include "ingen/World.hpp"
@@ -32,6 +27,10 @@
 #include "raul/Symbol.hpp"
 #include "sord/sordmm.hpp"
 
+#include <cstdint>
+#include <map>
+#include <string>
+
 namespace ingen {
 
 class URIs;
diff --git a/ingen/client/PluginUI.hpp b/ingen/client/PluginUI.hpp
index f17c8f61..b80c4527 100644
--- a/ingen/client/PluginUI.hpp
+++ b/ingen/client/PluginUI.hpp
@@ -17,17 +17,22 @@
 #ifndef INGEN_CLIENT_PLUGINUI_HPP
 #define INGEN_CLIENT_PLUGINUI_HPP
 
-#include <set>
+#include "signal.hpp"
 
 #include "ingen/LV2Features.hpp"
+#include "ingen/Resource.hpp"
 #include "ingen/ingen.h"
 #include "ingen/types.hpp"
 #include "lilv/lilv.h"
 #include "suil/suil.h"
 
+#include <cstdint>
+#include <set>
+
 namespace ingen {
 
-class Interface;
+class Atom;
+class URI;
 class World;
 
 namespace client {
diff --git a/ingen/client/PortModel.hpp b/ingen/client/PortModel.hpp
index fcb46c4f..4aa033d1 100644
--- a/ingen/client/PortModel.hpp
+++ b/ingen/client/PortModel.hpp
@@ -17,15 +17,15 @@
 #ifndef INGEN_CLIENT_PORTMODEL_HPP
 #define INGEN_CLIENT_PORTMODEL_HPP
 
-#include <cstdlib>
-#include <string>
-
 #include "ingen/client/ObjectModel.hpp"
 #include "ingen/ingen.h"
 #include "ingen/types.hpp"
 #include "lv2/core/lv2.h"
 #include "lv2/port-props/port-props.h"
 
+#include <cstdlib>
+#include <string>
+
 namespace Raul { class Path; }
 
 namespace ingen {
diff --git a/ingen/client/SigClientInterface.hpp b/ingen/client/SigClientInterface.hpp
index 461a7470..e9c8cd0e 100644
--- a/ingen/client/SigClientInterface.hpp
+++ b/ingen/client/SigClientInterface.hpp
@@ -17,14 +17,13 @@
 #ifndef INGEN_CLIENT_SIGCLIENTINTERFACE_HPP
 #define INGEN_CLIENT_SIGCLIENTINTERFACE_HPP
 
-#include <cstdint>
-#include <string>
-
-#include "raul/Path.hpp"
-
 #include "ingen/Interface.hpp"
 #include "ingen/client/signal.hpp"
 #include "ingen/ingen.h"
+#include "raul/Path.hpp"
+
+#include <cstdint>
+#include <string>
 
 namespace ingen {
 namespace client {