12 files changed, 21 insertions, 9 deletions
diff --git a/lv2/atom/atom.h b/lv2/atom/atom.h
index 06b9943..7ea0db7 100644
--- a/lv2/atom/atom.h
+++ b/lv2/atom/atom.h
@@ -28,7 +28,6 @@
 #ifndef LV2_ATOM_H
 #define LV2_ATOM_H
 
-#include <stddef.h>
 #include <stdint.h>
 
 #define LV2_ATOM_URI    "http://lv2plug.in/ns/ext/atom"  ///< http://lv2plug.in/ns/ext/atom
diff --git a/lv2/atom/forge.h b/lv2/atom/forge.h
index 037088a..b87d12f 100644
--- a/lv2/atom/forge.h
+++ b/lv2/atom/forge.h
@@ -58,6 +58,8 @@
 
 #include <assert.h>
 #include <stdbool.h>
+#include <stdint.h>
+#include <string.h>
 
 #ifdef __cplusplus
 extern "C" {
diff --git a/lv2/log/logger.h b/lv2/log/logger.h
index b66a8e4..6e89ac8 100644
--- a/lv2/log/logger.h
+++ b/lv2/log/logger.h
@@ -29,9 +29,10 @@
 #define LV2_ATOM_LOGGER_H
 
 #include "lv2/log/log.h"
+#include "lv2/urid/urid.h"
 
+#include <stdarg.h>
 #include <stdio.h>
-#include <string.h>
 
 #ifdef __cplusplus
 extern "C" {
diff --git a/lv2/resize-port/resize-port.h b/lv2/resize-port/resize-port.h
index a60626d..d3e1ebd 100644
--- a/lv2/resize-port/resize-port.h
+++ b/lv2/resize-port/resize-port.h
@@ -26,7 +26,6 @@
 #ifndef LV2_RESIZE_PORT_H
 #define LV2_RESIZE_PORT_H
 
-#include <stdbool.h>
 #include <stddef.h>
 #include <stdint.h>
 
diff --git a/lv2/state/state.h b/lv2/state/state.h
index 367ef23..9efb08a 100644
--- a/lv2/state/state.h
+++ b/lv2/state/state.h
@@ -31,7 +31,6 @@
 
 #include "lv2/core/lv2.h"
 
-#include <stdbool.h>
 #include <stddef.h>
 #include <stdint.h>
 
diff --git a/plugins/eg-fifths.lv2/uris.h b/plugins/eg-fifths.lv2/uris.h
index 04b09f6..54a723d 100644
--- a/plugins/eg-fifths.lv2/uris.h
+++ b/plugins/eg-fifths.lv2/uris.h
@@ -19,10 +19,9 @@
 #define FIFTHS_URIS_H
 
 #include "lv2/atom/atom.h"
-#include "lv2/log/log.h"
 #include "lv2/midi/midi.h"
 #include "lv2/patch/patch.h"
-#include "lv2/state/state.h"
+#include "lv2/urid/urid.h"
 
 #define EG_FIFTHS_URI "http://lv2plug.in/plugins/eg-fifths"
 
diff --git a/plugins/eg-params.lv2/state_map.h b/plugins/eg-params.lv2/state_map.h
index 9e7b63e..85358f8 100644
--- a/plugins/eg-params.lv2/state_map.h
+++ b/plugins/eg-params.lv2/state_map.h
@@ -19,6 +19,7 @@
 #include "lv2/urid/urid.h"
 
 #include <stdarg.h>
+#include <stdint.h>
 #include <stdlib.h>
 
 /** Entry in an array that serves as a dictionary of properties. */
diff --git a/plugins/eg-sampler.lv2/atom_sink.h b/plugins/eg-sampler.lv2/atom_sink.h
index b84ca55..659b767 100644
--- a/plugins/eg-sampler.lv2/atom_sink.h
+++ b/plugins/eg-sampler.lv2/atom_sink.h
@@ -14,7 +14,12 @@
   OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 */
 
+#include "lv2/atom/atom.h"
 #include "lv2/atom/forge.h"
+#include "lv2/atom/util.h"
+
+#include <stdint.h>
+#include <string.h>
 
 /**
    A forge sink that writes to an atom buffer.
diff --git a/plugins/eg-sampler.lv2/peaks.h b/plugins/eg-sampler.lv2/peaks.h
index 4a51cd7..f3d2f04 100644
--- a/plugins/eg-sampler.lv2/peaks.h
+++ b/plugins/eg-sampler.lv2/peaks.h
@@ -28,10 +28,16 @@
 #ifndef PEAKS_H_INCLUDED
 #define PEAKS_H_INCLUDED
 
+#include "lv2/atom/atom.h"
 #include "lv2/atom/forge.h"
+#include "lv2/atom/util.h"
+#include "lv2/urid/urid.h"
 
 #include <math.h>
+#include <stdbool.h>
+#include <stdint.h>
 #include <stdlib.h>
+#include <string.h>
 
 #define PEAKS_URI          "http://lv2plug.in/ns/peaks#"
 #define PEAKS__PeakUpdate  PEAKS_URI "PeakUpdate"
diff --git a/plugins/eg-sampler.lv2/sampler_ui.c b/plugins/eg-sampler.lv2/sampler_ui.c
index 2f4e435..8dddd4c 100644
--- a/plugins/eg-sampler.lv2/sampler_ui.c
+++ b/plugins/eg-sampler.lv2/sampler_ui.c
@@ -36,6 +36,7 @@
 #include <gobject/gclosure.h>
 #include <gtk/gtk.h>
 
+#include <assert.h>
 #include <stdbool.h>
 #include <stdint.h>
 #include <stdlib.h>
diff --git a/plugins/eg-sampler.lv2/uris.h b/plugins/eg-sampler.lv2/uris.h
index 57e5754..5837402 100644
--- a/plugins/eg-sampler.lv2/uris.h
+++ b/plugins/eg-sampler.lv2/uris.h
@@ -20,12 +20,13 @@
 
 #include "lv2/atom/atom.h"
 #include "lv2/atom/forge.h"
-#include "lv2/log/log.h"
+#include "lv2/atom/util.h"
 #include "lv2/midi/midi.h"
 #include "lv2/parameters/parameters.h"
 #include "lv2/patch/patch.h"
-#include "lv2/state/state.h"
+#include "lv2/urid/urid.h"
 
+#include <stdint.h>
 #include <stdio.h>
 
 #define EG_SAMPLER_URI          "http://lv2plug.in/plugins/eg-sampler"
diff --git a/plugins/eg-scope.lv2/uris.h b/plugins/eg-scope.lv2/uris.h
index 2ebaf4e..cba978f 100644
--- a/plugins/eg-scope.lv2/uris.h
+++ b/plugins/eg-scope.lv2/uris.h
@@ -18,7 +18,6 @@
 #define SCO_URIS_H
 
 #include "lv2/atom/atom.h"
-#include "lv2/atom/forge.h"
 #include "lv2/parameters/parameters.h"
 #include "lv2/urid/urid.h"