14 files changed, 53 insertions, 31 deletions
diff --git a/src/collections.c b/src/collections.c
index 83c98f3..df84581 100644
--- a/src/collections.c
+++ b/src/collections.c
@@ -16,13 +16,12 @@
  * 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
-#define _XOPEN_SOURCE 500
+#include <glib.h>
 
-#include <string.h>
-#include <limits.h>
 #include "slv2/collections.h"
 #include "slv2/pluginclass.h"
 #include "slv2/pluginui.h"
+#include "slv2/value.h"
 #include "slv2_internal.h"
 
 /* ARRAYS */
diff --git a/src/plugin.c b/src/plugin.c
index 279c657..9c13d06 100644
--- a/src/plugin.c
+++ b/src/plugin.c
@@ -22,13 +22,15 @@
 #include <math.h>
 #include <stdlib.h>
 #include <string.h>
+
 #ifdef SLV2_DYN_MANIFEST
 #include <dlfcn.h>
 #endif
-#include "slv2/types.h"
+
 #include "slv2/collections.h"
 #include "slv2/plugin.h"
 #include "slv2/pluginclass.h"
+#include "slv2/types.h"
 #include "slv2/util.h"
 #include "slv2_internal.h"
 
diff --git a/src/pluginclass.c b/src/pluginclass.c
index 4aef8f4..9780e8a 100644
--- a/src/pluginclass.c
+++ b/src/pluginclass.c
@@ -21,8 +21,9 @@
 #include <assert.h>
 #include <stdlib.h>
 #include <string.h>
-#include "slv2/types.h"
+
 #include "slv2/pluginclass.h"
+#include "slv2/types.h"
 #include "slv2/value.h"
 #include "slv2_internal.h"
 
diff --git a/src/plugininstance.c b/src/plugininstance.c
index 7416dc3..b0402a7 100644
--- a/src/plugininstance.c
+++ b/src/plugininstance.c
@@ -18,10 +18,11 @@
 
 #define _XOPEN_SOURCE 500
 
+#include <assert.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
-#include <assert.h>
+
 #include "slv2/plugin.h"
 #include "slv2/plugininstance.h"
 #include "slv2/types.h"
diff --git a/src/plugins.c b/src/plugins.c
index 30bc076..2f0598a 100644
--- a/src/plugins.c
+++ b/src/plugins.c
@@ -17,14 +17,15 @@
  */
 
 #define _XOPEN_SOURCE 500
-#include <string.h>
-#include <limits.h>
+
+#include <assert.h>
 #include <stdio.h>
 #include <stdlib.h>
-#include <assert.h>
-#include "slv2/types.h"
-#include "slv2/plugin.h"
+#include <string.h>
+
 #include "slv2/collections.h"
+#include "slv2/plugin.h"
+#include "slv2/types.h"
 #include "slv2/util.h"
 #include "slv2_internal.h"
 
diff --git a/src/pluginui.c b/src/pluginui.c
index 8778d3a..f5a05f1 100644
--- a/src/pluginui.c
+++ b/src/pluginui.c
@@ -19,11 +19,12 @@
 #define _XOPEN_SOURCE 500
 
 #include <assert.h>
-#include <string.h>
 #include <stdlib.h>
+#include <string.h>
+
 #include "slv2/collections.h"
-#include "slv2/types.h"
 #include "slv2/pluginui.h"
+#include "slv2/types.h"
 #include "slv2_internal.h"
 
 SLV2UI
diff --git a/src/pluginuiinstance.c b/src/pluginuiinstance.c
index 3fee84b..852e394 100644
--- a/src/pluginuiinstance.c
+++ b/src/pluginuiinstance.c
@@ -19,15 +19,17 @@
 
 #define _XOPEN_SOURCE 500
 
+#include <assert.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
-#include <assert.h>
+
 #include <dlfcn.h>
-#include "slv2/types.h"
+
 #include "slv2/plugin.h"
 #include "slv2/pluginui.h"
 #include "slv2/pluginuiinstance.h"
+#include "slv2/types.h"
 #include "slv2/util.h"
 #include "slv2_internal.h"
 
diff --git a/src/port.c b/src/port.c
index fd44512..04231c3 100644
--- a/src/port.c
+++ b/src/port.c
@@ -17,14 +17,16 @@
  */
 
 #define _XOPEN_SOURCE 500
+
 #include <assert.h>
-#include <stdlib.h>
+#include <limits.h>
 #include <stdio.h>
+#include <stdlib.h>
 #include <string.h>
-#include <limits.h>
-#include "slv2/types.h"
+
 #include "slv2/collections.h"
 #include "slv2/port.h"
+#include "slv2/types.h"
 #include "slv2/util.h"
 #include "slv2_internal.h"
 
diff --git a/src/query.c b/src/query.c
index 4e60b41..dad639b 100644
--- a/src/query.c
+++ b/src/query.c
@@ -17,13 +17,15 @@
  */
 
 #define _XOPEN_SOURCE 500
+
 #include <assert.h>
 #include <limits.h>
 #include <stdlib.h>
 #include <string.h>
-#include "slv2/types.h"
+
 #include "slv2/collections.h"
 #include "slv2/plugin.h"
+#include "slv2/types.h"
 #include "slv2/util.h"
 #include "slv2_internal.h"
 
diff --git a/src/scalepoint.c b/src/scalepoint.c
index 55056c8..3b4ea37 100644
--- a/src/scalepoint.c
+++ b/src/scalepoint.c
@@ -18,10 +18,12 @@
 
 #define _XOPEN_SOURCE 500
 
+#include <assert.h>
 #include <stdlib.h>
 #include <string.h>
-#include <assert.h>
+
 #include <glib.h>
+
 #include "slv2/scalepoint.h"
 #include "slv2/types.h"
 #include "slv2/value.h"
diff --git a/src/slv2_internal.h b/src/slv2_internal.h
index 55f5b93..f8ba415 100644
--- a/src/slv2_internal.h
+++ b/src/slv2_internal.h
@@ -29,17 +29,21 @@ extern "C" {
 #include <stddef.h>
 #include <stdint.h>
 #include <stdlib.h>
-#include <inttypes.h>
+
 #include <dlfcn.h>
+
 #include <glib.h>
+
 #include "serd/serd.h"
 #include "sord/sord.h"
-#include "slv2/types.h"
-#include "slv2/lv2_ui.h"
+
 #ifdef SLV2_DYN_MANIFEST
 #include "lv2/lv2plug.in/ns/ext/dyn-manifest/dyn-manifest.h"
 #endif
 
+#include "slv2/types.h"
+#include "slv2/lv2_ui.h"
+
 #define SLV2_NS_DOAP (const uint8_t*)"http://usefulinc.com/ns/doap#"
 #define SLV2_NS_RDFS (const uint8_t*)"http://www.w3.org/2000/01/rdf-schema#"
 #define SLV2_NS_SLV2 (const uint8_t*)"http://drobilla.net/ns/slv2#"
diff --git a/src/util.c b/src/util.c
index bcb5e6c..f1295f0 100644
--- a/src/util.c
+++ b/src/util.c
@@ -18,10 +18,10 @@
 
 #define _XOPEN_SOURCE 500
 
-#include <stdlib.h>
-#include <string.h>
 #include <assert.h>
 #include <stdarg.h>
+#include <stdlib.h>
+#include <string.h>
 
 #include "slv2/util.h"
 #include "slv2_internal.h"
diff --git a/src/value.c b/src/value.c
index 6e11004..e08b7fd 100644
--- a/src/value.c
+++ b/src/value.c
@@ -18,11 +18,13 @@
 
 #define _XOPEN_SOURCE 500
 
-#include <stdlib.h>
-#include <string.h>
 #include <assert.h>
 #include <locale.h>
+#include <stdlib.h>
+#include <string.h>
+
 #include <glib.h>
+
 #include "slv2/types.h"
 #include "slv2/value.h"
 #include "slv2_internal.h"
diff --git a/src/world.c b/src/world.c
index d7dbd9d..d9e46cd 100644
--- a/src/world.c
+++ b/src/world.c
@@ -17,18 +17,21 @@
  */
 
 #define _XOPEN_SOURCE 500
+
 #include <stdlib.h>
+#include <string.h>
+
 #include <dirent.h>
 #include <wordexp.h>
-#include <string.h>
 #ifdef SLV2_DYN_MANIFEST
 #include <dlfcn.h>
 #endif
-#include "slv2/types.h"
-#include "slv2/world.h"
+
+#include "slv2-config.h"
 #include "slv2/slv2.h"
+#include "slv2/types.h"
 #include "slv2/util.h"
-#include "slv2-config.h"
+#include "slv2/world.h"
 #include "slv2_internal.h"
 
 static void