3 files changed, 19 insertions, 3 deletions
diff --git a/src/libs/module/Makefile.am b/src/libs/module/Makefile.am
index a4b22986..31a327da 100644
--- a/src/libs/module/Makefile.am
+++ b/src/libs/module/Makefile.am
@@ -1,8 +1,19 @@
 noinst_LTLIBRARIES = libingen_module.la
 
-libingen_module_la_CXXFLAGS = @GLIBMM_CFLAGS@ @REDLANDMM_CFLAGS@ @RAUL_CFLAGS@ @SLV2_CFLAGS@ -DINGEN_MODULE_DIR=\"$(libdir)/ingen\"
+libingen_module_la_CXXFLAGS = \
+	@INGEN_CFLAGS@ \
+	@GLIBMM_CFLAGS@ \
+	@REDLANDMM_CFLAGS@ \
+	@RAUL_CFLAGS@ \
+	@SLV2_CFLAGS@ \
+	-DINGEN_MODULE_DIR=\"$(libdir)/ingen\"
 
-libingen_module_la_LIBADD = @GLIBMM_LIBS@ @REDLANDMM_LIBS@ @RAUL_LIBS@ @SLV2_LIBS@
+libingen_module_la_LIBADD = \
+	../shared/libingen_shared.la \
+	@GLIBMM_LIBS@ \
+	@REDLANDMM_LIBS@ \
+	@RAUL_LIBS@ \
+	@SLV2_LIBS@
 
 libingen_module_la_SOURCES = \
 	global.hpp \
diff --git a/src/libs/module/World.hpp b/src/libs/module/World.hpp
index b61fe2af..a1ca9a68 100644
--- a/src/libs/module/World.hpp
+++ b/src/libs/module/World.hpp
@@ -24,6 +24,7 @@
 #include <glibmm/module.h>
 #include <raul/SharedPtr.hpp>
 #include <redlandmm/World.hpp>
+#include "shared/LV2Features.hpp"
 
 #ifdef HAVE_SLV2
 #include <slv2/slv2.h>
@@ -50,8 +51,10 @@ class EngineInterface;
  */
 struct World {
 #ifdef HAVE_SLV2
-	SLV2World slv2_world;
+	SLV2World    slv2_world;
+	LV2Features* lv2_features;
 #endif
+
 	Redland::World* rdf_world;
 
     EngineInterface* engine;
diff --git a/src/libs/module/global.cpp b/src/libs/module/global.cpp
index 6cd54685..21c36575 100644
--- a/src/libs/module/global.cpp
+++ b/src/libs/module/global.cpp
@@ -47,6 +47,7 @@ get_world()
         world->rdf_world = new Redland::World();
 #ifdef HAVE_SLV2
 		world->slv2_world = slv2_world_new_using_rdf_world(world->rdf_world->world());
+		world->lv2_features = new LV2Features();
 		slv2_world_load_all(world->slv2_world);
 #endif
 		world->engine = NULL;
@@ -68,6 +69,7 @@ destroy_world()
 	if (world) {
 #ifdef HAVE_SLV2
 		slv2_world_free(world->slv2_world);
+		delete world->lv2_features;
 #endif
         delete world->rdf_world;
 		delete world;