16 files changed, 26 insertions, 26 deletions
diff --git a/ingen/Atom.hpp b/ingen/Atom.hpp
index 5e90903a..222023bc 100644
--- a/ingen/Atom.hpp
+++ b/ingen/Atom.hpp
@@ -24,8 +24,8 @@
 #include <cstring>
 
 #include "ingen/ingen.h"
-#include "lv2/lv2plug.in/ns/ext/atom/atom.h"
-#include "lv2/lv2plug.in/ns/ext/urid/urid.h"
+#include "lv2/atom/atom.h"
+#include "lv2/urid/urid.h"
 
 namespace Ingen {
 
diff --git a/ingen/AtomForgeSink.hpp b/ingen/AtomForgeSink.hpp
index 8c070701..93476d1c 100644
--- a/ingen/AtomForgeSink.hpp
+++ b/ingen/AtomForgeSink.hpp
@@ -22,9 +22,9 @@
 #include <cstdlib>
 #include <cstring>
 
-#include "lv2/lv2plug.in/ns/ext/atom/atom.h"
-#include "lv2/lv2plug.in/ns/ext/atom/forge.h"
-#include "lv2/lv2plug.in/ns/ext/atom/util.h"
+#include "lv2/atom/atom.h"
+#include "lv2/atom/forge.h"
+#include "lv2/atom/util.h"
 
 namespace Ingen {
 
diff --git a/ingen/AtomReader.hpp b/ingen/AtomReader.hpp
index 7ea4654a..a53d5094 100644
--- a/ingen/AtomReader.hpp
+++ b/ingen/AtomReader.hpp
@@ -24,7 +24,7 @@
 #include "ingen/AtomSink.hpp"
 #include "ingen/Resource.hpp"
 #include "ingen/ingen.h"
-#include "lv2/lv2plug.in/ns/ext/atom/atom.h"
+#include "lv2/atom/atom.h"
 
 namespace Raul {
 class Path;
diff --git a/ingen/AtomSink.hpp b/ingen/AtomSink.hpp
index 0cfa027a..02f90164 100644
--- a/ingen/AtomSink.hpp
+++ b/ingen/AtomSink.hpp
@@ -20,7 +20,7 @@
 #include <cstdint>
 
 #include "ingen/ingen.h"
-#include "lv2/lv2plug.in/ns/ext/atom/atom.h"
+#include "lv2/atom/atom.h"
 
 namespace Ingen {
 
diff --git a/ingen/AtomWriter.hpp b/ingen/AtomWriter.hpp
index 5e765c75..382bfe32 100644
--- a/ingen/AtomWriter.hpp
+++ b/ingen/AtomWriter.hpp
@@ -25,8 +25,8 @@
 #include "ingen/Properties.hpp"
 #include "ingen/Resource.hpp"
 #include "ingen/ingen.h"
-#include "lv2/lv2plug.in/ns/ext/atom/forge.h"
-#include "lv2/lv2plug.in/ns/ext/urid/urid.h"
+#include "lv2/atom/forge.h"
+#include "lv2/urid/urid.h"
 
 namespace Raul { class Path; }
 
diff --git a/ingen/Configuration.hpp b/ingen/Configuration.hpp
index 6759b4b0..0f9b3a02 100644
--- a/ingen/Configuration.hpp
+++ b/ingen/Configuration.hpp
@@ -25,7 +25,7 @@
 
 #include "ingen/Atom.hpp"
 #include "ingen/ingen.h"
-#include "lv2/lv2plug.in/ns/ext/urid/urid.h"
+#include "lv2/urid/urid.h"
 #include "raul/Exception.hpp"
 
 namespace Ingen {
diff --git a/ingen/DataAccess.hpp b/ingen/DataAccess.hpp
index cabb5345..32ca9ead 100644
--- a/ingen/DataAccess.hpp
+++ b/ingen/DataAccess.hpp
@@ -27,8 +27,8 @@
 #include "ingen/types.hpp"
 #include "lilv/lilv.h"
 
-#include "lv2/lv2plug.in/ns/lv2core/lv2.h"
-#include "lv2/lv2plug.in/ns/ext/data-access/data-access.h"
+#include "lv2/core/lv2.h"
+#include "lv2/data-access/data-access.h"
 
 namespace Ingen {
 
diff --git a/ingen/Forge.hpp b/ingen/Forge.hpp
index 32822f89..77f399c8 100644
--- a/ingen/Forge.hpp
+++ b/ingen/Forge.hpp
@@ -23,7 +23,7 @@
 
 #include "ingen/Atom.hpp"
 #include "ingen/ingen.h"
-#include "lv2/lv2plug.in/ns/ext/atom/forge.h"
+#include "lv2/atom/forge.h"
 
 namespace Ingen {
 
diff --git a/ingen/InstanceAccess.hpp b/ingen/InstanceAccess.hpp
index a93edc66..13ad1f12 100644
--- a/ingen/InstanceAccess.hpp
+++ b/ingen/InstanceAccess.hpp
@@ -26,7 +26,7 @@
 #include "ingen/types.hpp"
 #include "lilv/lilv.h"
 
-#include "lv2/lv2plug.in/ns/lv2core/lv2.h"
+#include "lv2/core/lv2.h"
 
 namespace Ingen {
 
diff --git a/ingen/LV2Features.hpp b/ingen/LV2Features.hpp
index 9995ff47..4834b10a 100644
--- a/ingen/LV2Features.hpp
+++ b/ingen/LV2Features.hpp
@@ -23,7 +23,7 @@
 
 #include "ingen/ingen.h"
 #include "ingen/types.hpp"
-#include "lv2/lv2plug.in/ns/lv2core/lv2.h"
+#include "lv2/core/lv2.h"
 #include "raul/Noncopyable.hpp"
 
 namespace Ingen {
diff --git a/ingen/Log.hpp b/ingen/Log.hpp
index 54369551..5cd5e0f7 100644
--- a/ingen/Log.hpp
+++ b/ingen/Log.hpp
@@ -26,9 +26,9 @@
 
 #include "ingen/LV2Features.hpp"
 #include "ingen/ingen.h"
-#include "lv2/lv2plug.in/ns/ext/log/log.h"
-#include "lv2/lv2plug.in/ns/ext/urid/urid.h"
-#include "lv2/lv2plug.in/ns/lv2core/lv2.h"
+#include "lv2/core/lv2.h"
+#include "lv2/log/log.h"
+#include "lv2/urid/urid.h"
 
 namespace Ingen {
 
diff --git a/ingen/TurtleWriter.hpp b/ingen/TurtleWriter.hpp
index 8cf7ceb8..6c44647f 100644
--- a/ingen/TurtleWriter.hpp
+++ b/ingen/TurtleWriter.hpp
@@ -23,7 +23,7 @@
 #include "ingen/AtomSink.hpp"
 #include "ingen/AtomWriter.hpp"
 #include "ingen/ingen.h"
-#include "lv2/lv2plug.in/ns/ext/atom/atom.h"
+#include "lv2/atom/atom.h"
 #include "serd/serd.h"
 #include "sratom/sratom.h"
 
diff --git a/ingen/URIMap.hpp b/ingen/URIMap.hpp
index 90c5f0ac..0d89b800 100644
--- a/ingen/URIMap.hpp
+++ b/ingen/URIMap.hpp
@@ -27,8 +27,8 @@
 #include "ingen/LV2Features.hpp"
 #include "ingen/ingen.h"
 #include "ingen/types.hpp"
-#include "lv2/lv2plug.in/ns/ext/urid/urid.h"
-#include "lv2/lv2plug.in/ns/lv2core/lv2.h"
+#include "lv2/core/lv2.h"
+#include "lv2/urid/urid.h"
 #include "raul/Noncopyable.hpp"
 
 namespace Ingen {
diff --git a/ingen/URIs.hpp b/ingen/URIs.hpp
index 71c14d14..a4fc3744 100644
--- a/ingen/URIs.hpp
+++ b/ingen/URIs.hpp
@@ -21,7 +21,7 @@
 #include "ingen/URI.hpp"
 #include "ingen/ingen.h"
 #include "lilv/lilv.h"
-#include "lv2/lv2plug.in/ns/ext/urid/urid.h"
+#include "lv2/urid/urid.h"
 #include "raul/Noncopyable.hpp"
 
 namespace Ingen {
diff --git a/ingen/World.hpp b/ingen/World.hpp
index 13bd7001..ac6b5628 100644
--- a/ingen/World.hpp
+++ b/ingen/World.hpp
@@ -22,8 +22,8 @@
 
 #include "ingen/ingen.h"
 #include "ingen/types.hpp"
-#include "lv2/lv2plug.in/ns/ext/log/log.h"
-#include "lv2/lv2plug.in/ns/ext/urid/urid.h"
+#include "lv2/log/log.h"
+#include "lv2/urid/urid.h"
 #include "raul/Noncopyable.hpp"
 
 typedef struct LilvWorldImpl LilvWorld;
diff --git a/ingen/client/PortModel.hpp b/ingen/client/PortModel.hpp
index 9ad37378..3634d31f 100644
--- a/ingen/client/PortModel.hpp
+++ b/ingen/client/PortModel.hpp
@@ -23,8 +23,8 @@
 #include "ingen/client/ObjectModel.hpp"
 #include "ingen/ingen.h"
 #include "ingen/types.hpp"
-#include "lv2/lv2plug.in/ns/ext/port-props/port-props.h"
-#include "lv2/lv2plug.in/ns/lv2core/lv2.h"
+#include "lv2/core/lv2.h"
+#include "lv2/port-props/port-props.h"
 
 namespace Raul { class Path; }