Use new LV2 include paths

42 files changed, 78 insertions, 78 deletions

diff --git a/src/AtomReader.cpp b/src/AtomReader.cpp
index 218110e4..296c99cd 100644
--- a/src/AtomReader.cpp
+++ b/src/AtomReader.cpp
@@ -23,7 +23,7 @@
 #include "ingen/Message.hpp"
 #include "ingen/Node.hpp"
 #include "ingen/URIMap.hpp"
-#include "lv2/lv2plug.in/ns/ext/atom/util.h"
+#include "lv2/atom/util.h"
 #include "raul/Path.hpp"
 
 namespace Ingen {
diff --git a/src/Forge.cpp b/src/Forge.cpp
index 688d994d..16c482c6 100644
--- a/src/Forge.cpp
+++ b/src/Forge.cpp
@@ -19,7 +19,7 @@
 #include "ingen/Forge.hpp"
 #include "ingen/URI.hpp"
 #include "ingen/URIMap.hpp"
-#include "lv2/lv2plug.in/ns/ext/atom/atom.h"
+#include "lv2/atom/atom.h"
 
 namespace Ingen {
 
diff --git a/src/Parser.cpp b/src/Parser.cpp
index dace07ed..a49f76d3 100644
--- a/src/Parser.cpp
+++ b/src/Parser.cpp
@@ -31,7 +31,7 @@
 #include "ingen/World.hpp"
 #include "ingen/filesystem.hpp"
 #include "ingen/paths.hpp"
-#include "lv2/lv2plug.in/ns/ext/atom/atom.h"
+#include "lv2/atom/atom.h"
 #include "serd/serd.h"
 #include "sord/sordmm.hpp"
 #include "sratom/sratom.h"
diff --git a/src/Serialiser.cpp b/src/Serialiser.cpp
index 034ff96b..f187c288 100644
--- a/src/Serialiser.cpp
+++ b/src/Serialiser.cpp
@@ -37,8 +37,8 @@
 #include "ingen/World.hpp"
 #include "ingen/filesystem.hpp"
 #include "ingen/runtime_paths.hpp"
-#include "lv2/lv2plug.in/ns/ext/state/state.h"
-#include "lv2/lv2plug.in/ns/extensions/ui/ui.h"
+#include "lv2/state/state.h"
+#include "lv2/ui/ui.h"
 #include "raul/Path.hpp"
 #include "sord/sordmm.hpp"
 #include "sratom/sratom.h"
diff --git a/src/URIs.cpp b/src/URIs.cpp
index af03b7b5..aa91ffe0 100644
--- a/src/URIs.cpp
+++ b/src/URIs.cpp
@@ -18,21 +18,21 @@
 #include "ingen/URIMap.hpp"
 #include "ingen/URIs.hpp"
 #include "ingen/ingen.h"
-#include "lv2/lv2plug.in/ns/ext/atom/atom.h"
-#include "lv2/lv2plug.in/ns/ext/buf-size/buf-size.h"
-#include "lv2/lv2plug.in/ns/ext/log/log.h"
-#include "lv2/lv2plug.in/ns/ext/midi/midi.h"
-#include "lv2/lv2plug.in/ns/ext/morph/morph.h"
-#include "lv2/lv2plug.in/ns/ext/options/options.h"
-#include "lv2/lv2plug.in/ns/ext/parameters/parameters.h"
-#include "lv2/lv2plug.in/ns/ext/patch/patch.h"
-#include "lv2/lv2plug.in/ns/ext/port-props/port-props.h"
-#include "lv2/lv2plug.in/ns/ext/presets/presets.h"
-#include "lv2/lv2plug.in/ns/ext/resize-port/resize-port.h"
-#include "lv2/lv2plug.in/ns/ext/state/state.h"
-#include "lv2/lv2plug.in/ns/ext/time/time.h"
-#include "lv2/lv2plug.in/ns/ext/worker/worker.h"
-#include "lv2/lv2plug.in/ns/lv2core/lv2.h"
+#include "lv2/atom/atom.h"
+#include "lv2/buf-size/buf-size.h"
+#include "lv2/core/lv2.h"
+#include "lv2/log/log.h"
+#include "lv2/midi/midi.h"
+#include "lv2/morph/morph.h"
+#include "lv2/options/options.h"
+#include "lv2/parameters/parameters.h"
+#include "lv2/patch/patch.h"
+#include "lv2/port-props/port-props.h"
+#include "lv2/presets/presets.h"
+#include "lv2/resize-port/resize-port.h"
+#include "lv2/state/state.h"
+#include "lv2/time/time.h"
+#include "lv2/worker/worker.h"
 
 namespace Ingen {
 
diff --git a/src/client/PluginUI.cpp b/src/client/PluginUI.cpp
index df983f7f..222a7d55 100644
--- a/src/client/PluginUI.cpp
+++ b/src/client/PluginUI.cpp
@@ -20,8 +20,8 @@
 #include "ingen/client/BlockModel.hpp"
 #include "ingen/client/PluginUI.hpp"
 #include "ingen/client/PortModel.hpp"
-#include "lv2/lv2plug.in/ns/ext/atom/atom.h"
-#include "lv2/lv2plug.in/ns/extensions/ui/ui.h"
+#include "lv2/atom/atom.h"
+#include "lv2/ui/ui.h"
 
 namespace Ingen {
 namespace Client {
diff --git a/src/gui/GraphCanvas.cpp b/src/gui/GraphCanvas.cpp
index 0ae4d709..ed1a7153 100644
--- a/src/gui/GraphCanvas.cpp
+++ b/src/gui/GraphCanvas.cpp
@@ -36,7 +36,7 @@
 #include "ingen/client/GraphModel.hpp"
 #include "ingen/client/PluginModel.hpp"
 #include "ingen/ingen.h"
-#include "lv2/lv2plug.in/ns/ext/atom/atom.h"
+#include "lv2/atom/atom.h"
 
 #include "App.hpp"
 #include "Arc.hpp"
diff --git a/src/gui/MessagesWindow.hpp b/src/gui/MessagesWindow.hpp
index fa9eae1d..b83a8047 100644
--- a/src/gui/MessagesWindow.hpp
+++ b/src/gui/MessagesWindow.hpp
@@ -24,7 +24,7 @@
 #include <gtkmm/builder.h>
 #include <gtkmm/button.h>
 #include <gtkmm/textview.h>
-#include "lv2/lv2plug.in/ns/ext/log/log.h"
+#include "lv2/log/log.h"
 
 #include "Window.hpp"
 
diff --git a/src/gui/NodeMenu.cpp b/src/gui/NodeMenu.cpp
index 1b1b1677..1fea97f4 100644
--- a/src/gui/NodeMenu.cpp
+++ b/src/gui/NodeMenu.cpp
@@ -26,7 +26,7 @@
 #include "ingen/URIMap.hpp"
 #include "ingen/client/BlockModel.hpp"
 #include "ingen/client/PluginModel.hpp"
-#include "lv2/lv2plug.in/ns/ext/presets/presets.h"
+#include "lv2/presets/presets.h"
 
 #include "App.hpp"
 #include "NodeMenu.hpp"
diff --git a/src/gui/NodeModule.cpp b/src/gui/NodeModule.cpp
index dadffff0..6163c1c1 100644
--- a/src/gui/NodeModule.cpp
+++ b/src/gui/NodeModule.cpp
@@ -19,7 +19,7 @@
 
 #include <gtkmm/eventbox.h>
 
-#include "lv2/lv2plug.in/ns/ext/atom/util.h"
+#include "lv2/atom/util.h"
 
 #include "ingen/Atom.hpp"
 #include "ingen/Configuration.hpp"
diff --git a/src/gui/RenameWindow.cpp b/src/gui/RenameWindow.cpp
index c83143d9..518f2439 100644
--- a/src/gui/RenameWindow.cpp
+++ b/src/gui/RenameWindow.cpp
@@ -21,7 +21,7 @@
 #include "ingen/Interface.hpp"
 #include "ingen/client/ClientStore.hpp"
 #include "ingen/client/ObjectModel.hpp"
-#include "lv2/lv2plug.in/ns/lv2core/lv2.h"
+#include "lv2/core/lv2.h"
 
 #include "App.hpp"
 #include "RenameWindow.hpp"
diff --git a/src/gui/ingen_gui_lv2.cpp b/src/gui/ingen_gui_lv2.cpp
index 57881741..75f67b03 100644
--- a/src/gui/ingen_gui_lv2.cpp
+++ b/src/gui/ingen_gui_lv2.cpp
@@ -24,7 +24,7 @@
 #include "ingen/ingen.h"
 #include "ingen/runtime_paths.hpp"
 #include "ingen/types.hpp"
-#include "lv2/lv2plug.in/ns/extensions/ui/ui.h"
+#include "lv2/ui/ui.h"
 
 #include "App.hpp"
 #include "GraphBox.hpp"
diff --git a/src/server/ArcImpl.cpp b/src/server/ArcImpl.cpp
index 5b96ca03..a4889890 100644
--- a/src/server/ArcImpl.cpp
+++ b/src/server/ArcImpl.cpp
@@ -15,7 +15,7 @@
 */
 
 #include "ingen/URIs.hpp"
-#include "lv2/lv2plug.in/ns/ext/atom/util.h"
+#include "lv2/atom/util.h"
 
 #include "ArcImpl.hpp"
 #include "BlockImpl.hpp"
diff --git a/src/server/ArcImpl.hpp b/src/server/ArcImpl.hpp
index 40a6d179..c907a424 100644
--- a/src/server/ArcImpl.hpp
+++ b/src/server/ArcImpl.hpp
@@ -22,7 +22,7 @@
 #include <boost/intrusive/slist.hpp>
 
 #include "ingen/Arc.hpp"
-#include "lv2/lv2plug.in/ns/ext/atom/atom.h"
+#include "lv2/atom/atom.h"
 #include "raul/Deletable.hpp"
 
 #include "BufferRef.hpp"
diff --git a/src/server/Buffer.cpp b/src/server/Buffer.cpp
index 34867fa3..023de393 100644
--- a/src/server/Buffer.cpp
+++ b/src/server/Buffer.cpp
@@ -29,7 +29,7 @@
 #include "ingen/URIs.hpp"
 #include "ingen/World.hpp"
 #include "ingen_config.h"
-#include "lv2/lv2plug.in/ns/ext/atom/util.h"
+#include "lv2/atom/util.h"
 #include "ingen/Log.hpp"
 
 #include "Buffer.hpp"
diff --git a/src/server/Buffer.hpp b/src/server/Buffer.hpp
index a95fcd3c..8d1f29ae 100644
--- a/src/server/Buffer.hpp
+++ b/src/server/Buffer.hpp
@@ -22,8 +22,8 @@
 
 #include "ingen/types.hpp"
 #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"
 #include "raul/Deletable.hpp"
 
 #include "BufferFactory.hpp"
diff --git a/src/server/ControlBindings.cpp b/src/server/ControlBindings.cpp
index 3901d1c2..24503155 100644
--- a/src/server/ControlBindings.cpp
+++ b/src/server/ControlBindings.cpp
@@ -20,8 +20,8 @@
 #include "ingen/URIMap.hpp"
 #include "ingen/URIs.hpp"
 #include "ingen/World.hpp"
-#include "lv2/lv2plug.in/ns/ext/atom/util.h"
-#include "lv2/lv2plug.in/ns/ext/midi/midi.h"
+#include "lv2/atom/util.h"
+#include "lv2/midi/midi.h"
 
 #include "Buffer.hpp"
 #include "ControlBindings.hpp"
diff --git a/src/server/ControlBindings.hpp b/src/server/ControlBindings.hpp
index 3160f8b2..ad5aa7bd 100644
--- a/src/server/ControlBindings.hpp
+++ b/src/server/ControlBindings.hpp
@@ -26,7 +26,7 @@
 
 #include "ingen/Atom.hpp"
 #include "ingen/types.hpp"
-#include "lv2/lv2plug.in/ns/ext/atom/forge.h"
+#include "lv2/atom/forge.h"
 #include "raul/Maid.hpp"
 #include "raul/Path.hpp"
 
diff --git a/src/server/Engine.cpp b/src/server/Engine.cpp
index a7476845..dd87500e 100644
--- a/src/server/Engine.cpp
+++ b/src/server/Engine.cpp
@@ -21,8 +21,8 @@
 #include <limits>
 #include <thread>
 
-#include "lv2/lv2plug.in/ns/ext/buf-size/buf-size.h"
-#include "lv2/lv2plug.in/ns/ext/state/state.h"
+#include "lv2/buf-size/buf-size.h"
+#include "lv2/state/state.h"
 
 #include "events/CreateGraph.hpp"
 #include "ingen/AtomReader.hpp"
diff --git a/src/server/JackDriver.cpp b/src/server/JackDriver.cpp
index 973e3eb7..9e95b796 100644
--- a/src/server/JackDriver.cpp
+++ b/src/server/JackDriver.cpp
@@ -36,7 +36,7 @@
 #include "ingen/URI.hpp"
 #include "ingen/URIMap.hpp"
 #include "ingen/World.hpp"
-#include "lv2/lv2plug.in/ns/ext/atom/util.h"
+#include "lv2/atom/util.h"
 
 #include "Buffer.hpp"
 #include "DuplexPort.hpp"
diff --git a/src/server/JackDriver.hpp b/src/server/JackDriver.hpp
index 2a21d96e..b2871fa6 100644
--- a/src/server/JackDriver.hpp
+++ b/src/server/JackDriver.hpp
@@ -30,7 +30,7 @@
 #endif
 
 #include "ingen/types.hpp"
-#include "lv2/lv2plug.in/ns/ext/atom/forge.h"
+#include "lv2/atom/forge.h"
 #include "raul/Semaphore.hpp"
 
 #include "Driver.hpp"
diff --git a/src/server/LV2Block.cpp b/src/server/LV2Block.cpp
index f4792f39..9ebf7dcf 100644
--- a/src/server/LV2Block.cpp
+++ b/src/server/LV2Block.cpp
@@ -18,11 +18,11 @@
 #include <cmath>
 #include <cstdint>
 
-#include "lv2/lv2plug.in/ns/ext/morph/morph.h"
-#include "lv2/lv2plug.in/ns/ext/presets/presets.h"
-#include "lv2/lv2plug.in/ns/ext/options/options.h"
-#include "lv2/lv2plug.in/ns/ext/resize-port/resize-port.h"
-#include "lv2/lv2plug.in/ns/ext/state/state.h"
+#include "lv2/morph/morph.h"
+#include "lv2/presets/presets.h"
+#include "lv2/options/options.h"
+#include "lv2/resize-port/resize-port.h"
+#include "lv2/state/state.h"
 
 #include "raul/Maid.hpp"
 #include "raul/Array.hpp"
diff --git a/src/server/LV2Block.hpp b/src/server/LV2Block.hpp
index f3a59550..c9bbabf3 100644
--- a/src/server/LV2Block.hpp
+++ b/src/server/LV2Block.hpp
@@ -20,7 +20,7 @@
 #include <mutex>
 
 #include "lilv/lilv.h"
-#include "lv2/lv2plug.in/ns/ext/worker/worker.h"
+#include "lv2/worker/worker.h"
 #include "raul/Maid.hpp"
 
 #include "BufferRef.hpp"
diff --git a/src/server/LV2Options.hpp b/src/server/LV2Options.hpp
index ef7c5ec9..75dbd41e 100644
--- a/src/server/LV2Options.hpp
+++ b/src/server/LV2Options.hpp
@@ -19,7 +19,7 @@
 
 #include "ingen/LV2Features.hpp"
 #include "ingen/URIs.hpp"
-#include "lv2/lv2plug.in/ns/ext/options/options.h"
+#include "lv2/options/options.h"
 
 namespace Ingen {
 namespace Server {
diff --git a/src/server/LV2Plugin.cpp b/src/server/LV2Plugin.cpp
index f56fd4d7..bc10755a 100644
--- a/src/server/LV2Plugin.cpp
+++ b/src/server/LV2Plugin.cpp
@@ -20,7 +20,7 @@
 #include "ingen/Log.hpp"
 #include "ingen/URIs.hpp"
 #include "ingen/World.hpp"
-#include "lv2/lv2plug.in/ns/ext/presets/presets.h"
+#include "lv2/presets/presets.h"
 
 #include "Engine.hpp"
 #include "LV2Block.hpp"
diff --git a/src/server/LV2ResizeFeature.hpp b/src/server/LV2ResizeFeature.hpp
index f61165ee..8ef84896 100644
--- a/src/server/LV2ResizeFeature.hpp
+++ b/src/server/LV2ResizeFeature.hpp
@@ -18,7 +18,7 @@
 #define INGEN_ENGINE_LV2RESIZEFEATURE_HPP
 
 #include "ingen/LV2Features.hpp"
-#include "lv2/lv2plug.in/ns/ext/resize-port/resize-port.h"
+#include "lv2/resize-port/resize-port.h"
 
 #include "BlockImpl.hpp"
 #include "Buffer.hpp"
diff --git a/src/server/PortAudioDriver.cpp b/src/server/PortAudioDriver.cpp
index f892c99f..56be43e8 100644
--- a/src/server/PortAudioDriver.cpp
+++ b/src/server/PortAudioDriver.cpp
@@ -26,7 +26,7 @@
 #include "ingen/Log.hpp"
 #include "ingen/URIMap.hpp"
 #include "ingen/World.hpp"
-#include "lv2/lv2plug.in/ns/ext/atom/util.h"
+#include "lv2/atom/util.h"
 
 #include "Buffer.hpp"
 #include "DuplexPort.hpp"
diff --git a/src/server/PortAudioDriver.hpp b/src/server/PortAudioDriver.hpp
index b1545f64..127fe5f3 100644
--- a/src/server/PortAudioDriver.hpp
+++ b/src/server/PortAudioDriver.hpp
@@ -27,7 +27,7 @@
 
 #include "raul/Semaphore.hpp"
 
-#include "lv2/lv2plug.in/ns/ext/atom/forge.h"
+#include "lv2/atom/forge.h"
 
 #include "Driver.hpp"
 #include "EnginePort.hpp"
diff --git a/src/server/PortImpl.cpp b/src/server/PortImpl.cpp
index b0ef3c85..355774dd 100644
--- a/src/server/PortImpl.cpp
+++ b/src/server/PortImpl.cpp
@@ -16,7 +16,7 @@
 
 #include "ingen/URIs.hpp"
 #include "ingen/World.hpp"
-#include "lv2/lv2plug.in/ns/ext/atom/util.h"
+#include "lv2/atom/util.h"
 #include "raul/Array.hpp"
 #include "raul/Maid.hpp"
 
diff --git a/src/server/PortType.hpp b/src/server/PortType.hpp
index 0b62c5ab..710c5aa0 100644
--- a/src/server/PortType.hpp
+++ b/src/server/PortType.hpp
@@ -19,8 +19,8 @@
 
 #include <cassert>
 
-#include "lv2/lv2plug.in/ns/ext/atom/atom.h"
-#include "lv2/lv2plug.in/ns/lv2core/lv2.h"
+#include "lv2/atom/atom.h"
+#include "lv2/core/lv2.h"
 
 namespace Ingen {
 
diff --git a/src/server/RunContext.hpp b/src/server/RunContext.hpp
index bb64a250..fe3ce850 100644
--- a/src/server/RunContext.hpp
+++ b/src/server/RunContext.hpp
@@ -20,7 +20,7 @@
 #include <cstdint>
 #include <thread>
 
-#include "lv2/lv2plug.in/ns/ext/urid/urid.h"
+#include "lv2/urid/urid.h"
 #include "raul/RingBuffer.hpp"
 
 #include "types.hpp"
diff --git a/src/server/UndoStack.cpp b/src/server/UndoStack.cpp
index dad211ad..289770c0 100644
--- a/src/server/UndoStack.cpp
+++ b/src/server/UndoStack.cpp
@@ -18,8 +18,8 @@
 
 #include "ingen/URIMap.hpp"
 #include "ingen/URIs.hpp"
-#include "lv2/lv2plug.in/ns/ext/atom/util.h"
-#include "lv2/lv2plug.in/ns/ext/patch/patch.h"
+#include "lv2/atom/util.h"
+#include "lv2/patch/patch.h"
 #include "serd/serd.h"
 #include "sratom/sratom.h"
 
diff --git a/src/server/UndoStack.hpp b/src/server/UndoStack.hpp
index 6ce6475f..4ca8a5b8 100644
--- a/src/server/UndoStack.hpp
+++ b/src/server/UndoStack.hpp
@@ -22,7 +22,7 @@
 
 #include "ingen/AtomSink.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/src/server/Worker.cpp b/src/server/Worker.cpp
index 6f60250c..de1fc629 100644
--- a/src/server/Worker.cpp
+++ b/src/server/Worker.cpp
@@ -16,7 +16,7 @@
 
 #include "ingen/LV2Features.hpp"
 #include "ingen/Log.hpp"
-#include "lv2/lv2plug.in/ns/ext/worker/worker.h"
+#include "lv2/worker/worker.h"
 
 #include "Engine.hpp"
 #include "GraphImpl.hpp"
diff --git a/src/server/Worker.hpp b/src/server/Worker.hpp
index 0a3fdeaf..11cc2cd1 100644
--- a/src/server/Worker.hpp
+++ b/src/server/Worker.hpp
@@ -20,7 +20,7 @@
 #include <thread>
 
 #include "ingen/LV2Features.hpp"
-#include "lv2/lv2plug.in/ns/ext/worker/worker.h"
+#include "lv2/worker/worker.h"
 #include "raul/RingBuffer.hpp"
 #include "raul/Semaphore.hpp"
 
diff --git a/src/server/events/CreatePort.hpp b/src/server/events/CreatePort.hpp
index a2ea7682..a98ea393 100644
--- a/src/server/events/CreatePort.hpp
+++ b/src/server/events/CreatePort.hpp
@@ -20,7 +20,7 @@
 #include <boost/optional.hpp>
 
 #include "ingen/Resource.hpp"
-#include "lv2/lv2plug.in/ns/ext/urid/urid.h"
+#include "lv2/urid/urid.h"
 #include "raul/Array.hpp"
 #include "raul/Path.hpp"
 
diff --git a/src/server/ingen_lv2.cpp b/src/server/ingen_lv2.cpp
index b2806ab6..99b2826a 100644
--- a/src/server/ingen_lv2.cpp
+++ b/src/server/ingen_lv2.cpp
@@ -19,14 +19,14 @@
 #include <thread>
 #include <vector>
 
-#include "lv2/lv2plug.in/ns/ext/atom/util.h"
-#include "lv2/lv2plug.in/ns/ext/buf-size/buf-size.h"
-#include "lv2/lv2plug.in/ns/ext/log/log.h"
-#include "lv2/lv2plug.in/ns/ext/log/logger.h"
-#include "lv2/lv2plug.in/ns/ext/options/options.h"
-#include "lv2/lv2plug.in/ns/ext/state/state.h"
-#include "lv2/lv2plug.in/ns/ext/urid/urid.h"
-#include "lv2/lv2plug.in/ns/lv2core/lv2.h"
+#include "lv2/atom/util.h"
+#include "lv2/buf-size/buf-size.h"
+#include "lv2/log/log.h"
+#include "lv2/log/logger.h"
+#include "lv2/options/options.h"
+#include "lv2/state/state.h"
+#include "lv2/urid/urid.h"
+#include "lv2/core/lv2.h"
 
 #include "ingen/AtomReader.hpp"
 #include "ingen/AtomWriter.hpp"
diff --git a/src/server/internals/Controller.cpp b/src/server/internals/Controller.cpp
index 4c1cf45a..95474ab8 100644
--- a/src/server/internals/Controller.cpp
+++ b/src/server/internals/Controller.cpp
@@ -18,8 +18,8 @@
 
 #include "ingen/URIs.hpp"
 #include "internals/Controller.hpp"
-#include "lv2/lv2plug.in/ns/ext/atom/util.h"
-#include "lv2/lv2plug.in/ns/ext/midi/midi.h"
+#include "lv2/atom/util.h"
+#include "lv2/midi/midi.h"
 
 #include "Buffer.hpp"
 #include "Engine.hpp"
diff --git a/src/server/internals/Note.cpp b/src/server/internals/Note.cpp
index b39dd1d4..f8e2503d 100644
--- a/src/server/internals/Note.cpp
+++ b/src/server/internals/Note.cpp
@@ -17,8 +17,8 @@
 #include <cmath>
 
 #include "ingen/URIs.hpp"
-#include "lv2/lv2plug.in/ns/ext/atom/util.h"
-#include "lv2/lv2plug.in/ns/ext/midi/midi.h"
+#include "lv2/atom/util.h"
+#include "lv2/midi/midi.h"
 #include "raul/Array.hpp"
 #include "raul/Maid.hpp"
 
diff --git a/src/server/internals/Time.cpp b/src/server/internals/Time.cpp
index 5474bf21..5152a930 100644
--- a/src/server/internals/Time.cpp
+++ b/src/server/internals/Time.cpp
@@ -15,8 +15,8 @@
 */
 
 #include "ingen/URIs.hpp"
-#include "lv2/lv2plug.in/ns/ext/atom/util.h"
-#include "lv2/lv2plug.in/ns/ext/midi/midi.h"
+#include "lv2/atom/util.h"
+#include "lv2/midi/midi.h"
 
 #include "Buffer.hpp"
 #include "Driver.hpp"
diff --git a/src/server/internals/Trigger.cpp b/src/server/internals/Trigger.cpp
index 69967877..66fd058b 100644
--- a/src/server/internals/Trigger.cpp
+++ b/src/server/internals/Trigger.cpp
@@ -17,8 +17,8 @@
 #include <cmath>
 
 #include "ingen/URIs.hpp"
-#include "lv2/lv2plug.in/ns/ext/atom/util.h"
-#include "lv2/lv2plug.in/ns/ext/midi/midi.h"
+#include "lv2/atom/util.h"
+#include "lv2/midi/midi.h"
 
 #include "Buffer.hpp"
 #include "Engine.hpp"
diff --git a/src/server/mix.cpp b/src/server/mix.cpp
index 3e7634fe..60525596 100644
--- a/src/server/mix.cpp
+++ b/src/server/mix.cpp
@@ -14,7 +14,7 @@
   along with Ingen.  If not, see <http://www.gnu.org/licenses/>.
 */
 
-#include "lv2/lv2plug.in/ns/ext/atom/util.h"
+#include "lv2/atom/util.h"
 
 #include "Buffer.hpp"
 #include "RunContext.hpp"