Clean up includes and forward declarations

54 files changed, 401 insertions, 317 deletions

diff --git a/src/gui/App.cpp b/src/gui/App.cpp
index b9b7f7dc..dfa34998 100644
--- a/src/gui/App.cpp
+++ b/src/gui/App.cpp
@@ -14,14 +14,22 @@
   along with Ingen.  If not, see <http://www.gnu.org/licenses/>.
 */
 
-#include <cassert>
-#include <fstream>
-#include <string>
-#include <utility>
+#include "App.hpp"
 
-#include <boost/variant/get.hpp>
-#include <gtk/gtkwindow.h>
-#include <gtkmm/stock.h>
+#include "ConnectWindow.hpp"
+#include "GraphTreeWindow.hpp"
+#include "GraphWindow.hpp"
+#include "LoadPluginWindow.hpp"
+#include "MessagesWindow.hpp"
+#include "NodeModule.hpp"
+#include "Port.hpp"
+#include "RDFS.hpp"
+#include "Style.hpp"
+#include "SubgraphModule.hpp"
+#include "ThreadedLoader.hpp"
+#include "WidgetFactory.hpp"
+#include "WindowFactory.hpp"
+#include "rgba.hpp"
 
 #include "ganv/Edge.hpp"
 #include "ingen/Configuration.hpp"
@@ -34,27 +42,21 @@
 #include "ingen/client/ClientStore.hpp"
 #include "ingen/client/GraphModel.hpp"
 #include "ingen/client/ObjectModel.hpp"
+#include "ingen/client/PortModel.hpp"
 #include "ingen/client/SigClientInterface.hpp"
 #include "ingen/runtime_paths.hpp"
 #include "lilv/lilv.h"
 #include "raul/Path.hpp"
 #include "suil/suil.h"
 
-#include "App.hpp"
-#include "ConnectWindow.hpp"
-#include "GraphTreeWindow.hpp"
-#include "GraphWindow.hpp"
-#include "LoadPluginWindow.hpp"
-#include "MessagesWindow.hpp"
-#include "NodeModule.hpp"
-#include "Port.hpp"
-#include "RDFS.hpp"
-#include "Style.hpp"
-#include "SubgraphModule.hpp"
-#include "ThreadedLoader.hpp"
-#include "WidgetFactory.hpp"
-#include "WindowFactory.hpp"
-#include "rgba.hpp"
+#include <boost/variant/get.hpp>
+#include <gtk/gtkwindow.h>
+#include <gtkmm/stock.h>
+
+#include <cassert>
+#include <fstream>
+#include <string>
+#include <utility>
 
 namespace Raul { class Deletable; }
 
diff --git a/src/gui/App.hpp b/src/gui/App.hpp
index 1aa5cbc1..47352f50 100644
--- a/src/gui/App.hpp
+++ b/src/gui/App.hpp
@@ -17,13 +17,6 @@
 #ifndef INGEN_GUI_APP_HPP
 #define INGEN_GUI_APP_HPP
 
-#include <unordered_map>
-#include <string>
-
-#include <gtkmm/aboutdialog.h>
-#include <gtkmm/main.h>
-#include <gtkmm/window.h>
-
 #include "ingen/Atom.hpp"
 #include "ingen/Message.hpp"
 #include "ingen/Resource.hpp"
@@ -34,6 +27,13 @@
 #include "lilv/lilv.h"
 #include "raul/Deletable.hpp"
 
+#include <gtkmm/aboutdialog.h>
+#include <gtkmm/main.h>
+#include <gtkmm/window.h>
+
+#include <unordered_map>
+#include <string>
+
 namespace ingen {
 
 class Interface;
diff --git a/src/gui/Arc.cpp b/src/gui/Arc.cpp
index 339a1248..d811bd22 100644
--- a/src/gui/Arc.cpp
+++ b/src/gui/Arc.cpp
@@ -15,6 +15,7 @@
 */
 
 #include "Arc.hpp"
+
 #include "ingen/client/ArcModel.hpp"
 #include "ingen/client/BlockModel.hpp"
 
diff --git a/src/gui/Arc.hpp b/src/gui/Arc.hpp
index 4eedde88..453985fc 100644
--- a/src/gui/Arc.hpp
+++ b/src/gui/Arc.hpp
@@ -17,11 +17,11 @@
 #ifndef INGEN_GUI_ARC_HPP
 #define INGEN_GUI_ARC_HPP
 
-#include <cassert>
-
 #include "ganv/Edge.hpp"
 #include "ingen/types.hpp"
 
+#include <cassert>
+
 namespace ingen {
 
 namespace client { class ArcModel; }
diff --git a/src/gui/BreadCrumbs.cpp b/src/gui/BreadCrumbs.cpp
index 2d2c535e..33b2c4b3 100644
--- a/src/gui/BreadCrumbs.cpp
+++ b/src/gui/BreadCrumbs.cpp
@@ -14,15 +14,15 @@
   along with Ingen.  If not, see <http://www.gnu.org/licenses/>.
 */
 
-#include <list>
-#include <string>
+#include "BreadCrumbs.hpp"
 
-#include <boost/variant/get.hpp>
+#include "App.hpp"
 
 #include "ingen/client/SigClientInterface.hpp"
 
-#include "App.hpp"
-#include "BreadCrumbs.hpp"
+#include <boost/variant/get.hpp>
+
+#include <string>
 
 namespace ingen {
 namespace gui {
diff --git a/src/gui/BreadCrumbs.hpp b/src/gui/BreadCrumbs.hpp
index 35c97fd0..63872a78 100644
--- a/src/gui/BreadCrumbs.hpp
+++ b/src/gui/BreadCrumbs.hpp
@@ -17,18 +17,20 @@
 #ifndef INGEN_GUI_BREADCRUMBS_HPP
 #define INGEN_GUI_BREADCRUMBS_HPP
 
-#include <list>
+#include "GraphView.hpp"
+
+#include "ingen/Message.hpp"
+#include "ingen/client/GraphModel.hpp"
+#include "ingen/types.hpp"
+#include "raul/Path.hpp"
 
 #include <gtkmm/box.h>
 #include <gtkmm/label.h>
 #include <gtkmm/togglebutton.h>
 
-#include "raul/Path.hpp"
-
-#include "ingen/client/GraphModel.hpp"
-#include "ingen/types.hpp"
-
-#include "GraphView.hpp"
+#include <cassert>
+#include <list>
+#include <string>
 
 namespace ingen {
 namespace gui {
diff --git a/src/gui/ConnectWindow.cpp b/src/gui/ConnectWindow.cpp
index 369331e2..1468290f 100644
--- a/src/gui/ConnectWindow.cpp
+++ b/src/gui/ConnectWindow.cpp
@@ -14,15 +14,10 @@
   along with Ingen.  If not, see <http://www.gnu.org/licenses/>.
 */
 
-#include <cstdlib>
-#include <limits>
-#include <sstream>
-#include <string>
-
-#include <boost/variant/get.hpp>
-#include <gtkmm/stock.h>
+#include "ConnectWindow.hpp"
 
-#include "raul/Process.hpp"
+#include "App.hpp"
+#include "WindowFactory.hpp"
 
 #include "ingen/Configuration.hpp"
 #include "ingen/EngineBase.hpp"
@@ -36,10 +31,15 @@
 #include "ingen/client/SigClientInterface.hpp"
 #include "ingen/client/SocketClient.hpp"
 #include "ingen_config.h"
+#include "raul/Process.hpp"
 
-#include "App.hpp"
-#include "ConnectWindow.hpp"
-#include "WindowFactory.hpp"
+#include <boost/variant/get.hpp>
+#include <glib.h>
+#include <gtkmm/stock.h>
+
+#include <limits>
+#include <string>
+#include <utility>
 
 using namespace ingen::client;
 
diff --git a/src/gui/ConnectWindow.hpp b/src/gui/ConnectWindow.hpp
index 093fafc0..882e0142 100644
--- a/src/gui/ConnectWindow.hpp
+++ b/src/gui/ConnectWindow.hpp
@@ -17,6 +17,12 @@
 #ifndef INGEN_GUI_CONNECTWINDOW_HPP
 #define INGEN_GUI_CONNECTWINDOW_HPP
 
+#include "Window.hpp"
+
+#include "ingen/Message.hpp"
+#include "ingen/types.hpp"
+#include "lilv/lilv.h"
+
 #include <gtkmm/builder.h>
 #include <gtkmm/button.h>
 #include <gtkmm/entry.h>
@@ -26,12 +32,14 @@
 #include <gtkmm/radiobutton.h>
 #include <gtkmm/spinbutton.h>
 
-#include "ingen/types.hpp"
-#include "lilv/lilv.h"
-
-#include "Window.hpp"
+#include <cstdint>
+#include <string>
 
 namespace ingen {
+
+class Interface;
+class World;
+
 namespace gui {
 
 class App;
diff --git a/src/gui/GraphBox.cpp b/src/gui/GraphBox.cpp
index a201eca8..d248d0a7 100644
--- a/src/gui/GraphBox.cpp
+++ b/src/gui/GraphBox.cpp
@@ -14,22 +14,6 @@
   along with Ingen.  If not, see <http://www.gnu.org/licenses/>.
 */
 
-#include <cassert>
-#include <sstream>
-#include <string>
-
-#include <boost/format.hpp>
-#include <glib/gstdio.h>
-#include <glibmm/fileutils.h>
-#include <gtkmm/stock.h>
-
-#include "ingen/Configuration.hpp"
-#include "ingen/Interface.hpp"
-#include "ingen/Log.hpp"
-#include "ingen/fmt.hpp"
-#include "ingen/client/ClientStore.hpp"
-#include "ingen/client/GraphModel.hpp"
-
 #include "App.hpp"
 #include "BreadCrumbs.hpp"
 #include "ConnectWindow.hpp"
@@ -47,10 +31,25 @@
 #include "WindowFactory.hpp"
 #include "ingen_config.h"
 
+#include "ingen/Configuration.hpp"
+#include "ingen/Interface.hpp"
+#include "ingen/Log.hpp"
+#include "ingen/client/ClientStore.hpp"
+#include "ingen/client/GraphModel.hpp"
+#include "ingen/fmt.hpp"
+
+#include <boost/format.hpp>
+#include <glib/gstdio.h>
+#include <glibmm/fileutils.h>
+#include <gtkmm/stock.h>
 #ifdef HAVE_WEBKIT
 #include <webkit/webkit.h>
 #endif
 
+#include <cassert>
+#include <sstream>
+#include <string>
+
 namespace ingen {
 
 using namespace client;
diff --git a/src/gui/GraphCanvas.cpp b/src/gui/GraphCanvas.cpp
index 986fefdc..d10d569b 100644
--- a/src/gui/GraphCanvas.cpp
+++ b/src/gui/GraphCanvas.cpp
@@ -14,14 +14,20 @@
   along with Ingen.  If not, see <http://www.gnu.org/licenses/>.
 */
 
-#include <algorithm>
-#include <cassert>
-#include <map>
-#include <set>
-#include <string>
-
-#include <boost/optional.hpp>
-#include <gtkmm/stock.h>
+#include "App.hpp"
+#include "Arc.hpp"
+#include "GraphCanvas.hpp"
+#include "GraphPortModule.hpp"
+#include "GraphWindow.hpp"
+#include "LoadPluginWindow.hpp"
+#include "NewSubgraphWindow.hpp"
+#include "NodeModule.hpp"
+#include "PluginMenu.hpp"
+#include "Port.hpp"
+#include "SubgraphModule.hpp"
+#include "ThreadedLoader.hpp"
+#include "WidgetFactory.hpp"
+#include "WindowFactory.hpp"
 
 #include "ganv/Canvas.hpp"
 #include "ganv/Circle.hpp"
@@ -38,20 +44,14 @@
 #include "ingen/ingen.h"
 #include "lv2/atom/atom.h"
 
-#include "App.hpp"
-#include "Arc.hpp"
-#include "GraphCanvas.hpp"
-#include "GraphPortModule.hpp"
-#include "GraphWindow.hpp"
-#include "LoadPluginWindow.hpp"
-#include "NewSubgraphWindow.hpp"
-#include "NodeModule.hpp"
-#include "PluginMenu.hpp"
-#include "Port.hpp"
-#include "SubgraphModule.hpp"
-#include "ThreadedLoader.hpp"
-#include "WidgetFactory.hpp"
-#include "WindowFactory.hpp"
+#include <boost/optional/optional.hpp>
+#include <gtkmm/stock.h>
+
+#include <algorithm>
+#include <cassert>
+#include <map>
+#include <set>
+#include <string>
 
 using std::string;
 
diff --git a/src/gui/GraphCanvas.hpp b/src/gui/GraphCanvas.hpp
index 509b0a4a..613c03da 100644
--- a/src/gui/GraphCanvas.hpp
+++ b/src/gui/GraphCanvas.hpp
@@ -17,20 +17,19 @@
 #ifndef INGEN_GUI_GRAPHCANVAS_HPP
 #define INGEN_GUI_GRAPHCANVAS_HPP
 
-#include <string>
-#include <map>
-#include <set>
-
-#include "lilv/lilv.h"
+#include "NodeModule.hpp"
 
 #include "ganv/Canvas.hpp"
 #include "ganv/Module.hpp"
 #include "ingen/Node.hpp"
 #include "ingen/client/ArcModel.hpp"
 #include "ingen/types.hpp"
+#include "lilv/lilv.h"
 #include "raul/Path.hpp"
 
-#include "NodeModule.hpp"
+#include <string>
+#include <map>
+#include <set>
 
 namespace ingen {
 
diff --git a/src/gui/GraphPortModule.cpp b/src/gui/GraphPortModule.cpp
index a1ea6ce2..ffca1834 100644
--- a/src/gui/GraphPortModule.cpp
+++ b/src/gui/GraphPortModule.cpp
@@ -14,15 +14,6 @@
   along with Ingen.  If not, see <http://www.gnu.org/licenses/>.
 */
 
-#include <cassert>
-#include <string>
-#include <utility>
-
-#include "ingen/Configuration.hpp"
-#include "ingen/Interface.hpp"
-#include "ingen/client/BlockModel.hpp"
-#include "ingen/client/GraphModel.hpp"
-
 #include "App.hpp"
 #include "Style.hpp"
 #include "GraphCanvas.hpp"
@@ -34,6 +25,15 @@
 #include "WidgetFactory.hpp"
 #include "WindowFactory.hpp"
 
+#include "ingen/Configuration.hpp"
+#include "ingen/Interface.hpp"
+#include "ingen/client/BlockModel.hpp"
+#include "ingen/client/GraphModel.hpp"
+
+#include <cassert>
+#include <string>
+#include <utility>
+
 namespace ingen {
 
 using namespace client;
diff --git a/src/gui/GraphPortModule.hpp b/src/gui/GraphPortModule.hpp
index 548b7267..6400b327 100644
--- a/src/gui/GraphPortModule.hpp
+++ b/src/gui/GraphPortModule.hpp
@@ -17,11 +17,11 @@
 #ifndef INGEN_GUI_GRAPHPORTMODULE_HPP
 #define INGEN_GUI_GRAPHPORTMODULE_HPP
 
-#include <string>
+#include "Port.hpp"
 
 #include "ganv/Module.hpp"
 
-#include "Port.hpp"
+#include <string>
 
 namespace Raul { class Atom; }
 
diff --git a/src/gui/GraphTreeWindow.hpp b/src/gui/GraphTreeWindow.hpp
index 0df5d01c..eb5a5f78 100644
--- a/src/gui/GraphTreeWindow.hpp
+++ b/src/gui/GraphTreeWindow.hpp
@@ -17,13 +17,13 @@
 #ifndef INGEN_GUI_GRAPHTREEWINDOW_HPP
 #define INGEN_GUI_GRAPHTREEWINDOW_HPP
 
+#include "Window.hpp"
+
 #include <gtkmm/builder.h>
 #include <gtkmm/treemodel.h>
 #include <gtkmm/treestore.h>
 #include <gtkmm/treeview.h>
 
-#include "Window.hpp"
-
 namespace Raul { class Path; }
 
 namespace ingen {
diff --git a/src/gui/GraphView.cpp b/src/gui/GraphView.cpp
index 42e19344..9e39ef7c 100644
--- a/src/gui/GraphView.cpp
+++ b/src/gui/GraphView.cpp
@@ -14,12 +14,6 @@
   along with Ingen.  If not, see <http://www.gnu.org/licenses/>.
 */
 
-#include <cassert>
-#include <fstream>
-
-#include "ingen/Interface.hpp"
-#include "ingen/client/GraphModel.hpp"
-
 #include "App.hpp"
 #include "LoadPluginWindow.hpp"
 #include "NewSubgraphWindow.hpp"
@@ -28,6 +22,12 @@
 #include "GraphView.hpp"
 #include "WidgetFactory.hpp"
 
+#include "ingen/Interface.hpp"
+#include "ingen/client/GraphModel.hpp"
+
+#include <cassert>
+#include <fstream>
+
 namespace ingen {
 
 using namespace client;
diff --git a/src/gui/GraphView.hpp b/src/gui/GraphView.hpp
index 57a210a3..8c62ba3d 100644
--- a/src/gui/GraphView.hpp
+++ b/src/gui/GraphView.hpp
@@ -17,6 +17,8 @@
 #ifndef INGEN_GUI_GRAPHVIEW_HPP
 #define INGEN_GUI_GRAPHVIEW_HPP
 
+#include "ingen/types.hpp"
+
 #include <gtkmm/box.h>
 #include <gtkmm/builder.h>
 #include <gtkmm/scrolledwindow.h>
@@ -26,12 +28,13 @@
 #include <gtkmm/toolitem.h>
 #include <gtkmm/toolitem.h>
 
-#include "ingen/types.hpp"
-
 namespace Raul { class Atom; }
 
 namespace ingen {
 
+class Atom;
+class URI;
+
 namespace client {
 class PortModel;
 class MetadataModel;
diff --git a/src/gui/GraphWindow.hpp b/src/gui/GraphWindow.hpp
index bdcda312..e3d30d4c 100644
--- a/src/gui/GraphWindow.hpp
+++ b/src/gui/GraphWindow.hpp
@@ -17,14 +17,14 @@
 #ifndef INGEN_GUI_GRAPH_WINDOW_HPP
 #define INGEN_GUI_GRAPH_WINDOW_HPP
 
-#include <string>
-
-#include <gtkmm/builder.h>
+#include "GraphBox.hpp"
+#include "Window.hpp"
 
 #include "ingen/types.hpp"
 
-#include "GraphBox.hpp"
-#include "Window.hpp"
+#include <gtkmm/builder.h>
+
+#include <string>
 
 namespace ingen {
 
diff --git a/src/gui/LoadGraphWindow.cpp b/src/gui/LoadGraphWindow.cpp
index d5ffa16e..fb1dc9ff 100644
--- a/src/gui/LoadGraphWindow.cpp
+++ b/src/gui/LoadGraphWindow.cpp
@@ -14,12 +14,12 @@
   along with Ingen.  If not, see <http://www.gnu.org/licenses/>.
 */
 
-#include <cassert>
-#include <list>
-#include <string>
+#include "LoadGraphWindow.hpp"
 
-#include <boost/optional.hpp>
-#include <glibmm/miscutils.h>
+#include "App.hpp"
+#include "GraphView.hpp"
+#include "Style.hpp"
+#include "ThreadedLoader.hpp"
 
 #include "ingen/Configuration.hpp"
 #include "ingen/Interface.hpp"
@@ -28,11 +28,13 @@
 #include "ingen/client/GraphModel.hpp"
 #include "ingen/runtime_paths.hpp"
 
-#include "App.hpp"
-#include "GraphView.hpp"
-#include "LoadGraphWindow.hpp"
-#include "Style.hpp"
-#include "ThreadedLoader.hpp"
+#include <boost/optional/optional.hpp>
+#include <glibmm/miscutils.h>
+
+#include <list>
+#include <ostream>
+#include <string>
+#include <utility>
 
 namespace ingen {
 
diff --git a/src/gui/LoadGraphWindow.hpp b/src/gui/LoadGraphWindow.hpp
index 03cb8c05..32d435ad 100644
--- a/src/gui/LoadGraphWindow.hpp
+++ b/src/gui/LoadGraphWindow.hpp
@@ -17,6 +17,9 @@
 #ifndef INGEN_GUI_LOADGRAPHWINDOW_HPP
 #define INGEN_GUI_LOADGRAPHWINDOW_HPP
 
+#include "ingen/Node.hpp"
+#include "ingen/types.hpp"
+
 #include <gtkmm/builder.h>
 #include <gtkmm/button.h>
 #include <gtkmm/entry.h>
@@ -25,15 +28,14 @@
 #include <gtkmm/radiobutton.h>
 #include <gtkmm/spinbutton.h>
 
-#include "ingen/Node.hpp"
-#include "ingen/types.hpp"
-
 namespace ingen {
 
 namespace client { class GraphModel; }
 
 namespace gui {
 
+class App;
+
 /** 'Load Graph' Window.
  *
  * Loaded from XML as a derived object.
diff --git a/src/gui/LoadPluginWindow.cpp b/src/gui/LoadPluginWindow.cpp
index 743c0f11..bb84f96f 100644
--- a/src/gui/LoadPluginWindow.cpp
+++ b/src/gui/LoadPluginWindow.cpp
@@ -14,25 +14,22 @@
   along with Ingen.  If not, see <http://www.gnu.org/licenses/>.
 */
 
-#include <string>
-
-#include <stddef.h>
-
-#include <cassert>
-#include <algorithm>
-
-#include "ingen/Interface.hpp"
-#include "ingen/client/ClientStore.hpp"
-#include "ingen/client/GraphModel.hpp"
-
 #include "App.hpp"
-#include "LoadPluginWindow.hpp"
 #include "GraphCanvas.hpp"
 #include "GraphView.hpp"
 #include "GraphWindow.hpp"
-
+#include "LoadPluginWindow.hpp"
 #include "ingen_config.h"
 
+#include "ingen/Interface.hpp"
+#include "ingen/client/ClientStore.hpp"
+#include "ingen/client/GraphModel.hpp"
+
+#include <string>
+#include <cstddef>
+#include <cassert>
+#include <algorithm>
+
 using std::string;
 
 namespace ingen {
diff --git a/src/gui/LoadPluginWindow.hpp b/src/gui/LoadPluginWindow.hpp
index 0e6226c9..ddd0b427 100644
--- a/src/gui/LoadPluginWindow.hpp
+++ b/src/gui/LoadPluginWindow.hpp
@@ -17,8 +17,12 @@
 #ifndef INGEN_GUI_LOADPLUGINWINDOW_HPP
 #define INGEN_GUI_LOADPLUGINWINDOW_HPP
 
-#include <map>
-#include <string>
+#include "Window.hpp"
+
+#include "ingen/Node.hpp"
+#include "ingen/client/ClientStore.hpp"
+#include "ingen/types.hpp"
+#include "ingen_config.h"
 
 #include <gtkmm/builder.h>
 #include <gtkmm/combobox.h>
@@ -26,12 +30,8 @@
 #include <gtkmm/treemodel.h>
 #include <gtkmm/treeview.h>
 
-#include "ingen/Node.hpp"
-#include "ingen/client/ClientStore.hpp"
-#include "ingen/types.hpp"
-#include "ingen_config.h"
-
-#include "Window.hpp"
+#include <map>
+#include <string>
 
 namespace ingen {
 
diff --git a/src/gui/MessagesWindow.cpp b/src/gui/MessagesWindow.cpp
index 2b980a53..84d29679 100644
--- a/src/gui/MessagesWindow.cpp
+++ b/src/gui/MessagesWindow.cpp
@@ -14,12 +14,16 @@
   along with Ingen.  If not, see <http://www.gnu.org/licenses/>.
 */
 
-#include <string>
+#include "MessagesWindow.hpp"
+
+#include "App.hpp"
 
 #include "ingen/URIs.hpp"
 
-#include "App.hpp"
-#include "MessagesWindow.hpp"
+#include <cstdio>
+#include <cstdlib>
+#include <string>
+#include <utility>
 
 namespace ingen {
 namespace gui {
diff --git a/src/gui/MessagesWindow.hpp b/src/gui/MessagesWindow.hpp
index fae6c2c3..add87455 100644
--- a/src/gui/MessagesWindow.hpp
+++ b/src/gui/MessagesWindow.hpp
@@ -17,16 +17,19 @@
 #ifndef INGEN_GUI_MESSAGESWINDOW_HPP
 #define INGEN_GUI_MESSAGESWINDOW_HPP
 
-#include <mutex>
-#include <sstream>
-#include <string>
+#include "Window.hpp"
+
+#include "lv2/log/log.h"
 
 #include <gtkmm/builder.h>
 #include <gtkmm/button.h>
 #include <gtkmm/textview.h>
-#include "lv2/log/log.h"
 
-#include "Window.hpp"
+#include <cstdarg>
+#include <map>
+#include <mutex>
+#include <sstream>
+#include <string>
 
 namespace ingen {
 namespace gui {
diff --git a/src/gui/NewSubgraphWindow.cpp b/src/gui/NewSubgraphWindow.cpp
index 4f8197f2..228bd91c 100644
--- a/src/gui/NewSubgraphWindow.cpp
+++ b/src/gui/NewSubgraphWindow.cpp
@@ -14,15 +14,17 @@
   along with Ingen.  If not, see <http://www.gnu.org/licenses/>.
 */
 
-#include <string>
+#include "NewSubgraphWindow.hpp"
+
+#include "App.hpp"
+#include "GraphView.hpp"
 
 #include "ingen/Interface.hpp"
 #include "ingen/client/ClientStore.hpp"
 #include "ingen/client/GraphModel.hpp"
 
-#include "App.hpp"
-#include "NewSubgraphWindow.hpp"
-#include "GraphView.hpp"
+#include <cstdint>
+#include <string>
 
 namespace ingen {
 namespace gui {
diff --git a/src/gui/NewSubgraphWindow.hpp b/src/gui/NewSubgraphWindow.hpp
index 403faa42..2d249cf3 100644
--- a/src/gui/NewSubgraphWindow.hpp
+++ b/src/gui/NewSubgraphWindow.hpp
@@ -17,17 +17,17 @@
 #ifndef INGEN_GUI_NEWSUBGRAPHWINDOW_HPP
 #define INGEN_GUI_NEWSUBGRAPHWINDOW_HPP
 
+#include "Window.hpp"
+
+#include "ingen/Node.hpp"
+#include "ingen/types.hpp"
+
 #include <gtkmm/builder.h>
 #include <gtkmm/button.h>
 #include <gtkmm/entry.h>
 #include <gtkmm/label.h>
 #include <gtkmm/spinbutton.h>
 
-#include "ingen/Node.hpp"
-#include "ingen/types.hpp"
-
-#include "Window.hpp"
-
 namespace ingen {
 
 namespace client { class GraphModel; }
diff --git a/src/gui/NodeMenu.cpp b/src/gui/NodeMenu.cpp
index 45f1e7cd..e2478592 100644
--- a/src/gui/NodeMenu.cpp
+++ b/src/gui/NodeMenu.cpp
@@ -14,24 +14,29 @@
   along with Ingen.  If not, see <http://www.gnu.org/licenses/>.
 */
 
-#include <string>
+#include "NodeMenu.hpp"
 
-#include <gtkmm/entry.h>
-#include <gtkmm/filechooserdialog.h>
-#include <gtkmm/image.h>
-#include <gtkmm/stock.h>
+#include "App.hpp"
+#include "WidgetFactory.hpp"
+#include "WindowFactory.hpp"
 
 #include "ingen/Interface.hpp"
 #include "ingen/Log.hpp"
 #include "ingen/URIMap.hpp"
 #include "ingen/client/BlockModel.hpp"
 #include "ingen/client/PluginModel.hpp"
+#include "ingen/client/PortModel.hpp"
 #include "lv2/presets/presets.h"
 
-#include "App.hpp"
-#include "NodeMenu.hpp"
-#include "WidgetFactory.hpp"
-#include "WindowFactory.hpp"
+#include <glib.h>
+#include <gtkmm/entry.h>
+#include <gtkmm/filechooserdialog.h>
+#include <gtkmm/image.h>
+#include <gtkmm/stock.h>
+
+#include <cstdint>
+#include <string>
+#include <utility>
 
 namespace ingen {
 
diff --git a/src/gui/NodeMenu.hpp b/src/gui/NodeMenu.hpp
index fd4962a9..2a3268b4 100644
--- a/src/gui/NodeMenu.hpp
+++ b/src/gui/NodeMenu.hpp
@@ -17,15 +17,16 @@
 #ifndef INGEN_GUI_NODEMENU_HPP
 #define INGEN_GUI_NODEMENU_HPP
 
-#include <string>
+#include "ObjectMenu.hpp"
+
+#include "ingen/client/BlockModel.hpp"
+#include "ingen/types.hpp"
 
 #include <gtkmm/builder.h>
 #include <gtkmm/menu.h>
 #include <gtkmm/menushell.h>
 
-#include "ObjectMenu.hpp"
-#include "ingen/client/BlockModel.hpp"
-#include "ingen/types.hpp"
+#include <string>
 
 namespace ingen {
 namespace gui {
diff --git a/src/gui/NodeModule.cpp b/src/gui/NodeModule.cpp
index abb9e970..b514b6ae 100644
--- a/src/gui/NodeModule.cpp
+++ b/src/gui/NodeModule.cpp
@@ -14,27 +14,12 @@
   along with Ingen.  If not, see <http://www.gnu.org/licenses/>.
 */
 
-#include <cassert>
-#include <string>
-
-#include <gtkmm/eventbox.h>
-
-#include "lv2/atom/util.h"
-
-#include "ingen/Atom.hpp"
-#include "ingen/Configuration.hpp"
-#include "ingen/Interface.hpp"
-#include "ingen/Log.hpp"
-#include "ingen/client/BlockModel.hpp"
-#include "ingen/client/GraphModel.hpp"
-#include "ingen/client/PluginModel.hpp"
-#include "ingen/client/PluginUI.hpp"
+#include "NodeModule.hpp"
 
 #include "App.hpp"
 #include "GraphCanvas.hpp"
 #include "GraphWindow.hpp"
 #include "NodeMenu.hpp"
-#include "NodeModule.hpp"
 #include "Port.hpp"
 #include "RenameWindow.hpp"
 #include "Style.hpp"
@@ -43,6 +28,21 @@
 #include "WindowFactory.hpp"
 #include "ingen_config.h"
 
+#include "ingen/Atom.hpp"
+#include "ingen/Configuration.hpp"
+#include "ingen/Interface.hpp"
+#include "ingen/Log.hpp"
+#include "ingen/client/BlockModel.hpp"
+#include "ingen/client/GraphModel.hpp"
+#include "ingen/client/PluginModel.hpp"
+#include "ingen/client/PluginUI.hpp"
+#include "lv2/atom/util.h"
+
+#include <gtkmm/eventbox.h>
+
+#include <cassert>
+#include <string>
+
 namespace ingen {
 
 using namespace client;
diff --git a/src/gui/ObjectMenu.cpp b/src/gui/ObjectMenu.cpp
index 7c81adf2..7a523f4e 100644
--- a/src/gui/ObjectMenu.cpp
+++ b/src/gui/ObjectMenu.cpp
@@ -14,16 +14,17 @@
   along with Ingen.  If not, see <http://www.gnu.org/licenses/>.
 */
 
-#include <utility>
+#include "ObjectMenu.hpp"
+
+#include "App.hpp"
+#include "WidgetFactory.hpp"
+#include "WindowFactory.hpp"
 
 #include "ingen/Forge.hpp"
 #include "ingen/Interface.hpp"
 #include "ingen/client/ObjectModel.hpp"
 
-#include "App.hpp"
-#include "ObjectMenu.hpp"
-#include "WidgetFactory.hpp"
-#include "WindowFactory.hpp"
+#include <cstdint>
 
 namespace ingen {
 
diff --git a/src/gui/ObjectMenu.hpp b/src/gui/ObjectMenu.hpp
index b0a0cc10..22eef74b 100644
--- a/src/gui/ObjectMenu.hpp
+++ b/src/gui/ObjectMenu.hpp
@@ -17,17 +17,18 @@
 #ifndef INGEN_GUI_OBJECTMENU_HPP
 #define INGEN_GUI_OBJECTMENU_HPP
 
+#include "ingen/client/ObjectModel.hpp"
+#include "ingen/types.hpp"
+
 #include <gtkmm/builder.h>
 #include <gtkmm/checkmenuitem.h>
 #include <gtkmm/menu.h>
 #include <gtkmm/menuitem.h>
 
-#include "ingen/client/ObjectModel.hpp"
-#include "ingen/types.hpp"
-
 namespace ingen {
 namespace gui {
 
+class App;
 class ObjectControlWindow;
 class ObjectPropertiesWindow;
 class GraphCanvas;
diff --git a/src/gui/PluginMenu.cpp b/src/gui/PluginMenu.cpp
index 49ee059d..0090aff1 100644
--- a/src/gui/PluginMenu.cpp
+++ b/src/gui/PluginMenu.cpp
@@ -18,6 +18,8 @@
 #include "ingen/Log.hpp"
 #include "ingen/client/PluginModel.hpp"
 
+#include <utility>
+
 namespace ingen {
 namespace gui {
 
diff --git a/src/gui/PluginMenu.hpp b/src/gui/PluginMenu.hpp
index e4343ed7..284331d6 100644
--- a/src/gui/PluginMenu.hpp
+++ b/src/gui/PluginMenu.hpp
@@ -17,16 +17,17 @@
 #ifndef INGEN_GUI_PLUGINMENU_HPP
 #define INGEN_GUI_PLUGINMENU_HPP
 
-#include <map>
-#include <set>
-#include <string>
-
-#include <gtkmm/menu.h>
-
 #include "ingen/World.hpp"
 #include "ingen/types.hpp"
 #include "lilv/lilv.h"
 
+#include <gtkmm/menu.h>
+
+#include <cstddef>
+#include <map>
+#include <set>
+#include <string>
+
 namespace ingen {
 
 namespace client { class PluginModel; }
diff --git a/src/gui/Port.cpp b/src/gui/Port.cpp
index 82db9a0a..14f87fc1 100644
--- a/src/gui/Port.cpp
+++ b/src/gui/Port.cpp
@@ -14,20 +14,10 @@
   along with Ingen.  If not, see <http://www.gnu.org/licenses/>.
 */
 
-#include <cassert>
-#include <string>
-
-#include "ganv/Module.hpp"
-#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"
+#include "Port.hpp"
 
 #include "App.hpp"
 #include "GraphWindow.hpp"
-#include "Port.hpp"
 #include "PortMenu.hpp"
 #include "RDFS.hpp"
 #include "Style.hpp"
@@ -36,6 +26,17 @@
 #include "ingen_config.h"
 #include "rgba.hpp"
 
+#include "ganv/Module.hpp"
+#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"
+
+#include <cassert>
+#include <string>
+
 using namespace ingen::client;
 
 namespace ingen {
diff --git a/src/gui/Port.hpp b/src/gui/Port.hpp
index d88f3f9d..c95c93ef 100644
--- a/src/gui/Port.hpp
+++ b/src/gui/Port.hpp
@@ -17,13 +17,13 @@
 #ifndef INGEN_GUI_PORT_HPP
 #define INGEN_GUI_PORT_HPP
 
-#include <cassert>
-#include <string>
+#include "ganv/Port.hpp"
+#include "ingen/types.hpp"
 
 #include <gtkmm/menu.h>
 
-#include "ganv/Port.hpp"
-#include "ingen/types.hpp"
+#include <cassert>
+#include <string>
 
 namespace Raul {
 class Atom;
@@ -32,6 +32,7 @@ class Atom;
 namespace ingen {
 
 class URI;
+class Atom;
 
 namespace client { class PortModel; }
 
diff --git a/src/gui/PortMenu.cpp b/src/gui/PortMenu.cpp
index 3a5b510d..ff3d2571 100644
--- a/src/gui/PortMenu.cpp
+++ b/src/gui/PortMenu.cpp
@@ -14,16 +14,17 @@
   along with Ingen.  If not, see <http://www.gnu.org/licenses/>.
 */
 
-#include <cmath>
+#include "PortMenu.hpp"
+
+#include "App.hpp"
+#include "WindowFactory.hpp"
 
 #include "ingen/Interface.hpp"
 #include "ingen/client/GraphModel.hpp"
 #include "ingen/client/PortModel.hpp"
 #include "ingen/types.hpp"
 
-#include "App.hpp"
-#include "PortMenu.hpp"
-#include "WindowFactory.hpp"
+#include <string>
 
 namespace ingen {
 
diff --git a/src/gui/PortMenu.hpp b/src/gui/PortMenu.hpp
index 60084223..26298e76 100644
--- a/src/gui/PortMenu.hpp
+++ b/src/gui/PortMenu.hpp
@@ -17,14 +17,14 @@
 #ifndef INGEN_GUI_PORTMENU_HPP
 #define INGEN_GUI_PORTMENU_HPP
 
-#include <gtkmm/builder.h>
-#include <gtkmm/menu.h>
-#include <gtkmm/menushell.h>
+#include "ObjectMenu.hpp"
 
 #include "ingen/client/PortModel.hpp"
 #include "ingen/types.hpp"
 
-#include "ObjectMenu.hpp"
+#include <gtkmm/builder.h>
+#include <gtkmm/menu.h>
+#include <gtkmm/menushell.h>
 
 namespace ingen {
 namespace gui {
diff --git a/src/gui/PropertiesWindow.cpp b/src/gui/PropertiesWindow.cpp
index ba25d69b..ee257843 100644
--- a/src/gui/PropertiesWindow.cpp
+++ b/src/gui/PropertiesWindow.cpp
@@ -14,12 +14,10 @@
   along with Ingen.  If not, see <http://www.gnu.org/licenses/>.
 */
 
-#include <algorithm>
-#include <cassert>
-#include <set>
-
-#include <gtkmm/label.h>
-#include <gtkmm/spinbutton.h>
+#include "App.hpp"
+#include "PropertiesWindow.hpp"
+#include "RDFS.hpp"
+#include "URIEntry.hpp"
 
 #include "ingen/Interface.hpp"
 #include "ingen/Log.hpp"
@@ -28,10 +26,15 @@
 #include "ingen/client/BlockModel.hpp"
 #include "ingen/client/PluginModel.hpp"
 
-#include "App.hpp"
-#include "PropertiesWindow.hpp"
-#include "RDFS.hpp"
-#include "URIEntry.hpp"
+#include <gtkmm/label.h>
+#include <gtkmm/spinbutton.h>
+
+#include <algorithm>
+#include <cfloat>
+#include <climits>
+#include <cstdint>
+#include <set>
+#include <utility>
 
 namespace ingen {
 
diff --git a/src/gui/PropertiesWindow.hpp b/src/gui/PropertiesWindow.hpp
index c1c3eee4..c847da20 100644
--- a/src/gui/PropertiesWindow.hpp
+++ b/src/gui/PropertiesWindow.hpp
@@ -17,7 +17,10 @@
 #ifndef INGEN_GUI_PROPERTIES_WINDOW_HPP
 #define INGEN_GUI_PROPERTIES_WINDOW_HPP
 
-#include <map>
+#include "Window.hpp"
+
+#include "ingen/client/BlockModel.hpp"
+#include "ingen/types.hpp"
 
 #include <gtkmm/alignment.h>
 #include <gtkmm/box.h>
@@ -29,10 +32,9 @@
 #include <gtkmm/scrolledwindow.h>
 #include <gtkmm/table.h>
 
-#include "ingen/client/BlockModel.hpp"
-#include "ingen/types.hpp"
-
-#include "Window.hpp"
+#include <map>
+#include <set>
+#include <string>
 
 namespace ingen {
 
diff --git a/src/gui/RDFS.cpp b/src/gui/RDFS.cpp
index 80cc24f1..0b4a4e62 100644
--- a/src/gui/RDFS.cpp
+++ b/src/gui/RDFS.cpp
@@ -23,6 +23,8 @@
 
 #include "RDFS.hpp"
 
+#include <utility>
+
 namespace ingen {
 namespace gui {
 namespace rdfs {
diff --git a/src/gui/RDFS.hpp b/src/gui/RDFS.hpp
index ee1133f5..4e9a8ab1 100644
--- a/src/gui/RDFS.hpp
+++ b/src/gui/RDFS.hpp
@@ -17,13 +17,14 @@
 #ifndef INGEN_GUI_RDF_HPP
 #define INGEN_GUI_RDF_HPP
 
+#include "ingen/URI.hpp"
+#include "ingen/types.hpp"
+#include "lilv/lilv.h"
+
 #include <map>
 #include <set>
 #include <string>
 
-#include "ingen/types.hpp"
-#include "lilv/lilv.h"
-
 namespace ingen {
 
 class World;
diff --git a/src/gui/RenameWindow.cpp b/src/gui/RenameWindow.cpp
index 33516c2d..8c5e9edb 100644
--- a/src/gui/RenameWindow.cpp
+++ b/src/gui/RenameWindow.cpp
@@ -14,8 +14,9 @@
   along with Ingen.  If not, see <http://www.gnu.org/licenses/>.
 */
 
-#include <cassert>
-#include <string>
+#include "RenameWindow.hpp"
+
+#include "App.hpp"
 
 #include "ingen/Forge.hpp"
 #include "ingen/Interface.hpp"
@@ -23,8 +24,7 @@
 #include "ingen/client/ObjectModel.hpp"
 #include "lv2/core/lv2.h"
 
-#include "App.hpp"
-#include "RenameWindow.hpp"
+#include <string>
 
 namespace ingen {
 
diff --git a/src/gui/RenameWindow.hpp b/src/gui/RenameWindow.hpp
index 89d90f26..3b50f04e 100644
--- a/src/gui/RenameWindow.hpp
+++ b/src/gui/RenameWindow.hpp
@@ -17,15 +17,15 @@
 #ifndef INGEN_GUI_RENAMEWINDOW_HPP
 #define INGEN_GUI_RENAMEWINDOW_HPP
 
-#include <gtkmm/builder.h>
-#include <gtkmm/button.h>
-#include <gtkmm/entry.h>
-#include <gtkmm/label.h>
+#include "Window.hpp"
 
 #include "ingen/client/ObjectModel.hpp"
 #include "ingen/types.hpp"
 
-#include "Window.hpp"
+#include <gtkmm/builder.h>
+#include <gtkmm/button.h>
+#include <gtkmm/entry.h>
+#include <gtkmm/label.h>
 
 namespace ingen {
 namespace gui {
diff --git a/src/gui/Style.cpp b/src/gui/Style.cpp
index 3a122e45..81c9da2f 100644
--- a/src/gui/Style.cpp
+++ b/src/gui/Style.cpp
@@ -14,11 +14,10 @@
   along with Ingen.  If not, see <http://www.gnu.org/licenses/>.
 */
 
-#include <cassert>
-#include <cstdlib>
-#include <fstream>
-#include <map>
-#include <string>
+#include "Style.hpp"
+
+#include "App.hpp"
+#include "Port.hpp"
 
 #include "ganv/Port.hpp"
 #include "ingen/Log.hpp"
@@ -26,9 +25,11 @@
 #include "ingen/client/PluginModel.hpp"
 #include "ingen/client/PortModel.hpp"
 
-#include "App.hpp"
-#include "Style.hpp"
-#include "Port.hpp"
+#include <cassert>
+#include <cstdlib>
+#include <fstream>
+#include <map>
+#include <string>
 
 namespace ingen {
 namespace gui {
diff --git a/src/gui/SubgraphModule.cpp b/src/gui/SubgraphModule.cpp
index 9c836644..52c37787 100644
--- a/src/gui/SubgraphModule.cpp
+++ b/src/gui/SubgraphModule.cpp
@@ -14,20 +14,21 @@
   along with Ingen.  If not, see <http://www.gnu.org/licenses/>.
 */
 
-#include <cassert>
-#include <utility>
-
-#include "ingen/Interface.hpp"
-#include "ingen/client/GraphModel.hpp"
+#include "SubgraphModule.hpp"
 
 #include "App.hpp"
 #include "NodeModule.hpp"
 #include "GraphCanvas.hpp"
 #include "GraphWindow.hpp"
 #include "Port.hpp"
-#include "SubgraphModule.hpp"
 #include "WindowFactory.hpp"
 
+#include "ingen/Interface.hpp"
+#include "ingen/client/GraphModel.hpp"
+
+#include <cassert>
+#include <utility>
+
 namespace ingen {
 
 using namespace client;
diff --git a/src/gui/ThreadedLoader.cpp b/src/gui/ThreadedLoader.cpp
index c9d30c31..9d87fba5 100644
--- a/src/gui/ThreadedLoader.cpp
+++ b/src/gui/ThreadedLoader.cpp
@@ -14,16 +14,17 @@
   along with Ingen.  If not, see <http://www.gnu.org/licenses/>.
 */
 
-#include <cassert>
-#include <string>
+#include "ThreadedLoader.hpp"
+
+#include "App.hpp"
 
 #include "ingen/Log.hpp"
 #include "ingen/Module.hpp"
 #include "ingen/World.hpp"
 #include "ingen/client/GraphModel.hpp"
 
-#include "App.hpp"
-#include "ThreadedLoader.hpp"
+#include <cassert>
+#include <string>
 
 using boost::optional;
 
diff --git a/src/gui/ThreadedLoader.hpp b/src/gui/ThreadedLoader.hpp
index 70e13fce..c1e97b6e 100644
--- a/src/gui/ThreadedLoader.hpp
+++ b/src/gui/ThreadedLoader.hpp
@@ -17,27 +17,30 @@
 #ifndef INGEN_GUI_THREADEDLOADER_HPP
 #define INGEN_GUI_THREADEDLOADER_HPP
 
-#include <thread>
-
-#include <cassert>
-#include <list>
-#include <mutex>
-#include <string>
-
-#include <boost/optional.hpp>
-
 #include "ingen/FilePath.hpp"
 #include "ingen/Interface.hpp"
 #include "ingen/Parser.hpp"
 #include "ingen/Serialiser.hpp"
 #include "raul/Semaphore.hpp"
 
+#include <boost/optional/optional.hpp>
+#include <sigc++/sigc++.h>
+
+#include <list>
+#include <mutex>
+#include <thread>
+#include <utility>
+
 namespace ingen {
 
 class URI;
 
+namespace client { class GraphModel; }
+
 namespace gui {
 
+class App;
+
 /** Thread for loading graph files.
  *
  * This is a seperate thread so it can send all the loading message without
diff --git a/src/gui/URIEntry.cpp b/src/gui/URIEntry.cpp
index 0004839f..9d5249e8 100644
--- a/src/gui/URIEntry.cpp
+++ b/src/gui/URIEntry.cpp
@@ -14,11 +14,13 @@
   along with Ingen.  If not, see <http://www.gnu.org/licenses/>.
 */
 
-#include <unordered_map>
+#include "URIEntry.hpp"
 
 #include "App.hpp"
 #include "RDFS.hpp"
-#include "URIEntry.hpp"
+
+#include <map>
+#include <utility>
 
 namespace ingen {
 namespace gui {
diff --git a/src/gui/URIEntry.hpp b/src/gui/URIEntry.hpp
index 247c4a6d..535f0805 100644
--- a/src/gui/URIEntry.hpp
+++ b/src/gui/URIEntry.hpp
@@ -17,12 +17,16 @@
 #ifndef INGEN_GUI_URI_ENTRY_HPP
 #define INGEN_GUI_URI_ENTRY_HPP
 
+#include "ingen/URI.hpp"
+#include "lilv/lilv.h"
+
 #include <gtkmm/box.h>
 #include <gtkmm/button.h>
 #include <gtkmm/entry.h>
 #include <gtkmm/menu.h>
 
-#include "lilv/lilv.h"
+#include <set>
+#include <string>
 
 namespace ingen {
 namespace gui {
diff --git a/src/gui/WidgetFactory.cpp b/src/gui/WidgetFactory.cpp
index a2a83a6f..3a71425d 100644
--- a/src/gui/WidgetFactory.cpp
+++ b/src/gui/WidgetFactory.cpp
@@ -14,13 +14,15 @@
   along with Ingen.  If not, see <http://www.gnu.org/licenses/>.
 */
 
-#include <fstream>
-#include <string>
+#include "WidgetFactory.hpp"
 
 #include "ingen/Log.hpp"
 #include "ingen/runtime_paths.hpp"
 
-#include "WidgetFactory.hpp"
+#include <cstdlib>
+#include <fstream>
+#include <stdexcept>
+#include <string>
 
 namespace ingen {
 namespace gui {
diff --git a/src/gui/WidgetFactory.hpp b/src/gui/WidgetFactory.hpp
index e640e2a7..0a9ea4c3 100644
--- a/src/gui/WidgetFactory.hpp
+++ b/src/gui/WidgetFactory.hpp
@@ -17,10 +17,13 @@
 #ifndef INGEN_GUI_GLADEFACTORY_HPP
 #define INGEN_GUI_GLADEFACTORY_HPP
 
+#include <glibmm/refptr.h>
+#include <glibmm/ustring.h>
+#include <gtkmm/builder.h>
+
 #include <string>
 
-#include <glibmm.h>
-#include <gtkmm/builder.h>
+namespace Gtk { class Builder; }
 
 namespace ingen {
 namespace gui {
diff --git a/src/gui/Window.hpp b/src/gui/Window.hpp
index 5f839578..5f49bc10 100644
--- a/src/gui/Window.hpp
+++ b/src/gui/Window.hpp
@@ -17,6 +17,7 @@
 #ifndef INGEN_GUI_WINDOW_HPP
 #define INGEN_GUI_WINDOW_HPP
 
+#include <gdk/gdkkeysyms.h>
 #include <gtkmm/dialog.h>
 #include <gtkmm/window.h>
 
diff --git a/src/gui/WindowFactory.cpp b/src/gui/WindowFactory.cpp
index 06c8266a..d85987f0 100644
--- a/src/gui/WindowFactory.cpp
+++ b/src/gui/WindowFactory.cpp
@@ -14,12 +14,6 @@
   along with Ingen.  If not, see <http://www.gnu.org/licenses/>.
 */
 
-#include <stdexcept>
-#include <string>
-
-#include "ingen/Log.hpp"
-#include "ingen/client/GraphModel.hpp"
-
 #include "App.hpp"
 #include "LoadGraphWindow.hpp"
 #include "LoadPluginWindow.hpp"
@@ -31,6 +25,14 @@
 #include "WidgetFactory.hpp"
 #include "WindowFactory.hpp"
 
+#include "ingen/Log.hpp"
+#include "ingen/client/GraphModel.hpp"
+
+#include <cassert>
+#include <stdexcept>
+#include <string>
+#include <utility>
+
 namespace ingen {
 
 using namespace client;
diff --git a/src/gui/WindowFactory.hpp b/src/gui/WindowFactory.hpp
index 4e71c7cf..1b6201af 100644
--- a/src/gui/WindowFactory.hpp
+++ b/src/gui/WindowFactory.hpp
@@ -17,11 +17,12 @@
 #ifndef INGEN_GUI_WINDOWFACTORY_HPP
 #define INGEN_GUI_WINDOWFACTORY_HPP
 
-#include <map>
-
 #include "ingen/Node.hpp"
 #include "ingen/types.hpp"
 
+#include <cstddef>
+#include <map>
+
 namespace ingen {
 
 namespace client {
diff --git a/src/gui/ingen_gui_lv2.cpp b/src/gui/ingen_gui_lv2.cpp
index f89e0436..4817e9ae 100644
--- a/src/gui/ingen_gui_lv2.cpp
+++ b/src/gui/ingen_gui_lv2.cpp
@@ -14,20 +14,37 @@
   along with Ingen.  If not, see <http://www.gnu.org/licenses/>.
 */
 
+#include "App.hpp"
+#include "GraphBox.hpp"
+
 #include "ingen/AtomReader.hpp"
 #include "ingen/AtomSink.hpp"
 #include "ingen/AtomWriter.hpp"
+#include "ingen/Forge.hpp"
+#include "ingen/Interface.hpp"
+#include "ingen/Properties.hpp"
+#include "ingen/URI.hpp"
+#include "ingen/URIs.hpp"
 #include "ingen/World.hpp"
 #include "ingen/client/ClientStore.hpp"
 #include "ingen/client/GraphModel.hpp"
 #include "ingen/client/SigClientInterface.hpp"
 #include "ingen/ingen.h"
+#include "ingen/paths.hpp"
 #include "ingen/runtime_paths.hpp"
 #include "ingen/types.hpp"
+#include "lv2/atom/atom.h"
+#include "lv2/atom/util.h"
+#include "lv2/core/lv2.h"
+#include "lv2/core/lv2.h"
+#include "lv2/log/log.h"
 #include "lv2/ui/ui.h"
+#include "lv2/urid/urid.h"
+#include "lv2/urid/urid.h"
+#include "raul/Path.hpp"
 
-#include "App.hpp"
-#include "GraphBox.hpp"
+#include <cstdint>
+#include <cstring>
 
 #define INGEN_LV2_UI_URI INGEN_NS "GraphUIGtk2"