diff --git a/ChangeLog.md b/ChangeLog.md
index 0584239a..6aa544f5 100644
--- a/ChangeLog.md
+++ b/ChangeLog.md
@@ -43,6 +43,10 @@ Note: we kept the last draft factory ID in order to not break plugins already us
 
 * [plugin-template.c](src/plugin-template.c): implement thread-safe plugin entry init counter
 
+## Organization
+
+* `clap.h` no longer includes headers from `ext/draft` or `factory/draft`. Draft extension and factory headers must now be explicitly included, either individually or via the `draft.h` header.
+
 # Changes in 1.1.10
 
 * [params.h](include/clap/ext/params.h): add `CLAP_PARAM_IS_ENUM` flag.
diff --git a/include/clap/clap.h b/include/clap/clap.h
index ad95ff33..a9874878 100644
--- a/include/clap/clap.h
+++ b/include/clap/clap.h
@@ -30,9 +30,6 @@
 #include "factory/plugin-factory.h"
 #include "factory/preset-discovery.h"
 
-#include "factory/draft/plugin-invalidation.h"
-#include "factory/draft/plugin-state-converter.h"
-
 #include "plugin.h"
 #include "plugin-features.h"
 #include "host.h"
@@ -64,10 +61,3 @@
 #include "ext/timer-support.h"
 #include "ext/track-info.h"
 #include "ext/voice-info.h"
-
-#include "ext/draft/ambisonic.h"
-#include "ext/draft/cv.h"
-#include "ext/draft/resource-directory.h"
-#include "ext/draft/triggers.h"
-#include "ext/draft/tuning.h"
-#include "ext/draft/extensible-audio-ports.h"
diff --git a/include/clap/draft.h b/include/clap/draft.h
new file mode 100644
index 00000000..7d5f6a34
--- /dev/null
+++ b/include/clap/draft.h
@@ -0,0 +1,12 @@
+#pragma once
+
+#include "factory/draft/plugin-invalidation.h"
+#include "factory/draft/plugin-state-converter.h"
+
+#include "ext/draft/ambisonic.h"
+#include "ext/draft/cv.h"
+#include "ext/draft/midi-mappings.h"
+#include "ext/draft/resource-directory.h"
+#include "ext/draft/triggers.h"
+#include "ext/draft/tuning.h"
+#include "ext/draft/extensible-audio-ports.h"
diff --git a/src/main.c b/src/main.c
index c1d6f593..f4db6b79 100644
--- a/src/main.c
+++ b/src/main.c
@@ -1,4 +1,5 @@
 #include <clap/clap.h>
+#include <clap/draft.h>
 
 // The purpose of this file is to check that all headers compile
 int main(int argc, char **argv) {
diff --git a/src/main.cc b/src/main.cc
index 80febfba..1071d67d 100644
--- a/src/main.cc
+++ b/src/main.cc
@@ -1,4 +1,5 @@
 #include <clap/clap.h>
+#include <clap/draft.h>
 
 // The purpose of this file is to check that all headers compile