Clean up includes

8 files changed, 13 insertions, 4 deletions

diff --git a/src/SocketReader.cpp b/src/SocketReader.cpp
index 845974d6..589fa666 100644
--- a/src/SocketReader.cpp
+++ b/src/SocketReader.cpp
@@ -23,6 +23,8 @@
 #include "ingen/World.hpp"
 #include "lv2/urid/urid.h"
 #include "raul/Socket.hpp"
+#include "serd/serd.h"
+#include "sord/sord.h"
 #include "sord/sordmm.hpp"
 
 #include <cerrno>
diff --git a/src/TurtleWriter.cpp b/src/TurtleWriter.cpp
index 07e06afe..686f0fe4 100644
--- a/src/TurtleWriter.cpp
+++ b/src/TurtleWriter.cpp
@@ -18,6 +18,7 @@
 
 #include "ingen/URIMap.hpp"
 #include "lv2/atom/atom.h"
+#include "serd/serd.h"
 
 #include <utility>
 
diff --git a/src/URI.cpp b/src/URI.cpp
index 1763a8bd..5575f804 100644
--- a/src/URI.cpp
+++ b/src/URI.cpp
@@ -17,6 +17,8 @@
 #include "ingen/URI.hpp"
 
 #include "ingen/FilePath.hpp"
+#include "serd/serd.h"
+#include "sord/sordmm.hpp"
 
 #include <cassert>
 
diff --git a/src/client/GraphModel.cpp b/src/client/GraphModel.cpp
index 0056da63..d4104742 100644
--- a/src/client/GraphModel.cpp
+++ b/src/client/GraphModel.cpp
@@ -20,6 +20,7 @@
 #include "ingen/URIs.hpp"
 #include "ingen/client/ArcModel.hpp"
 #include "ingen/client/BlockModel.hpp"
+#include "ingen/client/ObjectModel.hpp"
 #include "ingen/client/PortModel.hpp"
 #include "raul/Path.hpp"
 
diff --git a/src/gui/WindowFactory.cpp b/src/gui/WindowFactory.cpp
index a03ed881..153fb4f6 100644
--- a/src/gui/WindowFactory.cpp
+++ b/src/gui/WindowFactory.cpp
@@ -152,8 +152,6 @@ WindowFactory::present_graph(const std::shared_ptr<const GraphModel>& graph,
                              GraphWindow*                             preferred,
                              const std::shared_ptr<GraphView>&        view)
 {
-	assert(!view || view->graph() == graph);
-
 	auto w = _graph_windows.find(graph->path());
 
 	if (w != _graph_windows.end()) {
@@ -177,8 +175,6 @@ GraphWindow*
 WindowFactory::new_graph_window(const std::shared_ptr<const GraphModel>& graph,
                                 const std::shared_ptr<GraphView>&        view)
 {
-	assert(!view || view->graph() == graph);
-
 	GraphWindow* win = nullptr;
 	WidgetFactory::get_widget_derived("graph_win", win);
 	if (!win) {
diff --git a/src/server/ArcImpl.cpp b/src/server/ArcImpl.cpp
index ac39ffe1..689be199 100644
--- a/src/server/ArcImpl.cpp
+++ b/src/server/ArcImpl.cpp
@@ -27,6 +27,7 @@
 
 #include <algorithm>
 #include <cassert>
+#include <string>
 
 namespace ingen {
 namespace server {
diff --git a/src/server/PortImpl.cpp b/src/server/PortImpl.cpp
index ff5e8111..68392707 100644
--- a/src/server/PortImpl.cpp
+++ b/src/server/PortImpl.cpp
@@ -31,9 +31,11 @@
 #include "lv2/urid/urid.h"
 #include "raul/Array.hpp"
 #include "raul/Maid.hpp"
+#include "raul/Path.hpp"
 
 #include <algorithm>
 #include <cassert>
+#include <cstdio>
 #include <memory>
 #include <utility>
 
diff --git a/src/server/PreProcessor.cpp b/src/server/PreProcessor.cpp
index 9ef5db28..b2f0fd46 100644
--- a/src/server/PreProcessor.cpp
+++ b/src/server/PreProcessor.cpp
@@ -24,10 +24,14 @@
 #include "ThreadManager.hpp"
 #include "UndoStack.hpp"
 
+#include "ingen/Atom.hpp"
 #include "ingen/AtomWriter.hpp"
+#include "ingen/Configuration.hpp"
 #include "ingen/World.hpp"
 
 #include <cassert>
+#include <cstdint>
+#include <cstdio>
 #include <memory>
 
 namespace ingen {