5 files changed, 31 insertions, 26 deletions
diff --git a/plugins/eg-sampler.lv2/atom_sink.h b/plugins/eg-sampler.lv2/atom_sink.h
index ae3df30..b84ca55 100644
--- a/plugins/eg-sampler.lv2/atom_sink.h
+++ b/plugins/eg-sampler.lv2/atom_sink.h
@@ -14,6 +14,8 @@
   OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 */
 
+#include "lv2/atom/forge.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 e3002c2..a5bd267 100644
--- a/plugins/eg-sampler.lv2/peaks.h
+++ b/plugins/eg-sampler.lv2/peaks.h
@@ -28,10 +28,11 @@
 #ifndef PEAKS_H_INCLUDED
 #define PEAKS_H_INCLUDED
 
-#include <math.h>
-
 #include "lv2/atom/forge.h"
 
+#include <math.h>
+#include <stdlib.h>
+
 #define PEAKS_URI          "http://lv2plug.in/ns/peaks#"
 #define PEAKS__PeakUpdate  PEAKS_URI "PeakUpdate"
 #define PEAKS__magnitudes  PEAKS_URI "magnitudes"
diff --git a/plugins/eg-sampler.lv2/sampler.c b/plugins/eg-sampler.lv2/sampler.c
index 369fc1e..4e6afdf 100644
--- a/plugins/eg-sampler.lv2/sampler.c
+++ b/plugins/eg-sampler.lv2/sampler.c
@@ -17,14 +17,9 @@
   OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 */
 
-#include <math.h>
-#include <stdbool.h>
-#include <stdint.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-
-#include <sndfile.h>
+#include "atom_sink.h"
+#include "peaks.h"
+#include "uris.h"
 
 #include "lv2/atom/atom.h"
 #include "lv2/atom/forge.h"
@@ -38,9 +33,14 @@
 #include "lv2/urid/urid.h"
 #include "lv2/worker/worker.h"
 
-#include "atom_sink.h"
-#include "peaks.h"
-#include "uris.h"
+#include <sndfile.h>
+
+#include <math.h>
+#include <stdbool.h>
+#include <stdint.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
 
 enum {
 	SAMPLER_CONTROL = 0,
diff --git a/plugins/eg-sampler.lv2/sampler_ui.c b/plugins/eg-sampler.lv2/sampler_ui.c
index e52d679..89bca2f 100644
--- a/plugins/eg-sampler.lv2/sampler_ui.c
+++ b/plugins/eg-sampler.lv2/sampler_ui.c
@@ -15,17 +15,8 @@
   OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 */
 
-#include <stdbool.h>
-#include <stdint.h>
-#include <stdlib.h>
-#include <string.h>
-
-#include <cairo.h>
-#include <gdk/gdk.h>
-#include <glib-object.h>
-#include <glib.h>
-#include <gobject/gclosure.h>
-#include <gtk/gtk.h>
+#include "peaks.h"
+#include "uris.h"
 
 #include "lv2/atom/atom.h"
 #include "lv2/atom/forge.h"
@@ -38,8 +29,17 @@
 #include "lv2/ui/ui.h"
 #include "lv2/urid/urid.h"
 
-#include "peaks.h"
-#include "uris.h"
+#include <cairo.h>
+#include <gdk/gdk.h>
+#include <glib-object.h>
+#include <glib.h>
+#include <gobject/gclosure.h>
+#include <gtk/gtk.h>
+
+#include <stdbool.h>
+#include <stdint.h>
+#include <stdlib.h>
+#include <string.h>
 
 #define SAMPLER_UI_URI "http://lv2plug.in/plugins/eg-sampler#ui"
 
diff --git a/plugins/eg-sampler.lv2/uris.h b/plugins/eg-sampler.lv2/uris.h
index 659d400..b3639bc 100644
--- a/plugins/eg-sampler.lv2/uris.h
+++ b/plugins/eg-sampler.lv2/uris.h
@@ -24,6 +24,8 @@
 #include "lv2/patch/patch.h"
 #include "lv2/state/state.h"
 
+#include <stdio.h>
+
 #define EG_SAMPLER_URI          "http://lv2plug.in/plugins/eg-sampler"
 #define EG_SAMPLER__applySample EG_SAMPLER_URI "#applySample"
 #define EG_SAMPLER__freeSample  EG_SAMPLER_URI "#freeSample"