diff --git a/include/Lv2Options.h b/include/Lv2Options.h
index 603cdda43ac..69d294cbe1f 100644
--- a/include/Lv2Options.h
+++ b/include/Lv2Options.h
@@ -30,8 +30,8 @@
 #ifdef LMMS_HAVE_LV2
 
 #include <cstdint>
-#include <lv2/lv2plug.in/ns/ext/options/options.h>
-#include <lv2/lv2plug.in/ns/ext/urid/urid.h>
+#include <lv2/options/options.h>
+#include <lv2/urid/urid.h>
 #include <map>
 #include <memory>
 #include <set>
diff --git a/include/Lv2UridMap.h b/include/Lv2UridMap.h
index 6c22aca3e40..23f8f758a44 100644
--- a/include/Lv2UridMap.h
+++ b/include/Lv2UridMap.h
@@ -29,7 +29,7 @@
 
 #ifdef LMMS_HAVE_LV2
 
-#include <lv2/lv2plug.in/ns/ext/urid/urid.h>
+#include <lv2/urid/urid.h>
 #include <mutex> // TODO: use semaphore, even though this is not realtime critical
 #include <string>
 #include <unordered_map>
diff --git a/include/Lv2Worker.h b/include/Lv2Worker.h
index 90a3d9d4f8d..b15bd9026c4 100644
--- a/include/Lv2Worker.h
+++ b/include/Lv2Worker.h
@@ -30,7 +30,7 @@
 #ifdef LMMS_HAVE_LV2
 
 #include <lilv/lilv.h>
-#include <lv2/lv2plug.in/ns/ext/worker/worker.h>
+#include <lv2/worker/worker.h>
 #include <thread>
 #include <vector>
 
diff --git a/src/core/lv2/Lv2Evbuf.cpp b/src/core/lv2/Lv2Evbuf.cpp
index 07a3d58e687..486910feed1 100644
--- a/src/core/lv2/Lv2Evbuf.cpp
+++ b/src/core/lv2/Lv2Evbuf.cpp
@@ -34,7 +34,7 @@
 #include <cstdlib>
 #include <cstring>
 
-#include <lv2/lv2plug.in/ns/ext/atom/atom.h>
+#include <lv2/atom/atom.h>
 
 namespace lmms
 {
diff --git a/src/core/lv2/Lv2Manager.cpp b/src/core/lv2/Lv2Manager.cpp
index 6a1b2a8af20..1633b862616 100644
--- a/src/core/lv2/Lv2Manager.cpp
+++ b/src/core/lv2/Lv2Manager.cpp
@@ -29,9 +29,9 @@
 #include <algorithm>
 #include <cstdlib>
 #include <lilv/lilv.h>
-#include <lv2/lv2plug.in/ns/ext/buf-size/buf-size.h>
-#include <lv2/lv2plug.in/ns/ext/options/options.h>
-#include <lv2/lv2plug.in/ns/ext/worker/worker.h>
+#include <lv2/buf-size/buf-size.h>
+#include <lv2/options/options.h>
+#include <lv2/worker/worker.h>
 #include <QDebug>
 #include <QElapsedTimer>
 
diff --git a/src/core/lv2/Lv2Ports.cpp b/src/core/lv2/Lv2Ports.cpp
index a4625936e62..657046817ef 100644
--- a/src/core/lv2/Lv2Ports.cpp
+++ b/src/core/lv2/Lv2Ports.cpp
@@ -27,8 +27,8 @@
 
 #ifdef LMMS_HAVE_LV2
 
-#include <lv2/lv2plug.in/ns/ext/atom/atom.h>
-#include <lv2/lv2plug.in/ns/ext/port-props/port-props.h>
+#include <lv2/atom/atom.h>
+#include <lv2/port-props/port-props.h>
 
 #include "Engine.h"
 #include "Lv2Basics.h"
diff --git a/src/core/lv2/Lv2Proc.cpp b/src/core/lv2/Lv2Proc.cpp
index 682caea697d..cc8e333be0e 100644
--- a/src/core/lv2/Lv2Proc.cpp
+++ b/src/core/lv2/Lv2Proc.cpp
@@ -27,10 +27,10 @@
 #ifdef LMMS_HAVE_LV2
 
 #include <cmath>
-#include <lv2/lv2plug.in/ns/ext/midi/midi.h>
-#include <lv2/lv2plug.in/ns/ext/atom/atom.h>
-#include <lv2/lv2plug.in/ns/ext/resize-port/resize-port.h>
-#include <lv2/lv2plug.in/ns/ext/worker/worker.h>
+#include <lv2/midi/midi.h>
+#include <lv2/atom/atom.h>
+#include <lv2/resize-port/resize-port.h>
+#include <lv2/worker/worker.h>
 #include <QDebug>
 #include <QDomDocument>
 #include <QtGlobal>
diff --git a/src/core/lv2/Lv2UridCache.cpp b/src/core/lv2/Lv2UridCache.cpp
index 746878afb96..7d3a14c9349 100644
--- a/src/core/lv2/Lv2UridCache.cpp
+++ b/src/core/lv2/Lv2UridCache.cpp
@@ -26,10 +26,10 @@
 
 #ifdef LMMS_HAVE_LV2
 
-#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/midi/midi.h>
-#include <lv2/lv2plug.in/ns/ext/parameters/parameters.h>
+#include <lv2/atom/atom.h>
+#include <lv2/buf-size/buf-size.h>
+#include <lv2/midi/midi.h>
+#include <lv2/parameters/parameters.h>
 #include <QtGlobal>
 
 #include "Lv2UridMap.h"
diff --git a/src/gui/Lv2ViewBase.cpp b/src/gui/Lv2ViewBase.cpp
index b93788ea8c5..fc025e26856 100644
--- a/src/gui/Lv2ViewBase.cpp
+++ b/src/gui/Lv2ViewBase.cpp
@@ -31,7 +31,7 @@
 #include <QHBoxLayout>
 #include <QLabel>
 #include <lilv/lilv.h>
-#include <lv2/lv2plug.in/ns/ext/port-props/port-props.h>
+#include <lv2/port-props/port-props.h>
 
 #include "AudioEngine.h"
 #include "Controls.h"