Clean up includes in public headers

28 files changed, 34 insertions, 4 deletions

diff --git a/src/AtomReader.cpp b/src/AtomReader.cpp
index eb5b957b..95f96ee4 100644
--- a/src/AtomReader.cpp
+++ b/src/AtomReader.cpp
@@ -18,7 +18,9 @@
 #include <utility>
 
 #include "ingen/AtomReader.hpp"
+#include "ingen/Interface.hpp"
 #include "ingen/Log.hpp"
+#include "ingen/Message.hpp"
 #include "ingen/Node.hpp"
 #include "ingen/URIMap.hpp"
 #include "lv2/lv2plug.in/ns/ext/atom/util.h"
diff --git a/src/AtomWriter.cpp b/src/AtomWriter.cpp
index cf5f40ac..572fd8ac 100644
--- a/src/AtomWriter.cpp
+++ b/src/AtomWriter.cpp
@@ -51,7 +51,7 @@
 #include <cstdlib>
 #include <string>
 
-#include <boost/variant.hpp>
+#include <boost/variant/apply_visitor.hpp>
 
 #include "ingen/AtomSink.hpp"
 #include "ingen/AtomWriter.hpp"
diff --git a/src/ClashAvoider.cpp b/src/ClashAvoider.cpp
index 3c7ea827..d74915fa 100644
--- a/src/ClashAvoider.cpp
+++ b/src/ClashAvoider.cpp
@@ -14,6 +14,7 @@
   along with Ingen.  If not, see <http://www.gnu.org/licenses/>.
 */
 
+#include <cassert>
 #include <cstdio>
 #include <sstream>
 #include <string>
@@ -21,6 +22,7 @@
 
 #include "ingen/ClashAvoider.hpp"
 #include "ingen/Store.hpp"
+#include "ingen/paths.hpp"
 
 using namespace std;
 
diff --git a/src/Configuration.cpp b/src/Configuration.cpp
index cd85bf3e..1001fa34 100644
--- a/src/Configuration.cpp
+++ b/src/Configuration.cpp
@@ -25,7 +25,9 @@
 #include <glibmm/miscutils.h>
 
 #include "ingen/Configuration.hpp"
+#include "ingen/Forge.hpp"
 #include "ingen/Log.hpp"
+#include "ingen/URIMap.hpp"
 #include "ingen/ingen.h"
 #include "sord/sordmm.hpp"
 #include "sratom/sratom.h"
diff --git a/src/Forge.cpp b/src/Forge.cpp
index 52a01f40..a075d5a1 100644
--- a/src/Forge.cpp
+++ b/src/Forge.cpp
@@ -19,6 +19,7 @@
 #include "ingen/Forge.hpp"
 #include "ingen/URIMap.hpp"
 #include "lv2/lv2plug.in/ns/ext/atom/atom.h"
+#include "raul/URI.hpp"
 
 namespace Ingen {
 
diff --git a/src/Parser.cpp b/src/Parser.cpp
index c3d6eaaf..3df7194f 100644
--- a/src/Parser.cpp
+++ b/src/Parser.cpp
@@ -25,12 +25,14 @@
 
 #include "ingen/Atom.hpp"
 #include "ingen/AtomForgeSink.hpp"
+#include "ingen/Forge.hpp"
 #include "ingen/Interface.hpp"
 #include "ingen/Log.hpp"
 #include "ingen/Parser.hpp"
 #include "ingen/URIMap.hpp"
 #include "ingen/URIs.hpp"
 #include "ingen/World.hpp"
+#include "ingen/paths.hpp"
 #include "lv2/lv2plug.in/ns/ext/atom/atom.h"
 #include "serd/serd.h"
 #include "sord/sordmm.hpp"
diff --git a/src/Resource.cpp b/src/Resource.cpp
index 623f601a..eab9f0d8 100644
--- a/src/Resource.cpp
+++ b/src/Resource.cpp
@@ -18,6 +18,7 @@
 #include <utility>
 
 #include "ingen/Atom.hpp"
+#include "ingen/Forge.hpp"
 #include "ingen/Resource.hpp"
 #include "ingen/URIs.hpp"
 
diff --git a/src/Serialiser.cpp b/src/Serialiser.cpp
index 6c70ca8b..ad6e5edc 100644
--- a/src/Serialiser.cpp
+++ b/src/Serialiser.cpp
@@ -31,6 +31,7 @@
 #include <glibmm/module.h>
 
 #include "ingen/Arc.hpp"
+#include "ingen/Forge.hpp"
 #include "ingen/Interface.hpp"
 #include "ingen/Log.hpp"
 #include "ingen/Node.hpp"
diff --git a/src/SocketReader.cpp b/src/SocketReader.cpp
index 381a5305..70b6cb7f 100644
--- a/src/SocketReader.cpp
+++ b/src/SocketReader.cpp
@@ -24,6 +24,7 @@
 #include "ingen/SocketReader.hpp"
 #include "ingen/URIMap.hpp"
 #include "ingen/World.hpp"
+#include "raul/Socket.hpp"
 #include "sord/sordmm.hpp"
 #include "sratom/sratom.h"
 
diff --git a/src/SocketWriter.cpp b/src/SocketWriter.cpp
index 1a628ac0..9c120510 100644
--- a/src/SocketWriter.cpp
+++ b/src/SocketWriter.cpp
@@ -19,6 +19,7 @@
 #include <sys/socket.h>
 
 #include "ingen/SocketWriter.hpp"
+#include "raul/Socket.hpp"
 
 #ifndef MSG_NOSIGNAL
 #    define MSG_NOSIGNAL 0
diff --git a/src/Store.cpp b/src/Store.cpp
index 1767b4f5..056854ee 100644
--- a/src/Store.cpp
+++ b/src/Store.cpp
@@ -16,6 +16,7 @@
 
 #include <sstream>
 
+#include "ingen/Node.hpp"
 #include "ingen/Store.hpp"
 
 using namespace std;
diff --git a/src/URIMap.cpp b/src/URIMap.cpp
index 229f43a8..e0b5ab0d 100644
--- a/src/URIMap.cpp
+++ b/src/URIMap.cpp
@@ -18,7 +18,9 @@
 
 #include <glib.h>
 
+#include "ingen/Log.hpp"
 #include "ingen/URIMap.hpp"
+#include "raul/URI.hpp"
 
 using namespace std;
 
diff --git a/src/URIs.cpp b/src/URIs.cpp
index f5e0903d..a46c18bc 100644
--- a/src/URIs.cpp
+++ b/src/URIs.cpp
@@ -14,6 +14,7 @@
   along with Ingen.  If not, see <http://www.gnu.org/licenses/>.
 */
 
+#include "ingen/Forge.hpp"
 #include "ingen/URIMap.hpp"
 #include "ingen/URIs.hpp"
 #include "ingen/ingen.h"
diff --git a/src/World.cpp b/src/World.cpp
index d6a1fc1c..fc82079f 100644
--- a/src/World.cpp
+++ b/src/World.cpp
@@ -24,6 +24,7 @@
 #include "ingen/Configuration.hpp"
 #include "ingen/DataAccess.hpp"
 #include "ingen/EngineBase.hpp"
+#include "ingen/Forge.hpp"
 #include "ingen/InstanceAccess.hpp"
 #include "ingen/LV2Features.hpp"
 #include "ingen/Log.hpp"
diff --git a/src/client/ClientStore.cpp b/src/client/ClientStore.cpp
index a7bd1274..c5749388 100644
--- a/src/client/ClientStore.cpp
+++ b/src/client/ClientStore.cpp
@@ -14,7 +14,7 @@
   along with Ingen.  If not, see <http://www.gnu.org/licenses/>.
 */
 
-#include <boost/variant.hpp>
+#include <boost/variant/apply_visitor.hpp>
 
 #include "ingen/Log.hpp"
 #include "ingen/client/ArcModel.hpp"
diff --git a/src/gui/App.cpp b/src/gui/App.cpp
index c0f3f9bd..086f7949 100644
--- a/src/gui/App.cpp
+++ b/src/gui/App.cpp
@@ -19,6 +19,7 @@
 #include <string>
 #include <utility>
 
+#include <boost/variant/get.hpp>
 #include <gtk/gtkwindow.h>
 #include <gtkmm/stock.h>
 
diff --git a/src/gui/BreadCrumbs.cpp b/src/gui/BreadCrumbs.cpp
index c62a1e06..0be15fa6 100644
--- a/src/gui/BreadCrumbs.cpp
+++ b/src/gui/BreadCrumbs.cpp
@@ -17,6 +17,8 @@
 #include <list>
 #include <string>
 
+#include <boost/variant/get.hpp>
+
 #include "ingen/client/SigClientInterface.hpp"
 
 #include "App.hpp"
diff --git a/src/gui/ConnectWindow.cpp b/src/gui/ConnectWindow.cpp
index 635df134..012235d1 100644
--- a/src/gui/ConnectWindow.cpp
+++ b/src/gui/ConnectWindow.cpp
@@ -19,7 +19,7 @@
 #include <sstream>
 #include <string>
 
-#include <boost/variant.hpp>
+#include <boost/variant/get.hpp>
 #include <gtkmm/stock.h>
 
 #include "raul/Process.hpp"
diff --git a/src/gui/ObjectMenu.cpp b/src/gui/ObjectMenu.cpp
index 9b1d095b..df4267df 100644
--- a/src/gui/ObjectMenu.cpp
+++ b/src/gui/ObjectMenu.cpp
@@ -16,6 +16,7 @@
 
 #include <utility>
 
+#include "ingen/Forge.hpp"
 #include "ingen/Interface.hpp"
 #include "ingen/client/ObjectModel.hpp"
 
diff --git a/src/gui/Port.cpp b/src/gui/Port.cpp
index c1947fea..88eb8050 100644
--- a/src/gui/Port.cpp
+++ b/src/gui/Port.cpp
@@ -21,6 +21,7 @@
 #include "ingen/Configuration.hpp"
 #include "ingen/Interface.hpp"
 #include "ingen/Log.hpp"
+#include "ingen/URIMap.hpp"
 #include "ingen/client/GraphModel.hpp"
 #include "ingen/client/PortModel.hpp"
 
diff --git a/src/gui/RDFS.cpp b/src/gui/RDFS.cpp
index b182b989..a997af5d 100644
--- a/src/gui/RDFS.cpp
+++ b/src/gui/RDFS.cpp
@@ -14,6 +14,7 @@
   along with Ingen.  If not, see <http://www.gnu.org/licenses/>.
 */
 
+#include "ingen/Forge.hpp"
 #include "ingen/Log.hpp"
 #include "ingen/Resource.hpp"
 #include "ingen/World.hpp"
diff --git a/src/gui/RenameWindow.cpp b/src/gui/RenameWindow.cpp
index 91c524b2..8251b03d 100644
--- a/src/gui/RenameWindow.cpp
+++ b/src/gui/RenameWindow.cpp
@@ -17,6 +17,7 @@
 #include <cassert>
 #include <string>
 
+#include "ingen/Forge.hpp"
 #include "ingen/Interface.hpp"
 #include "ingen/client/ClientStore.hpp"
 #include "ingen/client/ObjectModel.hpp"
diff --git a/src/ingen/ingen.cpp b/src/ingen/ingen.cpp
index 8adc1fe2..93dce69e 100644
--- a/src/ingen/ingen.cpp
+++ b/src/ingen/ingen.cpp
@@ -35,6 +35,7 @@
 #include "ingen/Parser.hpp"
 #include "ingen/World.hpp"
 #include "ingen/client/ThreadedSigClientInterface.hpp"
+#include "ingen/paths.hpp"
 #include "ingen/runtime_paths.hpp"
 #include "ingen/types.hpp"
 #ifdef HAVE_SOCKET
diff --git a/src/server/EventWriter.cpp b/src/server/EventWriter.cpp
index 4247eda5..b8a32fcd 100644
--- a/src/server/EventWriter.cpp
+++ b/src/server/EventWriter.cpp
@@ -14,7 +14,7 @@
   along with Ingen.  If not, see <http://www.gnu.org/licenses/>.
 */
 
-#include <boost/variant.hpp>
+#include <boost/variant/apply_visitor.hpp>
 
 #include "ingen/URIs.hpp"
 
diff --git a/src/server/LV2Plugin.cpp b/src/server/LV2Plugin.cpp
index 667190ae..0ba990d0 100644
--- a/src/server/LV2Plugin.cpp
+++ b/src/server/LV2Plugin.cpp
@@ -16,6 +16,7 @@
 
 #include <string>
 
+#include "ingen/Forge.hpp"
 #include "ingen/Log.hpp"
 #include "ingen/URIs.hpp"
 #include "lv2/lv2plug.in/ns/ext/presets/presets.h"
diff --git a/src/server/SocketListener.cpp b/src/server/SocketListener.cpp
index 462b2a37..82f88ae5 100644
--- a/src/server/SocketListener.cpp
+++ b/src/server/SocketListener.cpp
@@ -25,6 +25,7 @@
 #include <thread>
 
 #include "ingen/Configuration.hpp"
+#include "ingen/Log.hpp"
 #include "ingen/Module.hpp"
 #include "ingen/World.hpp"
 #include "raul/Socket.hpp"
diff --git a/src/server/events/CreateBlock.cpp b/src/server/events/CreateBlock.cpp
index eb696c6b..af2134e1 100644
--- a/src/server/events/CreateBlock.cpp
+++ b/src/server/events/CreateBlock.cpp
@@ -14,6 +14,7 @@
   along with Ingen.  If not, see <http://www.gnu.org/licenses/>.
 */
 
+#include "ingen/Forge.hpp"
 #include "ingen/Store.hpp"
 #include "ingen/URIs.hpp"
 #include "raul/Maid.hpp"
diff --git a/src/server/events/CreateGraph.cpp b/src/server/events/CreateGraph.cpp
index 99b29b66..a22160ba 100644
--- a/src/server/events/CreateGraph.cpp
+++ b/src/server/events/CreateGraph.cpp
@@ -14,6 +14,7 @@
   along with Ingen.  If not, see <http://www.gnu.org/licenses/>.
 */
 
+#include "ingen/Forge.hpp"
 #include "ingen/Store.hpp"
 #include "ingen/URIs.hpp"
 #include "raul/Maid.hpp"