diff --git a/src/meson.build b/src/meson.build
index e9c1ec6..30633ef 100644
--- a/src/meson.build
+++ b/src/meson.build
@@ -15,6 +15,8 @@
 # You should have received a copy of the GNU Affero General Public License
 # along with ZLFO.  If not, see <https://www.gnu.org/licenses/>.
 
+inc_dirs = include_directories(['.', '..'])
+
 zlfo_dsp_lib = shared_library (
   'zlfo_dsp',
   name_prefix: '',
@@ -22,7 +24,7 @@ zlfo_dsp_lib = shared_library (
     'zlfo.c',
     ],
   dependencies: zlfo_deps,
-  include_directories: [ '.', '..' ],
+  include_directories: inc_dirs,
   install: true,
   install_dir: zlfodir,
   )
@@ -38,7 +40,7 @@ zlfo_ui_lib = shared_library (
     ztoolkit_dep,
     dependency('glib-2.0'),
     ],
-  include_directories: [ '.', '..' ],
+  include_directories: inc_dirs,
   install: true,
   install_dir: zlfodir,
   )
@@ -60,7 +62,7 @@ lv2_ttl_gen = executable (
   sources: [
     'zlfo_ttl_gen.c',
     ],
-  include_directories: [ '.', '..' ],
+  include_directories: inc_dirs,
   c_args: common_cflags,
   install: false,
   )
diff --git a/src/zlfo_common.h b/src/zlfo_common.h
index 903d5b5..cb472a8 100644
--- a/src/zlfo_common.h
+++ b/src/zlfo_common.h
@@ -30,12 +30,21 @@
 
 #include <string.h>
 
+/* use old style for now until distros catch up */
+#if 0
 #include "lv2/atom/atom.h"
 #include "lv2/atom/forge.h"
 #include "lv2/core/lv2.h"
 #include "lv2/log/log.h"
 #include "lv2/urid/urid.h"
 #include "lv2/time/time.h"
+#endif
+#include "lv2/lv2plug.in/ns/ext/atom/atom.h"
+#include "lv2/lv2plug.in/ns/ext/atom/forge.h"
+#include "lv2/lv2plug.in/ns/ext/log/log.h"
+#include "lv2/lv2plug.in/ns/ext/urid/urid.h"
+#include "lv2/lv2plug.in/ns/ext/time/time.h"
+#include "lv2/lv2plug.in/ns/lv2core/lv2.h"
 
 /** Min, max and default frequency. */
 #define MIN_FREQ 0.1f
diff --git a/src/zlfo_ui.c b/src/zlfo_ui.c
index 366e4da..c5e860e 100644
--- a/src/zlfo_ui.c
+++ b/src/zlfo_ui.c
@@ -46,13 +46,14 @@
 
 #include <cairo.h>
 
-#include <lv2/atom/atom.h>
-#include <lv2/atom/forge.h>
+/* use old style for now until distros catch up */
+#if 0
 #include <lv2/atom/util.h>
-#include <lv2/log/log.h>
-#include <lv2/patch/patch.h>
-#include <lv2/urid/urid.h>
 #include <lv2/ui/ui.h>
+#endif
+#include "lv2/lv2plug.in/ns/ext/atom/util.h"
+#include "lv2/lv2plug.in/ns/extensions/ui/ui.h"
+
 #include <ztoolkit/ztk.h>
 
 #define TITLE "ZLFO"