Remove use of ingen-config.h in soon-to-be-public headers.

Make Lilv dependency mandatory.
Reduce dependency on ingen-config.h.


git-svn-id: http://svn.drobilla.net/lad/trunk/ingen@3316 a436a847-0d15-0410-975c-d299462d15a1

24 files changed, 44 insertions, 142 deletions

diff --git a/src/client/NodeModel.cpp b/src/client/NodeModel.cpp
index 39ce7c8d..8adbfe90 100644
--- a/src/client/NodeModel.cpp
+++ b/src/client/NodeModel.cpp
@@ -17,7 +17,7 @@
 
 #include <cassert>
 #include <cmath>
-#include "ingen-config.h"
+
 #include "ingen/Port.hpp"
 #include "shared/World.hpp"
 #include "shared/LV2URIMap.hpp"
@@ -174,9 +174,7 @@ NodeModel::default_port_value_range(SharedPtr<const PortModel> port,
 	max = 1.0;
 
 	// Get range from client-side LV2 data
-#ifdef HAVE_LILV
 	if (_plugin && _plugin->type() == PluginModel::LV2) {
-
 		if (!_min_values) {
 			_num_values = lilv_plugin_get_num_ports(_plugin->lilv_plugin());
 			_min_values = new float[_num_values];
@@ -190,7 +188,6 @@ NodeModel::default_port_value_range(SharedPtr<const PortModel> port,
 		if (!std::isnan(_max_values[port->index()]))
 			max = _max_values[port->index()];
 	}
-#endif
 }
 
 void
@@ -220,7 +217,6 @@ NodeModel::port_label(SharedPtr<const PortModel> port) const
 		return name.get_string();
 	}
 
-#ifdef HAVE_LILV
 	if (_plugin && _plugin->type() == PluginModel::LV2) {
 		LilvWorld*        c_world  = _plugin->lilv_world();
 		const LilvPlugin* c_plugin = _plugin->lilv_plugin();
@@ -236,7 +232,6 @@ NodeModel::port_label(SharedPtr<const PortModel> port) const
 			lilv_node_free(c_name);
 		}
 	}
-#endif
 
 	return port->symbol().c_str();
 }
diff --git a/src/client/PluginModel.cpp b/src/client/PluginModel.cpp
index 3f0bf735..59f68caa 100644
--- a/src/client/PluginModel.cpp
+++ b/src/client/PluginModel.cpp
@@ -27,18 +27,14 @@
 #include "PluginUI.hpp"
 #include "shared/LV2URIMap.hpp"
 
-#include "ingen-config.h"
-
 using namespace std;
 using namespace Raul;
 
 namespace Ingen {
 namespace Client {
 
-#ifdef HAVE_LILV
 LilvWorld*         PluginModel::_lilv_world   = NULL;
 const LilvPlugins* PluginModel::_lilv_plugins = NULL;
-#endif
 
 Sord::World* PluginModel::_rdf_world = NULL;
 
@@ -51,11 +47,10 @@ PluginModel::PluginModel(Shared::LV2URIMap& uris,
 
 	assert(_rdf_world);
 	add_property("http://www.w3.org/1999/02/22-rdf-syntax-ns#type", this->type_uri());
-#ifdef HAVE_LILV
 	LilvNode* plugin_uri = lilv_new_uri(_lilv_world, uri.c_str());
 	_lilv_plugin = lilv_plugins_get_by_uri(_lilv_plugins, plugin_uri);
 	lilv_node_free(plugin_uri);
-#endif
+
 	if (_type == Internal)
 		set_property("http://usefulinc.com/ns/doap#name",
 				Atom(uri.substr(uri.find_last_of('#') + 1).c_str()));
@@ -97,7 +92,6 @@ PluginModel::get_property(const URI& key) const
 		return get_property(key);
 	}
 
-#ifdef HAVE_LILV
 	if (_lilv_plugin) {
 		boost::optional<Raul::Atom&> ret;
 		LilvNode*  lv2_pred = lilv_new_uri(_lilv_world, key.str().c_str());
@@ -124,7 +118,6 @@ PluginModel::get_property(const URI& key) const
 		if (ret)
 			return *ret;
 	}
-#endif
 
 	return nil;
 }
@@ -134,11 +127,9 @@ PluginModel::set(SharedPtr<PluginModel> p)
 {
 	_type = p->_type;
 
-#ifdef HAVE_LILV
 	_icon_path = p->_icon_path;
 	if (p->_lilv_plugin)
 		_lilv_plugin = p->_lilv_plugin;
-#endif
 
 	for (Properties::const_iterator v = p->properties().begin(); v != p->properties().end(); ++v) {
 		ResourceImpl::set_property(v->first, v->second);
@@ -171,7 +162,6 @@ PluginModel::human_name() const
 string
 PluginModel::port_human_name(uint32_t index) const
 {
-#ifdef HAVE_LILV
 	if (_lilv_plugin) {
 		const LilvPort* port = lilv_plugin_get_port_by_index(_lilv_plugin, index);
 		LilvNode*      name = lilv_port_get_name(_lilv_plugin, port);
@@ -179,11 +169,9 @@ PluginModel::port_human_name(uint32_t index) const
 		lilv_node_free(name);
 		return ret;
 	}
-#endif
 	return "";
 }
 
-#ifdef HAVE_LILV
 bool
 PluginModel::has_ui() const
 {
@@ -191,6 +179,7 @@ PluginModel::has_ui() const
 	const bool ret = (lilv_nodes_size(uis) > 0);
 	lilv_uis_free(uis);
 	return ret;
+
 }
 
 SharedPtr<PluginUI>
@@ -200,8 +189,7 @@ PluginModel::ui(Ingen::Shared::World*      world,
 	if (_type != LV2)
 		return SharedPtr<PluginUI>();
 
-	SharedPtr<PluginUI> ret = PluginUI::create(world, node, _lilv_plugin);
-	return ret;
+	return PluginUI::create(world, node, _lilv_plugin);
 }
 
 const string&
@@ -234,13 +222,11 @@ PluginModel::get_lv2_icon_path(const LilvPlugin* plugin)
 	lilv_node_free(svg_icon_pred);
 	return result;
 }
-#endif
 
 std::string
 PluginModel::documentation() const
 {
 	std::string doc;
-	#ifdef HAVE_LILV
 	if (!_lilv_plugin)
 		return doc;
 
@@ -257,7 +243,7 @@ PluginModel::documentation() const
 	}
 	lilv_node_free(rdfs_comment);
 	lilv_nodes_free(vals);
-	#endif
+
 	return doc;
 }
 
@@ -265,7 +251,7 @@ std::string
 PluginModel::port_documentation(uint32_t index) const
 {
 	std::string doc;
-	#ifdef HAVE_LILV
+
 	if (!_lilv_plugin)
 		return doc;
 
@@ -285,9 +271,22 @@ PluginModel::port_documentation(uint32_t index) const
 	}
 	lilv_node_free(rdfs_comment);
 	lilv_nodes_free(vals);
-	#endif
 	return doc;
 }
 
+const LilvPort*
+PluginModel::lilv_port(uint32_t index) const
+{
+	return lilv_plugin_get_port_by_index(_lilv_plugin, index);
+}
+
+void
+PluginModel::set_lilv_world(LilvWorld* world)
+{
+	_lilv_world   = world;
+	_lilv_plugins = lilv_world_get_all_plugins(_lilv_world);
+}
+
+
 } // namespace Client
 } // namespace Ingen
diff --git a/src/client/PluginModel.hpp b/src/client/PluginModel.hpp
index 852a554d..c76960fe 100644
--- a/src/client/PluginModel.hpp
+++ b/src/client/PluginModel.hpp
@@ -18,16 +18,11 @@
 #ifndef INGEN_CLIENT_PLUGINMODEL_HPP
 #define INGEN_CLIENT_PLUGINMODEL_HPP
 
+#include "lilv/lilv.h"
 #include "raul/SharedPtr.hpp"
 #include "raul/Symbol.hpp"
-
 #include "sord/sordmm.hpp"
 
-#include "ingen-config.h"
-
-#ifdef HAVE_LILV
-#include "lilv/lilv.h"
-#endif
 #include "ingen/ServerInterface.hpp"
 #include "ingen/Plugin.hpp"
 #include "shared/World.hpp"
@@ -66,18 +61,12 @@ public:
 	std::string  human_name() const;
 	std::string  port_human_name(uint32_t index) const;
 
-#ifdef HAVE_LILV
 	static LilvWorld* lilv_world()        { return _lilv_world; }
 	const LilvPlugin* lilv_plugin() const { return _lilv_plugin; }
 
-	const LilvPort* lilv_port(uint32_t index) {
-		return lilv_plugin_get_port_by_index(_lilv_plugin, index);
-	}
+	const LilvPort* lilv_port(uint32_t index) const;
 
-	static void set_lilv_world(LilvWorld* world) {
-		_lilv_world = world;
-		_lilv_plugins = lilv_world_get_all_plugins(_lilv_world);
-	}
+	static void set_lilv_world(LilvWorld* world);
 
 	bool has_ui() const;
 
@@ -86,7 +75,6 @@ public:
 
 	const std::string& icon_path() const;
 	static std::string get_lv2_icon_path(const LilvPlugin* plugin);
-#endif
 
 	std::string documentation() const;
 	std::string port_documentation(uint32_t index) const;
@@ -108,13 +96,11 @@ protected:
 private:
 	Type _type;
 
-#ifdef HAVE_LILV
 	static LilvWorld*         _lilv_world;
 	static const LilvPlugins* _lilv_plugins;
 
 	const LilvPlugin*   _lilv_plugin;
 	mutable std::string _icon_path;
-#endif
 
 	static Sord::World* _rdf_world;
 };
diff --git a/src/gui/App.cpp b/src/gui/App.cpp
index 99e0ee42..9d7fffc1 100644
--- a/src/gui/App.cpp
+++ b/src/gui/App.cpp
@@ -15,7 +15,6 @@
  * 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
-#include "ingen-config.h"
 #include "App.hpp"
 #include <cassert>
 #include <string>
@@ -26,6 +25,7 @@
 #include <sys/time.h>
 #include "raul/log.hpp"
 #include "raul/Path.hpp"
+#include "lilv/lilv.h"
 #include "flowcanvas/Connection.hpp"
 #include "shared/World.hpp"
 #include "server/Engine.hpp"
@@ -49,9 +49,6 @@
 #include "ThreadedLoader.hpp"
 #include "WindowFactory.hpp"
 #include "Port.hpp"
-#ifdef HAVE_LILV
-#include "lilv/lilv.h"
-#endif
 
 using namespace std;
 using namespace Raul;
@@ -89,10 +86,7 @@ App::App(Ingen::Shared::World* world)
 	_about_dialog->property_logo_icon_name() = "ingen";
 
 	PluginModel::set_rdf_world(*world->rdf_world());
-
-#ifdef HAVE_LILV
 	PluginModel::set_lilv_world(world->lilv_world());
-#endif
 }
 
 App::~App()
diff --git a/src/gui/ConnectWindow.hpp b/src/gui/ConnectWindow.hpp
index 44d4c925..65ff11a2 100644
--- a/src/gui/ConnectWindow.hpp
+++ b/src/gui/ConnectWindow.hpp
@@ -18,14 +18,9 @@
 #ifndef INGEN_GUI_CONNECTWINDOW_HPP
 #define INGEN_GUI_CONNECTWINDOW_HPP
 
-#include "ingen-config.h"
-
-#ifdef HAVE_LILV
-#include "lilv/lilv.h"
-#endif
-
 #include <gtkmm.h>
 
+#include "lilv/lilv.h"
 #include "raul/SharedPtr.hpp"
 
 #include "Window.hpp"
diff --git a/src/gui/NodeMenu.cpp b/src/gui/NodeMenu.cpp
index 87ad5030..e1d59f8f 100644
--- a/src/gui/NodeMenu.cpp
+++ b/src/gui/NodeMenu.cpp
@@ -16,7 +16,6 @@
  */
 
 #include <gtkmm.h>
-#include "ingen-config.h"
 #include "ingen/ServerInterface.hpp"
 #include "shared/LV2URIMap.hpp"
 #include "client/NodeModel.hpp"
@@ -86,7 +85,6 @@ NodeMenu::init(SharedPtr<const NodeModel> node)
 		_embed_gui_menuitem->hide();
 	}
 
-#ifdef HAVE_LILV
 	if (plugin && plugin->type() == PluginModel::LV2) {
 		LilvNode* preset_pred = lilv_new_uri(
 			plugin->lilv_world(),
@@ -130,7 +128,6 @@ NodeMenu::init(SharedPtr<const NodeModel> node)
 		lilv_node_free(title_pred);
 		lilv_node_free(preset_pred);
 	}
-#endif
 
 	if (has_control_inputs())
 		_randomize_menuitem->show();
@@ -180,7 +177,6 @@ NodeMenu::on_menu_disconnect()
 void
 NodeMenu::on_preset_activated(const std::string& uri)
 {
-#ifdef HAVE_LILV
 	const NodeModel* const   node   = (NodeModel*)_object.get();
 	const PluginModel* const plugin = dynamic_cast<const PluginModel*>(node->plugin());
 
@@ -220,7 +216,6 @@ NodeMenu::on_preset_activated(const std::string& uri)
 	lilv_node_free(value_pred);
 	lilv_node_free(symbol_pred);
 	lilv_node_free(port_pred);
-#endif
 }
 
 bool
diff --git a/src/gui/NodeModule.cpp b/src/gui/NodeModule.cpp
index d65ae217..c4d75519 100644
--- a/src/gui/NodeModule.cpp
+++ b/src/gui/NodeModule.cpp
@@ -16,7 +16,6 @@
  */
 
 #include <cassert>
-#include "ingen-config.h"
 #include "raul/log.hpp"
 #include "raul/Atom.hpp"
 #include "ingen/ServerInterface.hpp"
@@ -291,7 +290,6 @@ NodeModule::remove_port(SharedPtr<const PortModel> model)
 bool
 NodeModule::popup_gui()
 {
-#ifdef HAVE_LILV
 	if (_node->plugin() && _node->plugin()->type() == PluginModel::LV2) {
 		if (_plugin_ui) {
 			warn << "LV2 GUI already embedded, cannot pop up" << endl;
@@ -323,7 +321,7 @@ NodeModule::popup_gui()
 			warn << "No LV2 GUI for " << _node->path().chop_scheme() << endl;
 		}
 	}
-#endif
+
 	return false;
 }
 
diff --git a/src/gui/PatchCanvas.cpp b/src/gui/PatchCanvas.cpp
index 6da4eb93..a994662d 100644
--- a/src/gui/PatchCanvas.cpp
+++ b/src/gui/PatchCanvas.cpp
@@ -45,7 +45,6 @@
 #include "WidgetFactory.hpp"
 #include "WindowFactory.hpp"
 #include "ThreadedLoader.hpp"
-#include "ingen-config.h"
 
 #define LOG(s) s << "[PatchCanvas] "
 
@@ -167,7 +166,6 @@ PatchCanvas::build_menus()
 	}
 
 	// Build skeleton LV2 plugin class heirarchy for 'Plugin' menu
-#ifdef HAVE_LILV
 	if (!_plugin_menu)
 		build_plugin_menu();
 
@@ -181,7 +179,6 @@ PatchCanvas::build_menus()
 		classless_menu_item->set_submenu(*_classless_menu);
 		_classless_menu->hide();
 	}
-#endif
 
 	// Add known plugins to menu heirarchy
 	SharedPtr<const ClientStore::Plugins> plugins = App::instance().store()->plugins();
@@ -189,8 +186,6 @@ PatchCanvas::build_menus()
 		add_plugin(i->second);
 }
 
-#ifdef HAVE_LILV
-
 /** Recursively build the plugin class menu heirarchy rooted at
  * @a plugin class into @a menu
  */
@@ -277,8 +272,6 @@ PatchCanvas::build_plugin_menu()
 	build_plugin_class_menu(_plugin_menu, lv2_plugin, classes, children, ancestors);
 }
 
-#endif
-
 void
 PatchCanvas::build()
 {
diff --git a/src/gui/PatchCanvas.hpp b/src/gui/PatchCanvas.hpp
index d5f30b49..1f831624 100644
--- a/src/gui/PatchCanvas.hpp
+++ b/src/gui/PatchCanvas.hpp
@@ -21,12 +21,16 @@
 #include <string>
 #include <map>
 #include <set>
+
 #include <boost/shared_ptr.hpp>
-#include "ingen-config.h"
+
+#include "lilv/lilv.h"
+
 #include "flowcanvas/Canvas.hpp"
 #include "flowcanvas/Module.hpp"
 #include "raul/SharedPtr.hpp"
 #include "raul/Path.hpp"
+
 #include "client/ConnectionModel.hpp"
 #include "ingen/GraphObject.hpp"
 #include "NodeModule.hpp"
@@ -110,7 +114,6 @@ private:
 
     void auto_menu_position(int& x, int& y, bool& push_in);
 
-#ifdef HAVE_LILV
 	typedef std::multimap<const std::string, const LilvPluginClass*> LV2Children;
 	void build_plugin_menu();
 	size_t build_plugin_class_menu(
@@ -119,7 +122,6 @@ private:
 			const LilvPluginClasses* classes,
 			const LV2Children&       children,
 			std::set<const char*>&   ancestors);
-#endif
 
 	GraphObject::Properties get_initial_data();
 
diff --git a/src/gui/WidgetFactory.cpp b/src/gui/WidgetFactory.cpp
index 9579a1e1..68582fd3 100644
--- a/src/gui/WidgetFactory.cpp
+++ b/src/gui/WidgetFactory.cpp
@@ -18,7 +18,6 @@
 #include "WidgetFactory.hpp"
 #include <fstream>
 #include "raul/log.hpp"
-#include "ingen-config.h"
 #include "shared/runtime_paths.hpp"
 
 using namespace std;
diff --git a/src/server/AudioBuffer.cpp b/src/server/AudioBuffer.cpp
index f255ec2f..27b78cfb 100644
--- a/src/server/AudioBuffer.cpp
+++ b/src/server/AudioBuffer.cpp
@@ -20,7 +20,6 @@
 #include "raul/log.hpp"
 #include "raul/SharedPtr.hpp"
 #include "lv2/lv2plug.in/ns/ext/atom/atom.h"
-#include "ingen-config.h"
 #include "AudioBuffer.hpp"
 #include "ProcessContext.hpp"
 #include "LV2Features.hpp"
diff --git a/src/server/InternalPlugin.hpp b/src/server/InternalPlugin.hpp
index be1df1d0..1b0de55b 100644
--- a/src/server/InternalPlugin.hpp
+++ b/src/server/InternalPlugin.hpp
@@ -18,8 +18,6 @@
 #ifndef INGEN_ENGINE_INTERNALPLUGIN_HPP
 #define INGEN_ENGINE_INTERNALPLUGIN_HPP
 
-#include "ingen-config.h"
-
 #include <cstdlib>
 #include <string>
 
diff --git a/src/server/LV2Info.hpp b/src/server/LV2Info.hpp
index 92d1e914..f40cde2c 100644
--- a/src/server/LV2Info.hpp
+++ b/src/server/LV2Info.hpp
@@ -18,13 +18,9 @@
 #ifndef INGEN_ENGINE_LV2INFO_HPP
 #define INGEN_ENGINE_LV2INFO_HPP
 
-#include "ingen-config.h"
-#ifndef HAVE_LILV
-#error "This file requires Lilv, but HAVE_LILV is not defined.  Please report."
-#endif
-
 #include <map>
 #include <string>
+
 #include "lilv/lilv.h"
 #include "shared/World.hpp"
 
diff --git a/src/server/LV2Plugin.hpp b/src/server/LV2Plugin.hpp
index 6e25c671..6a284135 100644
--- a/src/server/LV2Plugin.hpp
+++ b/src/server/LV2Plugin.hpp
@@ -18,12 +18,6 @@
 #ifndef INGEN_ENGINE_LV2PLUGIN_HPP
 #define INGEN_ENGINE_LV2PLUGIN_HPP
 
-#include "ingen-config.h"
-
-#ifndef HAVE_LILV
-#error "This file requires Lilv, but HAVE_LILV is not defined.  Please report."
-#endif
-
 #include <cstdlib>
 #include <string>
 
diff --git a/src/server/NodeFactory.cpp b/src/server/NodeFactory.cpp
index 590f2f86..408576e0 100644
--- a/src/server/NodeFactory.cpp
+++ b/src/server/NodeFactory.cpp
@@ -23,9 +23,9 @@
 
 #include <glibmm/miscutils.h>
 
-#include "sord/sordmm.hpp"
-
+#include "lilv/lilv.h"
 #include "raul/log.hpp"
+#include "sord/sordmm.hpp"
 
 #include "internals/Controller.hpp"
 #include "internals/Delay.hpp"
@@ -35,17 +35,12 @@
 
 #include "Engine.hpp"
 #include "InternalPlugin.hpp"
+#include "LV2Node.hpp"
+#include "LV2Plugin.hpp"
 #include "NodeFactory.hpp"
 #include "PatchImpl.hpp"
 #include "ThreadManager.hpp"
 
-#include "ingen-config.h"
-#ifdef HAVE_LILV
-#include "lilv/lilv.h"
-#include "LV2Plugin.hpp"
-#include "LV2Node.hpp"
-#endif
-
 using namespace std;
 using namespace Raul;
 
@@ -57,9 +52,7 @@ using namespace Internals;
 NodeFactory::NodeFactory(Ingen::Shared::World* world)
 	: _world(world)
 	, _has_loaded(false)
-#ifdef HAVE_LILV
 	, _lv2_info(new LV2Info(world))
-#endif
 {
 }
 
@@ -98,13 +91,8 @@ NodeFactory::load_plugins()
 	// if clients could refresh plugins list for whatever reason :/
 	if (!_has_loaded) {
 		_plugins.clear(); // FIXME: assert empty?
-
 		load_internal_plugins();
-
-#ifdef HAVE_LILV
 		load_lv2_plugins();
-#endif
-
 		_has_loaded = true;
 	}
 }
@@ -126,7 +114,6 @@ NodeFactory::load_internal_plugins()
 	_plugins.insert(make_pair(trigger_plug->uri(), trigger_plug));
 }
 
-#ifdef HAVE_LILV
 /** Loads information about all LV2 plugins into internal plugin database.
  */
 void
@@ -147,7 +134,6 @@ NodeFactory::load_lv2_plugins()
 		_plugins.insert(make_pair(uri, plugin));
 	}
 }
-#endif // HAVE_LILV
 
 } // namespace Server
 } // namespace Ingen
diff --git a/src/server/NodeFactory.hpp b/src/server/NodeFactory.hpp
index 8021cbdc..b3aff687 100644
--- a/src/server/NodeFactory.hpp
+++ b/src/server/NodeFactory.hpp
@@ -23,7 +23,6 @@
 #include "raul/SharedPtr.hpp"
 #include "raul/URI.hpp"
 
-#include "ingen-config.h"
 #include "shared/World.hpp"
 
 namespace Ingen {
@@ -32,9 +31,7 @@ namespace Server {
 class NodeImpl;
 class PatchImpl;
 class PluginImpl;
-#ifdef HAVE_LILV
 class LV2Info;
-#endif
 
 /** Discovers and loads plugin libraries.
  *
@@ -54,18 +51,15 @@ public:
 	PluginImpl* plugin(const Raul::URI& uri);
 
 private:
-#ifdef HAVE_LILV
 	void load_lv2_plugins();
-#endif
-
 	void load_internal_plugins();
 
 	Plugins               _plugins;
 	Ingen::Shared::World* _world;
 	bool                  _has_loaded;
-#ifdef HAVE_LILV
+
 	SharedPtr<LV2Info>    _lv2_info;
-#endif
+
 };
 
 } // namespace Server
diff --git a/src/server/PatchImpl.cpp b/src/server/PatchImpl.cpp
index 52060ab1..fb24faf7 100644
--- a/src/server/PatchImpl.cpp
+++ b/src/server/PatchImpl.cpp
@@ -31,7 +31,6 @@
 #include "Engine.hpp"
 #include "ProcessSlave.hpp"
 #include "Driver.hpp"
-#include "ingen-config.h"
 
 using namespace std;
 using namespace Raul;
diff --git a/src/server/PatchPlugin.hpp b/src/server/PatchPlugin.hpp
index 72885c7d..3504730f 100644
--- a/src/server/PatchPlugin.hpp
+++ b/src/server/PatchPlugin.hpp
@@ -18,8 +18,6 @@
 #ifndef INGEN_ENGINE_PATCHPLUGIN_HPP
 #define INGEN_ENGINE_PATCHPLUGIN_HPP
 
-#include "ingen-config.h"
-
 #include <string>
 #include "PluginImpl.hpp"
 
diff --git a/src/server/events.hpp b/src/server/events.hpp
index 7ddcfe52..acb07b81 100644
--- a/src/server/events.hpp
+++ b/src/server/events.hpp
@@ -18,8 +18,6 @@
 #ifndef INGEN_ENGINE_EVENTS_HPP
 #define INGEN_ENGINE_EVENTS_HPP
 
-#include "ingen-config.h"
-
 #include "events/Connect.hpp"
 #include "events/CreateNode.hpp"
 #include "events/CreatePatch.hpp"
diff --git a/src/server/ingen_lv2.cpp b/src/server/ingen_lv2.cpp
index 9ef1aede..4419a884 100644
--- a/src/server/ingen_lv2.cpp
+++ b/src/server/ingen_lv2.cpp
@@ -45,8 +45,6 @@
 #include "shared/Configuration.hpp"
 #include "shared/runtime_paths.hpp"
 
-#include "ingen-config.h"
-
 /** Record of a patch in this Ingen LV2 bundle */
 struct LV2Patch {
 	LV2Patch(const std::string& u, const std::string& f);
diff --git a/src/server/internals/Delay.cpp b/src/server/internals/Delay.cpp
index 5c2758da..4175862c 100644
--- a/src/server/internals/Delay.cpp
+++ b/src/server/internals/Delay.cpp
@@ -31,7 +31,6 @@
 #include "OutputPort.hpp"
 #include "PatchImpl.hpp"
 #include "ProcessContext.hpp"
-#include "ingen-config.h"
 #include "util.hpp"
 
 #define LOG(s) s << "[DelayNode] "
diff --git a/src/server/wscript b/src/server/wscript
index daf7820e..1ce147d2 100644
--- a/src/server/wscript
+++ b/src/server/wscript
@@ -21,6 +21,9 @@ def build(bld):
             GraphObjectImpl.cpp
             InputPort.cpp
             InternalPlugin.cpp
+            LV2Info.cpp
+            LV2Node.cpp
+            LV2Plugin.cpp
             MessageContext.cpp
             NodeFactory.cpp
             NodeImpl.cpp
@@ -59,9 +62,6 @@ def build(bld):
             internals/Trigger.cpp
     '''
 
-    if bld.is_defined('HAVE_LILV'):
-        core_source += ' LV2Info.cpp LV2Plugin.cpp LV2Node.cpp '
-
     obj = bld(features = 'cxx cxxshlib')
     obj.source = core_source
     obj.export_includes = ['.']
diff --git a/src/shared/Configuration.cpp b/src/shared/Configuration.cpp
index 64185fb3..14ebbb04 100644
--- a/src/shared/Configuration.cpp
+++ b/src/shared/Configuration.cpp
@@ -17,7 +17,6 @@
 
 #include "raul/Atom.hpp"
 
-#include "ingen-config.h"
 #include "Configuration.hpp"
 
 using namespace Raul;
@@ -47,9 +46,7 @@ Configuration::Configuration()
 		.add("help",        'h', "Print this help message", Atom::BOOL, false)
 		.add("jack-client", 'n', "JACK client name", Atom::STRING, "ingen")
 		.add("jack-server", 's', "JACK server name", Atom::STRING, "")
-#ifdef INGEN_JACK_SESSION
 		.add("uuid",        'u', "JACK session UUID", Atom::STRING, "")
-#endif
 		.add("load",        'l', "Load patch", Atom::STRING, Atom())
 		.add("packet-size", 'k', "Maximum UDP packet size", Atom::INT, 4096)
 		.add("parallelism", 'p', "Number of concurrent process threads", Atom::INT, 1)
diff --git a/src/shared/World.cpp b/src/shared/World.cpp
index f29e6ef8..f2af34a7 100644
--- a/src/shared/World.cpp
+++ b/src/shared/World.cpp
@@ -15,16 +15,16 @@
  * 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
-#include "ingen-config.h"
 #include <boost/utility.hpp>
+
 #include <glibmm/module.h>
 #include <glibmm/miscutils.h>
 #include <glibmm/fileutils.h>
-#ifdef HAVE_LILV
+
 #include "lilv/lilv.h"
-#endif
 #include "raul/log.hpp"
 #include "sord/sordmm.hpp"
+
 #include "ingen/EngineBase.hpp"
 #include "shared/runtime_paths.hpp"
 #include "shared/LV2Features.hpp"
@@ -104,18 +104,12 @@ public:
 		, lv2_features(NULL)
 		, rdf_world(new Sord::World())
 		, uris(new Shared::LV2URIMap())
-#ifdef HAVE_LILV
 		, lilv_world(lilv_world_new())
-#else
-		, lilv_world(NULL)
-#endif
 	{
-#ifdef HAVE_LILV
 		lv2_features = new Ingen::Shared::LV2Features();
 		lv2_features->add_feature(LV2_URI_MAP_URI, uris);
 		lv2_features->add_feature(LV2_URI_UNMAP_URI, uris->unmap_feature());
 		lilv_world_load_all(lilv_world);
-#endif
 
 		// Set up RDF namespaces
 		rdf_world->add_prefix("dc",      "http://purl.org/dc/elements/1.1/");
@@ -142,10 +136,8 @@ public:
 		interface_factories.clear();
 		script_runners.clear();
 
-#ifdef HAVE_LILV
 		lilv_world_free(lilv_world);
 		lilv_world = NULL;
-#endif
 
 		delete rdf_world;
 		rdf_world = NULL;
@@ -209,9 +201,7 @@ SharedPtr<Store>                     World::store()        { return _impl->store
 Raul::Configuration*                 World::conf()         { return _impl->conf; }
 LV2Features*                         World::lv2_features() { return _impl->lv2_features; }
 
-#ifdef HAVE_LILV
 LilvWorld*           World::lilv_world() { return _impl->lilv_world; }
-#endif
 Sord::World*         World::rdf_world() { return _impl->rdf_world; }
 SharedPtr<LV2URIMap> World::uris()      { return _impl->uris; }