diff --git a/kx-control-input-port-change-request.lv2/control-input-port-change-request.h b/kx-control-input-port-change-request.lv2/control-input-port-change-request.h
index a0fc60e..9a06df8 100644
--- a/kx-control-input-port-change-request.lv2/control-input-port-change-request.h
+++ b/kx-control-input-port-change-request.lv2/control-input-port-change-request.h
@@ -1,6 +1,6 @@
 /*
   LV2 ControlInputPort change request extension
-  Copyright 2020 Filipe Coelho <falktx@falktx.com>
+  Copyright 2020-2026 Filipe Coelho <falktx@falktx.com>
 
   Permission to use, copy, modify, and/or distribute this software for any
   purpose with or without fee is hereby granted, provided that the above
@@ -23,8 +23,6 @@
 #ifndef LV2_CONTROL_INPUT_PORT_CHANGE_REQUEST_H
 #define LV2_CONTROL_INPUT_PORT_CHANGE_REQUEST_H
 
-#include "lv2/lv2plug.in/ns/lv2core/lv2.h"
-
 #define LV2_CONTROL_INPUT_PORT_CHANGE_REQUEST_URI    "http://kx.studio/ns/lv2ext/control-input-port-change-request"
 #define LV2_CONTROL_INPUT_PORT_CHANGE_REQUEST_PREFIX LV2_CONTROL_INPUT_PORT_CHANGE_REQUEST_URI "#"
 
diff --git a/kx-external-ui.lv2/external-ui.h b/kx-external-ui.lv2/external-ui.h
index f0216b6..ef05b6a 100755
--- a/kx-external-ui.lv2/external-ui.h
+++ b/kx-external-ui.lv2/external-ui.h
@@ -1,6 +1,6 @@
 /*
   LV2 External UI extension
-  Copyright 2020 Filipe Coelho <falktx@falktx.com>
+  Copyright 2020-2026 Filipe Coelho <falktx@falktx.com>
 
   Permission to use, copy, modify, and/or distribute this software for any
   purpose with or without fee is hereby granted, provided that the above
@@ -23,7 +23,11 @@
 #ifndef LV2_EXTERNAL_UI_H
 #define LV2_EXTERNAL_UI_H
 
+#if defined(__has_include) && __has_include("lv2/ui/ui.h")
+#include "lv2/ui/ui.h"
+#else
 #include "lv2/lv2plug.in/ns/extensions/ui/ui.h"
+#endif
 
 #define LV2_EXTERNAL_UI_URI     "http://kxstudio.sf.net/ns/lv2ext/external-ui"
 #define LV2_EXTERNAL_UI_PREFIX  LV2_EXTERNAL_UI_URI "#"
diff --git a/kx-programs.lv2/programs.h b/kx-programs.lv2/programs.h
index 0e2997d..d8f4fd0 100644
--- a/kx-programs.lv2/programs.h
+++ b/kx-programs.lv2/programs.h
@@ -1,6 +1,6 @@
 /*
   LV2 Programs Extension
-  Copyright 2012 Filipe Coelho <falktx@falktx.com>
+  Copyright 2012-2026 Filipe Coelho <falktx@falktx.com>
 
   Permission to use, copy, modify, and/or distribute this software for any
   purpose with or without fee is hereby granted, provided that the above
@@ -23,8 +23,13 @@
 #ifndef LV2_PROGRAMS_H
 #define LV2_PROGRAMS_H
 
+#if defined(__has_include) && __has_include("lv2/core/lv2.h")
+#include "lv2/core/lv2.h"
+#include "lv2/ui/ui.h"
+#else
 #include "lv2/lv2plug.in/ns/lv2core/lv2.h"
 #include "lv2/lv2plug.in/ns/extensions/ui/ui.h"
+#endif
 
 #define LV2_PROGRAMS_URI    "http://kxstudio.sf.net/ns/lv2ext/programs"
 #define LV2_PROGRAMS_PREFIX LV2_PROGRAMS_URI "#"