4 files changed, 30 insertions, 23 deletions
diff --git a/src/gui/App.cpp b/src/gui/App.cpp
index 8e234031..1063ec39 100644
--- a/src/gui/App.cpp
+++ b/src/gui/App.cpp
@@ -15,40 +15,44 @@
  * 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
-#include "App.hpp"
 #include <cassert>
 #include <string>
 #include <fstream>
-#include <libgnomecanvasmm.h>
-#include <gtk/gtkwindow.h>
 #include <time.h>
 #include <sys/time.h>
-#include "raul/log.hpp"
-#include "raul/Path.hpp"
-#include "lilv/lilv.h"
+
+#include <libgnomecanvasmm.h>
+#include <gtk/gtkwindow.h>
+
 #include "flowcanvas/Connection.hpp"
-#include "shared/World.hpp"
-#include "server/Engine.hpp"
 #include "ingen/ServerInterface.hpp"
-#include "shared/runtime_paths.hpp"
-#include "shared/LV2URIMap.hpp"
+#include "ingen/client/ClientStore.hpp"
 #include "ingen/client/ObjectModel.hpp"
 #include "ingen/client/PatchModel.hpp"
-#include "ingen/client/ClientStore.hpp"
 #include "ingen/client/SigClientInterface.hpp"
-#include "NodeModule.hpp"
+#include "ingen/shared/runtime_paths.hpp"
+#include "lilv/lilv.h"
+#include "raul/Path.hpp"
+#include "raul/log.hpp"
+
+#include "server/Engine.hpp"
+#include "shared/LV2URIMap.hpp"
+#include "shared/World.hpp"
+
+#include "App.hpp"
+#include "Configuration.hpp"
+#include "ConnectWindow.hpp"
 #include "ControlPanel.hpp"
-#include "SubpatchModule.hpp"
 #include "LoadPluginWindow.hpp"
-#include "PatchWindow.hpp"
 #include "MessagesWindow.hpp"
-#include "WidgetFactory.hpp"
+#include "NodeModule.hpp"
 #include "PatchTreeWindow.hpp"
-#include "Configuration.hpp"
-#include "ConnectWindow.hpp"
+#include "PatchWindow.hpp"
+#include "Port.hpp"
+#include "SubpatchModule.hpp"
 #include "ThreadedLoader.hpp"
+#include "WidgetFactory.hpp"
 #include "WindowFactory.hpp"
-#include "Port.hpp"
 
 #define LOG(s) s << "[GUI] "
 
diff --git a/src/gui/LoadPatchWindow.cpp b/src/gui/LoadPatchWindow.cpp
index 1d4cb7c8..33363f0d 100644
--- a/src/gui/LoadPatchWindow.cpp
+++ b/src/gui/LoadPatchWindow.cpp
@@ -25,7 +25,7 @@
 #include "ingen/client/NodeModel.hpp"
 #include "ingen/client/PatchModel.hpp"
 #include "ingen/client/ClientStore.hpp"
-#include "shared/runtime_paths.hpp"
+#include "ingen/shared/runtime_paths.hpp"
 #include "App.hpp"
 #include "LoadPatchWindow.hpp"
 #include "PatchView.hpp"
diff --git a/src/gui/PatchCanvas.cpp b/src/gui/PatchCanvas.cpp
index befb706d..dba64490 100644
--- a/src/gui/PatchCanvas.cpp
+++ b/src/gui/PatchCanvas.cpp
@@ -24,8 +24,8 @@
 #include "flowcanvas/Ellipse.hpp"
 #include "ingen/ServerInterface.hpp"
 #include "shared/LV2URIMap.hpp"
-#include "shared/Builder.hpp"
-#include "shared/ClashAvoider.hpp"
+#include "ingen/shared/Builder.hpp"
+#include "ingen/shared/ClashAvoider.hpp"
 #include "ingen/serialisation/Serialiser.hpp"
 #include "ingen/client/PluginModel.hpp"
 #include "ingen/client/PatchModel.hpp"
diff --git a/src/gui/WidgetFactory.cpp b/src/gui/WidgetFactory.cpp
index 68582fd3..f489d1db 100644
--- a/src/gui/WidgetFactory.cpp
+++ b/src/gui/WidgetFactory.cpp
@@ -15,10 +15,13 @@
  * 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
-#include "WidgetFactory.hpp"
 #include <fstream>
+
 #include "raul/log.hpp"
-#include "shared/runtime_paths.hpp"
+
+#include "ingen/shared/runtime_paths.hpp"
+
+#include "WidgetFactory.hpp"
 
 using namespace std;
 using namespace Raul;