4 files changed, 9 insertions, 7 deletions
diff --git a/src/engine/Engine.cpp b/src/engine/Engine.cpp
index 4d984916..691f789a 100644
--- a/src/engine/Engine.cpp
+++ b/src/engine/Engine.cpp
@@ -22,6 +22,9 @@
 #include "raul/Deletable.hpp"
 #include "raul/Maid.hpp"
 #include "raul/SharedPtr.hpp"
+#include "common/interface/EventType.hpp"
+#include "events/CreatePatchEvent.hpp"
+#include "module/World.hpp"
 #include "AudioDriver.hpp"
 #include "ClientBroadcaster.hpp"
 #include "Engine.hpp"	
@@ -38,8 +41,6 @@
 #include "ProcessSlave.hpp"
 #include "QueuedEventSource.hpp"
 #include "ThreadManager.hpp"
-#include "common/interface/EventType.hpp"
-#include "events/CreatePatchEvent.hpp"
 #include "shared/Store.hpp"
 #include "tuning.hpp"
 using namespace std;
diff --git a/src/engine/InternalPlugin.hpp b/src/engine/InternalPlugin.hpp
index 095899eb..5ae908db 100644
--- a/src/engine/InternalPlugin.hpp
+++ b/src/engine/InternalPlugin.hpp
@@ -30,7 +30,6 @@
 #include <dlfcn.h>
 #include <string>
 #include <iostream>
-#include "slv2/slv2.h"
 #include "PluginImpl.hpp"
 
 #define NS_INGEN "http://drobilla.net/ns/ingen#"
diff --git a/src/engine/NodeFactory.hpp b/src/engine/NodeFactory.hpp
index d94fc84d..08b212fa 100644
--- a/src/engine/NodeFactory.hpp
+++ b/src/engine/NodeFactory.hpp
@@ -26,10 +26,6 @@
 #include <string>
 #include <pthread.h>
 #include <glibmm/module.h>
-#ifdef HAVE_SLV2
-#include "slv2/slv2.h"
-#include "LV2Info.hpp"
-#endif
 
 using std::string;
 
@@ -38,6 +34,9 @@ namespace Ingen {
 class NodeImpl;
 class PatchImpl;
 class PluginImpl;
+#ifdef HAVE_SLV2
+class LV2Info;
+#endif
 
 
 /** Loads plugins and creates Nodes from them.
diff --git a/src/engine/events/SetPortValueEvent.cpp b/src/engine/events/SetPortValueEvent.cpp
index cd3808dd..48813c72 100644
--- a/src/engine/events/SetPortValueEvent.cpp
+++ b/src/engine/events/SetPortValueEvent.cpp
@@ -17,6 +17,9 @@
 
 #include <sstream>
 #include "lv2ext/lv2_event.h"
+#include "shared/LV2URIMap.hpp"
+#include "shared/LV2Features.hpp"
+#include "module/World.hpp"
 #include "Responder.hpp"
 #include "SetPortValueEvent.hpp"
 #include "Engine.hpp"