Clean up includes

Sorts includes from local to global (which catches errors) and fixes missing
includes found by the resulting breakage and include-what-you-use.

46 files changed, 316 insertions, 145 deletions

diff --git a/bindings/test/bindings_test_plugin.c b/bindings/test/bindings_test_plugin.c
index 3d6c763..8518117 100644
--- a/bindings/test/bindings_test_plugin.c
+++ b/bindings/test/bindings_test_plugin.c
@@ -15,10 +15,6 @@
   OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 */
 
-/** Include standard C headers */
-#include <math.h>
-#include <stdlib.h>
-
 /**
    LV2 headers are based on the URI of the specification they come from, so a
    consistent convention can be used even for unofficial extensions.  The URI
@@ -28,6 +24,10 @@
 */
 #include "lv2/lv2plug.in/ns/lv2core/lv2.h"
 
+/** Include standard C headers */
+#include <math.h>
+#include <stdlib.h>
+
 /**
    The URI is the identifier for a plugin, and how the host associates this
    implementation in code with its description in data.  In this plugin it is
diff --git a/lilv/lilv.h b/lilv/lilv.h
index 1ed219c..1f880d5 100644
--- a/lilv/lilv.h
+++ b/lilv/lilv.h
@@ -21,14 +21,15 @@
 #ifndef LILV_LILV_H
 #define LILV_LILV_H
 
+#include "lv2/lv2plug.in/ns/ext/urid/urid.h"
+#include "lv2/lv2plug.in/ns/lv2core/lv2.h"
+
 #include <stdarg.h>
+#include <stdbool.h>
 #include <stddef.h>
 #include <stdint.h>
 #include <stdio.h>
 
-#include "lv2/lv2plug.in/ns/lv2core/lv2.h"
-#include "lv2/lv2plug.in/ns/ext/urid/urid.h"
-
 #ifdef LILV_SHARED
 #    ifdef _WIN32
 #        define LILV_LIB_IMPORT __declspec(dllimport)
@@ -53,8 +54,6 @@
 
 #ifdef __cplusplus
 extern "C" {
-#else
-#   include <stdbool.h>
 #endif
 
 #define LILV_NS_DOAP "http://usefulinc.com/ns/doap#"
diff --git a/src/collections.c b/src/collections.c
index 9ded845..64a8ab2 100644
--- a/src/collections.c
+++ b/src/collections.c
@@ -16,6 +16,15 @@
 
 #include "lilv_internal.h"
 
+#include "lilv/lilv.h"
+#include "sord/sord.h"
+#include "zix/common.h"
+#include "zix/tree.h"
+
+#include <stdbool.h>
+#include <stddef.h>
+#include <stdint.h>
+
 int
 lilv_ptr_cmp(const void* a, const void* b, void* user_data)
 {
diff --git a/src/instance.c b/src/instance.c
index 030c6ff..ba71e81 100644
--- a/src/instance.c
+++ b/src/instance.c
@@ -14,12 +14,17 @@
   OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 */
 
+#include "lilv_internal.h"
+
+#include "lv2/lv2plug.in/ns/lv2core/lv2.h"
+#include "lilv/lilv.h"
+
+#include <stdbool.h>
+#include <stdint.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
 
-#include "lilv_internal.h"
-
 LILV_API LilvInstance*
 lilv_plugin_instantiate(const LilvPlugin*        plugin,
                         double                   sample_rate,
diff --git a/src/lib.c b/src/lib.c
index 73e57bb..b212506 100644
--- a/src/lib.c
+++ b/src/lib.c
@@ -16,6 +16,14 @@
 
 #include "lilv_internal.h"
 
+#include "lilv/lilv.h"
+#include "lv2/lv2plug.in/ns/lv2core/lv2.h"
+#include "zix/tree.h"
+
+#include <dlfcn.h>
+#include <stdint.h>
+#include <stdlib.h>
+
 LilvLib*
 lilv_lib_open(LilvWorld*               world,
               const LilvNode*          uri,
diff --git a/src/lilv_internal.h b/src/lilv_internal.h
index 426eaaf..baf4a02 100644
--- a/src/lilv_internal.h
+++ b/src/lilv_internal.h
@@ -21,10 +21,17 @@
 extern "C" {
 #endif
 
+#include "lilv_config.h"
+
+#include "lilv/lilv.h"
+#include "serd/serd.h"
+#include "sord/sord.h"
+#include "zix/tree.h"
+
+#include <float.h>
 #include <stddef.h>
 #include <stdint.h>
 #include <stdlib.h>
-#include <float.h>
 
 #ifdef _WIN32
 #    include <windows.h>
@@ -52,14 +59,6 @@ static inline const char* dlerror(void) { return "Unknown error"; }
 #    include <unistd.h>
 #endif
 
-#include "serd/serd.h"
-#include "sord/sord.h"
-
-#include "zix/tree.h"
-
-#include "lilv_config.h"
-#include "lilv/lilv.h"
-
 #ifdef LILV_DYN_MANIFEST
 #    include "lv2/lv2plug.in/ns/ext/dynmanifest/dynmanifest.h"
 #endif
diff --git a/src/node.c b/src/node.c
index 5605177..6079919 100644
--- a/src/node.c
+++ b/src/node.c
@@ -14,13 +14,19 @@
   OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 */
 
+#include "lilv_internal.h"
+
+#include "lilv/lilv.h"
+#include "serd/serd.h"
+#include "sord/sord.h"
+
 #include <math.h>
+#include <stdbool.h>
+#include <stdint.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
 
-#include "lilv_internal.h"
-
 static void
 lilv_node_set_numerics_from_string(LilvNode* val)
 {
diff --git a/src/plugin.c b/src/plugin.c
index 0575b32..da39d0e 100644
--- a/src/plugin.c
+++ b/src/plugin.c
@@ -16,19 +16,30 @@
 
 #define __STDC_LIMIT_MACROS
 
-#include <assert.h>
+#include "lilv_config.h"
+#include "lilv_internal.h"
+
+#include "lilv/lilv.h"
+#include "serd/serd.h"
+#include "sord/sord.h"
+#include "zix/tree.h"
+
+#include "lv2/lv2plug.in/ns/extensions/ui/ui.h"
+#include "lv2/lv2plug.in/ns/lv2core/lv2.h"
+
+#ifdef LILV_DYN_MANIFEST
+#    include "lv2/lv2plug.in/ns/ext/dynmanifest/dynmanifest.h"
+#    include <dlfcn.h>
+#endif
+
 #include <math.h>
 #include <stdarg.h>
+#include <stdbool.h>
 #include <stdint.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
 
-#include "lilv_config.h"
-#include "lilv_internal.h"
-
-#include "lv2/lv2plug.in/ns/extensions/ui/ui.h"
-
 #define NS_DOAP (const uint8_t*)"http://usefulinc.com/ns/doap#"
 #define NS_FOAF (const uint8_t*)"http://xmlns.com/foaf/0.1/"
 
diff --git a/src/pluginclass.c b/src/pluginclass.c
index 622ff8f..ef2efe7 100644
--- a/src/pluginclass.c
+++ b/src/pluginclass.c
@@ -14,11 +14,15 @@
   OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 */
 
-#include <stdlib.h>
-#include <string.h>
-
 #include "lilv_internal.h"
 
+#include "lilv/lilv.h"
+#include "sord/sord.h"
+#include "zix/tree.h"
+
+#include <stdbool.h>
+#include <stdlib.h>
+
 LilvPluginClass*
 lilv_plugin_class_new(LilvWorld*      world,
                       const SordNode* parent_node,
diff --git a/src/port.c b/src/port.c
index fcc32fc..8e2812a 100644
--- a/src/port.c
+++ b/src/port.c
@@ -14,16 +14,21 @@
   OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 */
 
-#include <assert.h>
-#include <limits.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
+#include "lilv_internal.h"
 
 #include "lv2/lv2plug.in/ns/ext/atom/atom.h"
 #include "lv2/lv2plug.in/ns/ext/event/event.h"
+#include "lv2/lv2plug.in/ns/lv2core/lv2.h"
 
-#include "lilv_internal.h"
+#include "lilv/lilv.h"
+#include "sord/sord.h"
+#include "zix/tree.h"
+
+#include <assert.h>
+#include <stdbool.h>
+#include <stdint.h>
+#include <stdio.h>
+#include <stdlib.h>
 
 LilvPort*
 lilv_port_new(LilvWorld*      world,
diff --git a/src/query.c b/src/query.c
index fe2988f..29ad96e 100644
--- a/src/query.c
+++ b/src/query.c
@@ -14,12 +14,15 @@
   OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 */
 
-#include <limits.h>
+#include "lilv_internal.h"
+
+#include "lilv/lilv.h"
+#include "sord/sord.h"
+#include "zix/tree.h"
+
 #include <stdlib.h>
 #include <string.h>
 
-#include "lilv_internal.h"
-
 typedef enum {
 	LILV_LANG_MATCH_NONE,     ///< Language does not match at all
 	LILV_LANG_MATCH_PARTIAL,  ///< Partial (language, but not country) match
diff --git a/src/scalepoint.c b/src/scalepoint.c
index 349b2b3..bcda54e 100644
--- a/src/scalepoint.c
+++ b/src/scalepoint.c
@@ -16,6 +16,10 @@
 
 #include "lilv_internal.h"
 
+#include "lilv/lilv.h"
+
+#include <stdlib.h>
+
 /** Ownership of value and label is taken */
 LilvScalePoint*
 lilv_scale_point_new(LilvNode* value, LilvNode* label)
diff --git a/src/state.c b/src/state.c
index 4fc7e43..4ce4abd 100644
--- a/src/state.c
+++ b/src/state.c
@@ -14,18 +14,29 @@
   OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 */
 
-#include <errno.h>
-#include <stdio.h>
-#include <string.h>
+#include "lilv_internal.h"
+
+#include "lilv/lilv.h"
+#include "serd/serd.h"
+#include "sord/sord.h"
+#include "sratom/sratom.h"
+#include "zix/tree.h"
 
 #include "lv2/lv2plug.in/ns/ext/atom/atom.h"
 #include "lv2/lv2plug.in/ns/ext/atom/forge.h"
 #include "lv2/lv2plug.in/ns/ext/presets/presets.h"
 #include "lv2/lv2plug.in/ns/ext/state/state.h"
+#include "lv2/lv2plug.in/ns/ext/urid/urid.h"
+#include "lv2/lv2plug.in/ns/lv2core/lv2.h"
 
-#include "lilv_config.h"
-#include "lilv_internal.h"
-#include "sratom/sratom.h"
+#include <assert.h>
+#include <errno.h>
+#include <stdbool.h>
+#include <stdint.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+#include <unistd.h>
 
 #define USTR(s) ((const uint8_t*)(s))
 
diff --git a/src/ui.c b/src/ui.c
index e3a9b2b..8a2858f 100644
--- a/src/ui.c
+++ b/src/ui.c
@@ -14,12 +14,16 @@
   OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 */
 
+#include "lilv_internal.h"
+
+#include "lilv/lilv.h"
+#include "zix/tree.h"
+
 #include <assert.h>
+#include <stdbool.h>
 #include <stdlib.h>
 #include <string.h>
 
-#include "lilv_internal.h"
-
 LilvUI*
 lilv_ui_new(LilvWorld* world,
             LilvNode* uri,
diff --git a/src/util.c b/src/util.c
index e896d65..e105ec3 100644
--- a/src/util.c
+++ b/src/util.c
@@ -22,13 +22,11 @@
 #    define _DARWIN_C_SOURCE 1  /* for flock */
 #endif
 
-#include <ctype.h>
-#include <errno.h>
-#include <stdarg.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-#include <stddef.h>
+#include "lilv_config.h"
+#include "lilv_internal.h"
+
+#include "lilv/lilv.h"
+#include "serd/serd.h"
 
 #ifdef _WIN32
 #ifndef _WIN32_WINNT
@@ -56,19 +54,26 @@ CreateSymbolicLink(LPCTSTR linkpath, LPCTSTR targetpath, DWORD flags)
 #    endif
 #else
 #    include <dirent.h>
-#    include <limits.h>
 #    include <unistd.h>
 #endif
 
-#include <sys/stat.h>
-#include <sys/types.h>
-
-#include "lilv_internal.h"
-
 #if defined(HAVE_FLOCK) && defined(HAVE_FILENO)
 #    include <sys/file.h>
 #endif
 
+#include <sys/stat.h>
+#include <sys/types.h>
+
+#include <ctype.h>
+#include <errno.h>
+#include <stdarg.h>
+#include <stdbool.h>
+#include <stddef.h>
+#include <stdint.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+
 #ifndef PAGE_SIZE
 #    define PAGE_SIZE 4096
 #endif
diff --git a/src/world.c b/src/world.c
index 1858569..d0302e4 100644
--- a/src/world.c
+++ b/src/world.c
@@ -14,14 +14,29 @@
   OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 */
 
-#include <assert.h>
-#include <errno.h>
-#include <stdlib.h>
-#include <string.h>
+#include "lilv_config.h"
+#include "lilv_internal.h"
+
+#include "lilv/lilv.h"
+#include "serd/serd.h"
+#include "sord/sord.h"
+#include "zix/common.h"
+#include "zix/tree.h"
 
 #include "lv2/lv2plug.in/ns/ext/presets/presets.h"
+#include "lv2/lv2plug.in/ns/lv2core/lv2.h"
 
-#include "lilv_internal.h"
+#ifdef LILV_DYN_MANIFEST
+#    include "lv2/lv2plug.in/ns/ext/dynmanifest/dynmanifest.h"
+#    include <dlfcn.h>
+#endif
+
+#include <assert.h>
+#include <stdbool.h>
+#include <stdlib.h>
+#include <string.h>
+#include <stdint.h>
+#include <stdio.h>
 
 static int
 lilv_world_drop_graph(LilvWorld* world, const SordNode* graph);
diff --git a/src/zix/tree.c b/src/zix/tree.c
index 1646709..b6fdd2a 100644
--- a/src/zix/tree.c
+++ b/src/zix/tree.c
@@ -14,15 +14,14 @@
   OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 */
 
+#include "zix/common.h"
+#include "zix/tree.h"
+
 #include <assert.h>
 #include <stdint.h>
-#include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
 
-#include "zix/common.h"
-#include "zix/tree.h"
-
 typedef struct ZixTreeNodeImpl ZixTreeNode;
 
 struct ZixTreeImpl {
diff --git a/src/zix/tree.h b/src/zix/tree.h
index e531a9b..79177d0 100644
--- a/src/zix/tree.h
+++ b/src/zix/tree.h
@@ -17,10 +17,11 @@
 #ifndef ZIX_TREE_H
 #define ZIX_TREE_H
 
-#include <stddef.h>
-
 #include "zix/common.h"
 
+#include <stdbool.h>
+#include <stddef.h>
+
 #ifdef __cplusplus
 extern "C" {
 #endif
diff --git a/test/bad_syntax.lv2/bad_syntax.c b/test/bad_syntax.lv2/bad_syntax.c
index 52620bd..5d65fa7 100644
--- a/test/bad_syntax.lv2/bad_syntax.c
+++ b/test/bad_syntax.lv2/bad_syntax.c
@@ -15,10 +15,11 @@
   OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 */
 
-#include <stdlib.h>
-
 #include "lv2/lv2plug.in/ns/lv2core/lv2.h"
 
+#include <stdint.h>
+#include <stdlib.h>
+
 #define PLUGIN_URI "http://example.org/bad-syntax"
 
 enum {
diff --git a/test/bad_syntax.lv2/test_bad_syntax.c b/test/bad_syntax.lv2/test_bad_syntax.c
index d20b8b7..80d9e3c 100644
--- a/test/bad_syntax.lv2/test_bad_syntax.c
+++ b/test/bad_syntax.lv2/test_bad_syntax.c
@@ -1,6 +1,13 @@
-#include "lilv/lilv.h"
 #include "../src/lilv_internal.h"
 
+#include "serd/serd.h"
+#include "lilv/lilv.h"
+
+#include <stdbool.h>
+#include <stdint.h>
+#include <stdio.h>
+#include <stdlib.h>
+
 #define PLUGIN_URI "http://example.org/bad-syntax"
 
 #define TEST_ASSERT(check) do {\
diff --git a/test/failed_instantiation.lv2/failed_instantiation.c b/test/failed_instantiation.lv2/failed_instantiation.c
index aa90532..0a0a5b1 100644
--- a/test/failed_instantiation.lv2/failed_instantiation.c
+++ b/test/failed_instantiation.lv2/failed_instantiation.c
@@ -15,10 +15,11 @@
   OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 */
 
-#include <stdlib.h>
-
 #include "lv2/lv2plug.in/ns/lv2core/lv2.h"
 
+#include <stdint.h>
+#include <stdlib.h>
+
 #define PLUGIN_URI "http://example.org/failed-instantiation"
 
 enum {
diff --git a/test/failed_instantiation.lv2/test_failed_instantiation.c b/test/failed_instantiation.lv2/test_failed_instantiation.c
index 6efa0ae..9955d3f 100644
--- a/test/failed_instantiation.lv2/test_failed_instantiation.c
+++ b/test/failed_instantiation.lv2/test_failed_instantiation.c
@@ -1,6 +1,13 @@
-#include "lilv/lilv.h"
 #include "../src/lilv_internal.h"
 
+#include "lilv/lilv.h"
+#include "serd/serd.h"
+
+#include <stdbool.h>
+#include <stdint.h>
+#include <stdio.h>
+#include <stdlib.h>
+
 #define PLUGIN_URI "http://example.org/failed-instantiation"
 
 #define TEST_ASSERT(check) do {\
diff --git a/test/failed_lib_descriptor.lv2/failed_lib_descriptor.c b/test/failed_lib_descriptor.lv2/failed_lib_descriptor.c
index 6a1fd90..887960f 100644
--- a/test/failed_lib_descriptor.lv2/failed_lib_descriptor.c
+++ b/test/failed_lib_descriptor.lv2/failed_lib_descriptor.c
@@ -15,10 +15,10 @@
   OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 */
 
-#include <stdlib.h>
-
 #include "lv2/lv2plug.in/ns/lv2core/lv2.h"
 
+#include <stdlib.h>
+
 #define PLUGIN_URI "http://example.org/failed-lib-descriptor"
 
 LV2_SYMBOL_EXPORT
diff --git a/test/failed_lib_descriptor.lv2/test_failed_lib_descriptor.c b/test/failed_lib_descriptor.lv2/test_failed_lib_descriptor.c
index b82eb0a..e4158ee 100644
--- a/test/failed_lib_descriptor.lv2/test_failed_lib_descriptor.c
+++ b/test/failed_lib_descriptor.lv2/test_failed_lib_descriptor.c
@@ -1,6 +1,13 @@
-#include "lilv/lilv.h"
 #include "../src/lilv_internal.h"
 
+#include "serd/serd.h"
+#include "lilv/lilv.h"
+
+#include <stdbool.h>
+#include <stdint.h>
+#include <stdio.h>
+#include <stdlib.h>
+
 #define PLUGIN_URI "http://example.org/failed-lib-descriptor"
 
 #define TEST_ASSERT(check) do {\
diff --git a/test/lib_descriptor.lv2/lib_descriptor.c b/test/lib_descriptor.lv2/lib_descriptor.c
index 48dc775..d51cde0 100644
--- a/test/lib_descriptor.lv2/lib_descriptor.c
+++ b/test/lib_descriptor.lv2/lib_descriptor.c
@@ -15,10 +15,11 @@
   OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 */
 
-#include <stdlib.h>
-
 #include "lv2/lv2plug.in/ns/lv2core/lv2.h"
 
+#include <stdint.h>
+#include <stdlib.h>
+
 #define PLUGIN_URI "http://example.org/lib-descriptor"
 
 enum {
diff --git a/test/lib_descriptor.lv2/test_lib_descriptor.c b/test/lib_descriptor.lv2/test_lib_descriptor.c
index ff14763..6b6cb02 100644
--- a/test/lib_descriptor.lv2/test_lib_descriptor.c
+++ b/test/lib_descriptor.lv2/test_lib_descriptor.c
@@ -1,6 +1,13 @@
-#include "lilv/lilv.h"
 #include "../src/lilv_internal.h"
 
+#include "serd/serd.h"
+#include "lilv/lilv.h"
+
+#include <stdbool.h>
+#include <stdint.h>
+#include <stdio.h>
+#include <stdlib.h>
+
 #define PLUGIN_URI "http://example.org/lib-descriptor"
 
 #define TEST_ASSERT(check) do {\
diff --git a/test/lilv_test.c b/test/lilv_test.c
index d91e3f9..bc2f597 100644
--- a/test/lilv_test.c
+++ b/test/lilv_test.c
@@ -18,16 +18,7 @@
 #define _POSIX_C_SOURCE 200809L /* for setenv */
 #define _XOPEN_SOURCE   600     /* for mkstemp */
 
-#include <assert.h>
-#include <ctype.h>
-#include <errno.h>
-#include <float.h>
-#include <limits.h>
-#include <math.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-#include <sys/stat.h>
+#include "../src/lilv_internal.h"
 
 #ifdef _WIN32
 #    include <direct.h>
@@ -37,16 +28,27 @@
 #    define unsetenv(n) SetEnvironmentVariable((n), NULL)
 #    define mkstemp(pat) _mktemp(pat)
 #else
-#    include <dirent.h>
 #    include <unistd.h>
 #endif
 
 #include "lilv/lilv.h"
-#include "../src/lilv_internal.h"
-
 #include "lv2/lv2plug.in/ns/ext/presets/presets.h"
 #include "lv2/lv2plug.in/ns/ext/state/state.h"
 #include "lv2/lv2plug.in/ns/ext/urid/urid.h"
+#include "lv2/lv2plug.in/ns/lv2core/lv2.h"
+#include "serd/serd.h"
+
+#include <assert.h>
+#include <errno.h>
+#include <float.h>
+#include <math.h>
+#include <stdarg.h>
+#include <stdbool.h>
+#include <stdint.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+#include <sys/stat.h>
 
 #define TEST_PATH_MAX 1024
 
diff --git a/test/missing_descriptor.lv2/test_missing_descriptor.c b/test/missing_descriptor.lv2/test_missing_descriptor.c
index 49909e1..731b2eb 100644
--- a/test/missing_descriptor.lv2/test_missing_descriptor.c
+++ b/test/missing_descriptor.lv2/test_missing_descriptor.c
@@ -1,6 +1,13 @@
-#include "lilv/lilv.h"
 #include "../src/lilv_internal.h"
 
+#include "serd/serd.h"
+#include "lilv/lilv.h"
+
+#include <stdbool.h>
+#include <stdint.h>
+#include <stdio.h>
+#include <stdlib.h>
+
 #define PLUGIN_URI "http://example.org/missing-descriptor"
 
 #define TEST_ASSERT(check) do {\
diff --git a/test/missing_name.lv2/missing_name.c b/test/missing_name.lv2/missing_name.c
index 6b86e09..02fb74a 100644
--- a/test/missing_name.lv2/missing_name.c
+++ b/test/missing_name.lv2/missing_name.c
@@ -15,10 +15,11 @@
   OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 */
 
-#include <stdlib.h>
-
 #include "lv2/lv2plug.in/ns/lv2core/lv2.h"
 
+#include <stdint.h>
+#include <stdlib.h>
+
 #define PLUGIN_URI "http://example.org/missing-name"
 
 enum {
diff --git a/test/missing_name.lv2/test_missing_name.c b/test/missing_name.lv2/test_missing_name.c
index 960eec0..8e32d8b 100644
--- a/test/missing_name.lv2/test_missing_name.c
+++ b/test/missing_name.lv2/test_missing_name.c
@@ -1,6 +1,13 @@
-#include "lilv/lilv.h"
 #include "../src/lilv_internal.h"
 
+#include "serd/serd.h"
+#include "lilv/lilv.h"
+
+#include <stdbool.h>
+#include <stdint.h>
+#include <stdio.h>
+#include <stdlib.h>
+
 #define PLUGIN_URI "http://example.org/missing-name"
 
 #define TEST_ASSERT(check) do {\
diff --git a/test/missing_plugin.lv2/missing_plugin.c b/test/missing_plugin.lv2/missing_plugin.c
index 4d21226..26a030c 100644
--- a/test/missing_plugin.lv2/missing_plugin.c
+++ b/test/missing_plugin.lv2/missing_plugin.c
@@ -15,10 +15,11 @@
   OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 */
 
-#include <stdlib.h>
-
 #include "lv2/lv2plug.in/ns/lv2core/lv2.h"
 
+#include <stdint.h>
+#include <stdlib.h>
+
 #define PLUGIN_URI "http://example.org/missing-plugin"
 
 static const LV2_Descriptor descriptor = {
diff --git a/test/missing_plugin.lv2/test_missing_plugin.c b/test/missing_plugin.lv2/test_missing_plugin.c
index bfc695b..658232e 100644
--- a/test/missing_plugin.lv2/test_missing_plugin.c
+++ b/test/missing_plugin.lv2/test_missing_plugin.c
@@ -1,6 +1,13 @@
-#include "lilv/lilv.h"
 #include "../src/lilv_internal.h"
 
+#include "serd/serd.h"
+#include "lilv/lilv.h"
+
+#include <stdbool.h>
+#include <stdint.h>
+#include <stdio.h>
+#include <stdlib.h>
+
 #define PLUGIN_URI "http://example.org/missing-plugin"
 
 #define TEST_ASSERT(check) do {\
diff --git a/test/missing_port.lv2/missing_port.c b/test/missing_port.lv2/missing_port.c
index dd7e9ff..784b596 100644
--- a/test/missing_port.lv2/missing_port.c
+++ b/test/missing_port.lv2/missing_port.c
@@ -15,10 +15,11 @@
   OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 */
 
-#include <stdlib.h>
-
 #include "lv2/lv2plug.in/ns/lv2core/lv2.h"
 
+#include <stdint.h>
+#include <stdlib.h>
+
 #define PLUGIN_URI "http://example.org/missing-port"
 
 enum {
diff --git a/test/missing_port.lv2/test_missing_port.c b/test/missing_port.lv2/test_missing_port.c
index c67a1b8..1e76e76 100644
--- a/test/missing_port.lv2/test_missing_port.c
+++ b/test/missing_port.lv2/test_missing_port.c
@@ -1,6 +1,13 @@
-#include "lilv/lilv.h"
 #include "../src/lilv_internal.h"
 
+#include "serd/serd.h"
+#include "lilv/lilv.h"
+
+#include <stdbool.h>
+#include <stdint.h>
+#include <stdio.h>
+#include <stdlib.h>
+
 #define PLUGIN_URI "http://example.org/missing-port"
 
 #define TEST_ASSERT(check) do {\
diff --git a/test/missing_port_name.lv2/missing_port_name.c b/test/missing_port_name.lv2/missing_port_name.c
index 4ed44ed..0b1f7d5 100644
--- a/test/missing_port_name.lv2/missing_port_name.c
+++ b/test/missing_port_name.lv2/missing_port_name.c
@@ -15,10 +15,11 @@
   OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 */
 
-#include <stdlib.h>
-
 #include "lv2/lv2plug.in/ns/lv2core/lv2.h"
 
+#include <stdint.h>
+#include <stdlib.h>
+
 #define PLUGIN_URI "http://example.org/missing-port-name"
 
 enum {
diff --git a/test/missing_port_name.lv2/test_missing_port_name.c b/test/missing_port_name.lv2/test_missing_port_name.c
index c000247..1187325 100644
--- a/test/missing_port_name.lv2/test_missing_port_name.c
+++ b/test/missing_port_name.lv2/test_missing_port_name.c
@@ -1,6 +1,13 @@
-#include "lilv/lilv.h"
 #include "../src/lilv_internal.h"
 
+#include "serd/serd.h"
+#include "lilv/lilv.h"
+
+#include <stdbool.h>
+#include <stdint.h>
+#include <stdio.h>
+#include <stdlib.h>
+
 #define PLUGIN_URI "http://example.org/missing-port-name"
 
 #define TEST_ASSERT(check) do {\
diff --git a/test/new_version.lv2/new_version.c b/test/new_version.lv2/new_version.c
index 37d9fbf..6e03f4d 100644
--- a/test/new_version.lv2/new_version.c
+++ b/test/new_version.lv2/new_version.c
@@ -15,10 +15,11 @@
   OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 */
 
-#include <stdlib.h>
-
 #include "lv2/lv2plug.in/ns/lv2core/lv2.h"
 
+#include <stdint.h>
+#include <stdlib.h>
+
 #define PLUGIN_URI "http://example.org/versioned"
 
 enum {
diff --git a/test/old_version.lv2/old_version.c b/test/old_version.lv2/old_version.c
index 303f09c..e75d601 100644
--- a/test/old_version.lv2/old_version.c
+++ b/test/old_version.lv2/old_version.c
@@ -15,10 +15,11 @@
   OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 */
 
-#include <stdlib.h>
-
 #include "lv2/lv2plug.in/ns/lv2core/lv2.h"
 
+#include <stdint.h>
+#include <stdlib.h>
+
 #define PLUGIN_URI "http://example.org/versioned"
 
 enum {
diff --git a/test/test.lv2/test.c b/test/test.lv2/test.c
index d16e4a9..2bde8cd 100644
--- a/test/test.lv2/test.c
+++ b/test/test.lv2/test.c
@@ -17,11 +17,6 @@
 
 #define _POSIX_C_SOURCE 200809L
 
-#include <assert.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-
 #include "lv2/lv2plug.in/ns/ext/atom/atom.h"
 #include "lv2/lv2plug.in/ns/ext/state/state.h"
 #include "lv2/lv2plug.in/ns/ext/urid/urid.h"
@@ -32,6 +27,11 @@
 #    define mkstemp(pat) _mktemp(pat)
 #endif
 
+#include <stdint.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+
 #define TEST_URI "http://example.org/lilv-test-plugin"
 
 #define TMP_TEMPLATE "lilv_testXXXXXX"
diff --git a/utils/bench.h b/utils/bench.h
index 83d7853..9006cf5 100644
--- a/utils/bench.h
+++ b/utils/bench.h
@@ -23,8 +23,8 @@
 
 #define _POSIX_C_SOURCE 200809L
 
-#include <time.h>
 #include <sys/time.h>
+#include <time.h>
 
 static inline double
 bench_elapsed_s(const struct timespec* start, const struct timespec* end)
diff --git a/utils/lilv-bench.c b/utils/lilv-bench.c
index c0355df..59e49fe 100644
--- a/utils/lilv-bench.c
+++ b/utils/lilv-bench.c
@@ -14,12 +14,8 @@
   OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 */
 
-#include <stdio.h>
-
 #include "lilv/lilv.h"
 
-#include "lilv_config.h"
-
 int
 main(int argc, char** argv)
 {
diff --git a/utils/lv2apply.c b/utils/lv2apply.c
index 66a8c3a..84f4ca1 100644
--- a/utils/lv2apply.c
+++ b/utils/lv2apply.c
@@ -14,16 +14,19 @@
   OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 */
 
-#include <assert.h>
+#include "lilv/lilv.h"
+
+#include "lv2/lv2plug.in/ns/lv2core/lv2.h"
+
 #include <math.h>
 #include <sndfile.h>
 #include <stdarg.h>
+#include <stdbool.h>
+#include <stdint.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
 
-#include "lilv/lilv.h"
-
 /** Control port value set from the command line */
 typedef struct Param {
 	const char* sym;    ///< Port symbol
diff --git a/utils/lv2bench.c b/utils/lv2bench.c
index e3eb57f..bbe8818 100644
--- a/utils/lv2bench.c
+++ b/utils/lv2bench.c
@@ -16,18 +16,23 @@
 
 #define _POSIX_C_SOURCE 200809L
 
-#include <math.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-
 #include "lilv/lilv.h"
 #include "lv2/lv2plug.in/ns/ext/atom/atom.h"
+#include "lv2/lv2plug.in/ns/ext/urid/urid.h"
+#include "lv2/lv2plug.in/ns/lv2core/lv2.h"
 
-#include "lilv_config.h"
 #include "bench.h"
+#include "lilv_config.h"
 #include "uri_table.h"
 
+#include <math.h>
+#include <stdbool.h>
+#include <stdint.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+#include <time.h>
+
 static LilvNode* atom_AtomPort   = NULL;
 static LilvNode* atom_Sequence   = NULL;
 static LilvNode* lv2_AudioPort   = NULL;
diff --git a/utils/lv2info.c b/utils/lv2info.c
index 75a093f..5869195 100644
--- a/utils/lv2info.c
+++ b/utils/lv2info.c
@@ -14,19 +14,20 @@
   OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 */
 
-#include <float.h>
-#include <math.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
+#include "lilv_config.h"
 
+#include "lilv/lilv.h"
+#include "lv2/lv2plug.in/ns/ext/event/event.h"
 #include "lv2/lv2plug.in/ns/ext/port-groups/port-groups.h"
 #include "lv2/lv2plug.in/ns/ext/presets/presets.h"
-#include "lv2/lv2plug.in/ns/ext/event/event.h"
+#include "lv2/lv2plug.in/ns/lv2core/lv2.h"
 
-#include "lilv/lilv.h"
-
-#include "lilv_config.h"
+#include <math.h>
+#include <stdbool.h>
+#include <stdint.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
 
 #ifdef _MSC_VER
 #    define isnan _isnan
diff --git a/utils/lv2ls.c b/utils/lv2ls.c
index 1f007f1..677e055 100644
--- a/utils/lv2ls.c
+++ b/utils/lv2ls.c
@@ -14,12 +14,13 @@
   OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 */
 
-#include <stdio.h>
-#include <string.h>
+#include "lilv_config.h"
 
 #include "lilv/lilv.h"
 
-#include "lilv_config.h"
+#include <stdbool.h>
+#include <stdio.h>
+#include <string.h>
 
 static void
 list_plugins(const LilvPlugins* list, bool show_names)
diff --git a/utils/uri_table.h b/utils/uri_table.h
index 880d560..4c494e7 100644
--- a/utils/uri_table.h
+++ b/utils/uri_table.h
@@ -23,6 +23,9 @@
 #ifndef URI_TABLE_H
 #define URI_TABLE_H
 
+#include <stdlib.h>
+#include <string.h>
+
 typedef struct {
 	char** uris;
 	size_t n_uris;