diff --git a/include/clap/helpers/host.hh b/include/clap/helpers/host.hh
index 4d5a11a..71f3b74 100644
--- a/include/clap/helpers/host.hh
+++ b/include/clap/helpers/host.hh
@@ -2,7 +2,7 @@
 
 #include <string>
 
-#include <clap/clap.h>
+#include <clap/all.h>
 
 #include "version-check.hh"
 
diff --git a/include/clap/helpers/preset-discovery-metadata-receiver.hh b/include/clap/helpers/preset-discovery-metadata-receiver.hh
index 73d337f..9fe3b80 100644
--- a/include/clap/helpers/preset-discovery-metadata-receiver.hh
+++ b/include/clap/helpers/preset-discovery-metadata-receiver.hh
@@ -36,7 +36,7 @@ namespace clap { namespace helpers {
 
       virtual bool beginPreset(const char *name, const char *load_key) noexcept { return false; }
 
-      virtual void addPluginId(const clap_plugin_id_t *plugin_id) noexcept {}
+      virtual void addPluginId(const clap_universal_plugin_id *plugin_id) noexcept {}
 
       virtual void setCollectionId(const char *collection_id) noexcept {}
 
@@ -46,8 +46,8 @@ namespace clap { namespace helpers {
 
       virtual void setDescription(const char *description) noexcept {}
 
-      virtual void setTimestamps(clap_timestamp_t creation_time,
-                                 clap_timestamp_t modification_time) noexcept {}
+      virtual void setTimestamps(clap_timestamp creation_time,
+                                 clap_timestamp modification_time) noexcept {}
 
       virtual void addFeature(const char *feature) noexcept {}
 
@@ -77,7 +77,7 @@ namespace clap { namespace helpers {
 
       static void
       receiverAddPluginId(const struct clap_preset_discovery_metadata_receiver *receiver,
-                          const clap_plugin_id_t *plugin_id) noexcept;
+                          const clap_universal_plugin_id *plugin_id) noexcept;
 
       static void
       receiverSetCollectionId(const struct clap_preset_discovery_metadata_receiver *receiver,
@@ -95,8 +95,8 @@ namespace clap { namespace helpers {
 
       static void
       receiverSetTimestamps(const struct clap_preset_discovery_metadata_receiver *receiver,
-                            clap_timestamp_t creation_time,
-                            clap_timestamp_t modification_time) noexcept;
+                            clap_timestamp creation_time,
+                            clap_timestamp modification_time) noexcept;
 
       static void receiverAddFeature(const struct clap_preset_discovery_metadata_receiver *receiver,
                                      const char *feature) noexcept;
diff --git a/include/clap/helpers/preset-discovery-metadata-receiver.hxx b/include/clap/helpers/preset-discovery-metadata-receiver.hxx
index a9a96a3..4efca70 100644
--- a/include/clap/helpers/preset-discovery-metadata-receiver.hxx
+++ b/include/clap/helpers/preset-discovery-metadata-receiver.hxx
@@ -49,7 +49,7 @@ namespace clap { namespace helpers {
    template <MisbehaviourHandler h, CheckingLevel l>
    void PresetDiscoveryMetadataReceiver<h, l>::receiverAddPluginId(
       const struct clap_preset_discovery_metadata_receiver *receiver,
-      const clap_plugin_id_t *plugin_id) noexcept {
+      const clap_universal_plugin_id *plugin_id) noexcept {
       auto &self = from(receiver);
       return self.addPluginId(plugin_id);
    }
@@ -88,8 +88,8 @@ namespace clap { namespace helpers {
    template <MisbehaviourHandler h, CheckingLevel l>
    void PresetDiscoveryMetadataReceiver<h, l>::receiverSetTimestamps(
       const struct clap_preset_discovery_metadata_receiver *receiver,
-      clap_timestamp_t creation_time,
-      clap_timestamp_t modification_time) noexcept {
+      clap_timestamp creation_time,
+      clap_timestamp modification_time) noexcept {
       auto &self = from(receiver);
       return self.setTimestamps(creation_time, modification_time);
    }