diff --git a/include/clap/clap.h b/include/clap/clap.h
index 868188b3..d20def5d 100644
--- a/include/clap/clap.h
+++ b/include/clap/clap.h
@@ -35,6 +35,7 @@
 #include "plugin.h"
 #include "plugin-features.h"
 #include "host.h"
+#include "plugin-id.h"
 
 #include "ext/audio-ports-activation.h"
 #include "ext/audio-ports-config.h"
diff --git a/include/clap/factory/preset-discovery.h b/include/clap/factory/preset-discovery.h
index 9164ff2b..48c70a14 100644
--- a/include/clap/factory/preset-discovery.h
+++ b/include/clap/factory/preset-discovery.h
@@ -93,17 +93,6 @@ typedef uint64_t clap_timestamp_t;
 // Value for unknown timestamp.
 static const clap_timestamp_t CLAP_TIMESTAMP_UNKNOWN = 0;
 
-// Pair of plugin ABI and plugin identifier
-typedef struct clap_plugin_id {
-   // The plugin ABI name, in lowercase.
-   // eg: "clap"
-   const char *abi;
-
-   // The plugin ID, for example "com.u-he.Diva".
-   // If the ABI rely upon binary plugin ids, then they shall be hex encoded (lower case).
-   const char *id;
-} clap_plugin_id_t;
-
 // Receiver that receives the metadata for a single preset file.
 // The host would define the various callbacks in this interface and the preset parser function
 // would then call them.
diff --git a/include/clap/plugin-id.h b/include/clap/plugin-id.h
new file mode 100644
index 00000000..962eab8f
--- /dev/null
+++ b/include/clap/plugin-id.h
@@ -0,0 +1,13 @@
+#pragma once
+
+// Pair of plugin ABI and plugin identifier.
+typedef struct clap_plugin_id {
+   // The plugin ABI name, in lowercase.
+   // eg: "clap"
+   const char *abi;
+
+   // The plugin ID, for example "com.u-he.Diva".
+   // If the ABI rely upon binary plugin ids, then they shall be hex encoded (lower case).
+   const char *id;
+} clap_plugin_id_t;
+