4 files changed, 8 insertions, 23 deletions
diff --git a/src/shared/LV2Features.cpp b/src/shared/LV2Features.cpp
index 1bfd3936..24b3f6fa 100644
--- a/src/shared/LV2Features.cpp
+++ b/src/shared/LV2Features.cpp
@@ -17,7 +17,6 @@
 #include <cstdlib>
 
 #include "ingen/shared/LV2Features.hpp"
-#include "ingen/shared/URIMap.hpp"
 
 using namespace std;
 
diff --git a/src/shared/URIMap.cpp b/src/shared/URIMap.cpp
index e8c7fbbc..be99db99 100644
--- a/src/shared/URIMap.cpp
+++ b/src/shared/URIMap.cpp
@@ -14,18 +14,11 @@
   along with Ingen.  If not, see <http://www.gnu.org/licenses/>.
 */
 
-#define __STDC_LIMIT_MACROS 1
-
-#include <assert.h>
 #include <stdint.h>
 
 #include <glib.h>
 
-#include <boost/shared_ptr.hpp>
-
 #include "ingen/shared/URIMap.hpp"
-#include "lv2/lv2plug.in/ns/ext/atom/atom.h"
-#include "raul/log.hpp"
 
 using namespace std;
 
diff --git a/src/shared/URIs.cpp b/src/shared/URIs.cpp
index 2c44c826..277946d5 100644
--- a/src/shared/URIs.cpp
+++ b/src/shared/URIs.cpp
@@ -14,24 +14,12 @@
   along with Ingen.  If not, see <http://www.gnu.org/licenses/>.
 */
 
-#define __STDC_LIMIT_MACROS 1
-
-#include <assert.h>
-#include <stdint.h>
-
-#include <glib.h>
-
-#include <boost/shared_ptr.hpp>
-
 #include "ingen/shared/URIMap.hpp"
 #include "ingen/shared/URIs.hpp"
 #include "lv2/lv2plug.in/ns/ext/atom/atom.h"
 #include "lv2/lv2plug.in/ns/ext/midi/midi.h"
 #include "lv2/lv2plug.in/ns/ext/patch/patch.h"
 #include "lv2/lv2plug.in/ns/lv2core/lv2.h"
-#include "raul/log.hpp"
-
-using namespace std;
 
 namespace Ingen {
 namespace Shared {
diff --git a/src/shared/World.cpp b/src/shared/World.cpp
index 608a8409..05a941e9 100644
--- a/src/shared/World.cpp
+++ b/src/shared/World.cpp
@@ -21,8 +21,6 @@
 #include <glibmm/miscutils.h>
 #include <glibmm/module.h>
 
-#include "ingen/EngineBase.hpp"
-#include "ingen/Interface.hpp"
 #include "ingen/shared/Configuration.hpp"
 #include "ingen/shared/LV2Features.hpp"
 #include "ingen/shared/Module.hpp"
@@ -31,7 +29,6 @@
 #include "ingen/shared/World.hpp"
 #include "ingen/shared/runtime_paths.hpp"
 #include "lilv/lilv.h"
-#include "raul/Atom.hpp"
 #include "raul/log.hpp"
 #include "sord/sordmm.hpp"
 
@@ -40,8 +37,16 @@
 using namespace std;
 
 namespace Ingen {
+
+class EngineBase;
+class Interface;
+
+namespace Serialisation { class Parser; class Serialiser; }
+
 namespace Shared {
 
+class Store;
+
 /** Load a dynamic module from the default path.
  *
  * This will check in the directories specified in the environment variable