diff --git a/libs/ardour/ardour/lv2_extensions.h b/libs/ardour/ardour/lv2_extensions.h
index b2dcf97344..48b076eb04 100644
--- a/libs/ardour/ardour/lv2_extensions.h
+++ b/libs/ardour/ardour/lv2_extensions.h
@@ -18,7 +18,7 @@
 #define _ardour_lv2_extensions_h_
 
 #ifdef HAVE_LV2_1_18_6
-#include <lv2/lv2core/lv2.h>
+#include <lv2/core/lv2.h>
 #else
 #include <lv2/lv2plug.in/ns/lv2core/lv2.h>
 #endif
diff --git a/libs/ardour/ardour/uri_map.h b/libs/ardour/ardour/uri_map.h
index f1e2cf4690..2cefa42448 100644
--- a/libs/ardour/ardour/uri_map.h
+++ b/libs/ardour/ardour/uri_map.h
@@ -28,7 +28,7 @@
 #include <glibmm/threads.h>
 
 #ifdef HAVE_LV2_1_18_6
-#include <lv2/lv2core/lv2.h>
+#include <lv2/core/lv2.h>
 #include <lv2/urid/urid.h>
 #else
 #include <lv2/lv2plug.in/ns/lv2core/lv2.h>
diff --git a/libs/plugins/a-comp.lv2/a-comp.c b/libs/plugins/a-comp.lv2/a-comp.c
index f641ae75e3..d533754c21 100644
--- a/libs/plugins/a-comp.lv2/a-comp.c
+++ b/libs/plugins/a-comp.lv2/a-comp.c
@@ -29,7 +29,7 @@
 #endif
 
 #ifdef HAVE_LV2_1_18_6
-#include <lv2/lv2core/lv2.h>
+#include <lv2/core/lv2.h>
 #else
 #include <lv2/lv2plug.in/ns/lv2core/lv2.h>
 #endif
diff --git a/libs/plugins/a-delay.lv2/a-delay.c b/libs/plugins/a-delay.lv2/a-delay.c
index f21dba8fea..1e8eafad64 100644
--- a/libs/plugins/a-delay.lv2/a-delay.c
+++ b/libs/plugins/a-delay.lv2/a-delay.c
@@ -22,10 +22,10 @@
 #include <stdio.h>
 
 #ifdef HAVE_LV2_1_18_6
-#include <lv2/lv2core/lv2.h>
 #include <lv2/atom/atom.h>
-#include <lv2/time/time.h>
 #include <lv2/atom/forge.h>
+#include <lv2/core/lv2.h>
+#include <lv2/time/time.h>
 #include <lv2/urid/urid.h>
 #else
 #include <lv2/lv2plug.in/ns/lv2core/lv2.h>
diff --git a/libs/plugins/a-eq.lv2/a-eq.c b/libs/plugins/a-eq.lv2/a-eq.c
index 5b09f0654a..4daf14b602 100644
--- a/libs/plugins/a-eq.lv2/a-eq.c
+++ b/libs/plugins/a-eq.lv2/a-eq.c
@@ -36,7 +36,7 @@
 #endif
 
 #ifdef HAVE_LV2_1_18_6
-#include <lv2/lv2core/lv2.h>
+#include <lv2/core/lv2.h>
 #else
 #include <lv2/lv2plug.in/ns/lv2core/lv2.h>
 #endif
diff --git a/libs/plugins/a-fluidsynth.lv2/a-fluidsynth.cc b/libs/plugins/a-fluidsynth.lv2/a-fluidsynth.cc
index ace2732fc8..cc25462109 100644
--- a/libs/plugins/a-fluidsynth.lv2/a-fluidsynth.cc
+++ b/libs/plugins/a-fluidsynth.lv2/a-fluidsynth.cc
@@ -48,7 +48,7 @@
 #include <lv2/atom/atom.h>
 #include <lv2/atom/forge.h>
 #include <lv2/atom/util.h>
-#include <lv2/lv2core/lv2.h>
+#include <lv2/core/lv2.h>
 #include <lv2/log/logger.h>
 #include <lv2/midi/midi.h>
 #include <lv2/patch/patch.h>
diff --git a/libs/plugins/a-reverb.lv2/a-reverb.c b/libs/plugins/a-reverb.lv2/a-reverb.c
index e9413255f2..49d7db3f81 100644
--- a/libs/plugins/a-reverb.lv2/a-reverb.c
+++ b/libs/plugins/a-reverb.lv2/a-reverb.c
@@ -250,7 +250,7 @@ reverb (b_reverb* r,
  */
 
 #ifdef HAVE_LV2_1_18_6
-#include <lv2/lv2core/lv2.h>
+#include <lv2/core/lv2.h>
 #else
 #include <lv2/lv2plug.in/ns/lv2core/lv2.h>
 #endif
diff --git a/libs/plugins/reasonablesynth.lv2/lv2.c b/libs/plugins/reasonablesynth.lv2/lv2.c
index 6a21d8dc4a..b5e206159f 100644
--- a/libs/plugins/reasonablesynth.lv2/lv2.c
+++ b/libs/plugins/reasonablesynth.lv2/lv2.c
@@ -25,8 +25,8 @@
 
 /* LV2 */
 #ifdef HAVE_LV2_1_18_6
-#include <lv2/lv2core/lv2.h>
 #include <lv2/atom/atom.h>
+#include <lv2/core/lv2.h>
 #include <lv2/urid/urid.h>
 #include <lv2/midi/midi.h>
 #else