Sort includes from local to standard and fix exposed issues

This order is better because it ensures that headers can stand alone and
include everything they need.  Several missing includes were exposed by this,
and are also fixed in this commit.

14 files changed, 33 insertions, 33 deletions

diff --git a/lv2/atom/atom-test.c b/lv2/atom/atom-test.c
index 98c9ae2..63a2bfe 100644
--- a/lv2/atom/atom-test.c
+++ b/lv2/atom/atom-test.c
@@ -14,6 +14,11 @@
   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 "lv2/urid/urid.h"
+
 #include <stdarg.h>
 #include <stdbool.h>
 #include <stdint.h>
@@ -21,11 +26,6 @@
 #include <stdlib.h>
 #include <string.h>
 
-#include "lv2/atom/atom.h"
-#include "lv2/atom/forge.h"
-#include "lv2/atom/util.h"
-#include "lv2/urid/urid.h"
-
 char**   uris   = NULL;
 uint32_t n_uris = 0;
 
diff --git a/lv2/atom/forge.h b/lv2/atom/forge.h
index 50e962b..e866b38 100644
--- a/lv2/atom/forge.h
+++ b/lv2/atom/forge.h
@@ -48,14 +48,14 @@
 #ifndef LV2_ATOM_FORGE_H
 #define LV2_ATOM_FORGE_H
 
-#include <assert.h>
-#include <stdbool.h>
-
 #include "lv2/atom/atom.h"
 #include "lv2/atom/util.h"
 #include "lv2/core/attributes.h"
 #include "lv2/urid/urid.h"
 
+#include <assert.h>
+#include <stdbool.h>
+
 #ifdef __cplusplus
 extern "C" {
 #endif
diff --git a/lv2/atom/util.h b/lv2/atom/util.h
index 5151f84..cf24a53 100644
--- a/lv2/atom/util.h
+++ b/lv2/atom/util.h
@@ -31,13 +31,13 @@
 #ifndef LV2_ATOM_UTIL_H
 #define LV2_ATOM_UTIL_H
 
+#include "lv2/atom/atom.h"
+
 #include <stdarg.h>
 #include <stdbool.h>
 #include <stdint.h>
 #include <string.h>
 
-#include "lv2/atom/atom.h"
-
 #ifdef __cplusplus
 extern "C" {
 #endif
diff --git a/lv2/core/lv2_util.h b/lv2/core/lv2_util.h
index 7717b72..06174ee 100644
--- a/lv2/core/lv2_util.h
+++ b/lv2/core/lv2_util.h
@@ -20,12 +20,12 @@
    @{
 */
 
+#include "lv2/core/lv2.h"
+
 #include <stdarg.h>
 #include <stdbool.h>
 #include <string.h>
 
-#include "lv2/core/lv2.h"
-
 #ifdef __cplusplus
 extern "C" {
 #endif
diff --git a/lv2/dynmanifest/dynmanifest.h b/lv2/dynmanifest/dynmanifest.h
index 255d063..a15eaf4 100644
--- a/lv2/dynmanifest/dynmanifest.h
+++ b/lv2/dynmanifest/dynmanifest.h
@@ -27,10 +27,10 @@
 #ifndef LV2_DYN_MANIFEST_H_INCLUDED
 #define LV2_DYN_MANIFEST_H_INCLUDED
 
-#include <stdio.h>
-
 #include "lv2/core/lv2.h"
 
+#include <stdio.h>
+
 #define LV2_DYN_MANIFEST_URI    "http://lv2plug.in/ns/ext/dynmanifest"  ///< http://lv2plug.in/ns/ext/dynmanifest
 #define LV2_DYN_MANIFEST_PREFIX LV2_DYN_MANIFEST_URI "#"                ///< http://lv2plug.in/ns/ext/dynmanifest#
 
diff --git a/lv2/event/event-helpers.h b/lv2/event/event-helpers.h
index a0e4c79..af72d76 100644
--- a/lv2/event/event-helpers.h
+++ b/lv2/event/event-helpers.h
@@ -22,14 +22,14 @@
 #ifndef LV2_EVENT_HELPERS_H
 #define LV2_EVENT_HELPERS_H
 
+#include "lv2/core/attributes.h"
+#include "lv2/event/event.h"
+
 #include <stdbool.h>
 #include <stdint.h>
 #include <stdlib.h>
 #include <string.h>
 
-#include "lv2/core/attributes.h"
-#include "lv2/event/event.h"
-
 #ifdef __cplusplus
 extern "C" {
 #endif
diff --git a/lv2/event/event.h b/lv2/event/event.h
index 264f257..70cae6a 100644
--- a/lv2/event/event.h
+++ b/lv2/event/event.h
@@ -43,10 +43,10 @@
 
 #define LV2_EVENT_AUDIO_STAMP 0  ///< Special timestamp type for audio frames
 
-#include <stdint.h>
-
 #include "lv2/core/attributes.h"
 
+#include <stdint.h>
+
 #ifdef __cplusplus
 extern "C" {
 #endif
diff --git a/lv2/log/log.h b/lv2/log/log.h
index 11bb35a..7175339 100644
--- a/lv2/log/log.h
+++ b/lv2/log/log.h
@@ -36,10 +36,10 @@
 #define LV2_LOG__Warning LV2_LOG_PREFIX "Warning"  ///< http://lv2plug.in/ns/ext/log#Warning
 #define LV2_LOG__log     LV2_LOG_PREFIX "log"      ///< http://lv2plug.in/ns/ext/log#log
 
-#include <stdarg.h>
-
 #include "lv2/urid/urid.h"
 
+#include <stdarg.h>
+
 #ifdef __cplusplus
 extern "C" {
 #endif
diff --git a/lv2/log/logger.h b/lv2/log/logger.h
index 7d9b005..b66a8e4 100644
--- a/lv2/log/logger.h
+++ b/lv2/log/logger.h
@@ -28,11 +28,11 @@
 #ifndef LV2_ATOM_LOGGER_H
 #define LV2_ATOM_LOGGER_H
 
+#include "lv2/log/log.h"
+
 #include <stdio.h>
 #include <string.h>
 
-#include "lv2/log/log.h"
-
 #ifdef __cplusplus
 extern "C" {
 #endif
diff --git a/lv2/options/options.h b/lv2/options/options.h
index c1dad83..7878c58 100644
--- a/lv2/options/options.h
+++ b/lv2/options/options.h
@@ -26,11 +26,11 @@
 #ifndef LV2_OPTIONS_H
 #define LV2_OPTIONS_H
 
-#include <stdint.h>
-
 #include "lv2/core/lv2.h"
 #include "lv2/urid/urid.h"
 
+#include <stdint.h>
+
 #define LV2_OPTIONS_URI    "http://lv2plug.in/ns/ext/options"  ///< http://lv2plug.in/ns/ext/options
 #define LV2_OPTIONS_PREFIX LV2_OPTIONS_URI "#"                 ///< http://lv2plug.in/ns/ext/options#
 
diff --git a/lv2/state/state.h b/lv2/state/state.h
index 7c1c9c0..1005d50 100644
--- a/lv2/state/state.h
+++ b/lv2/state/state.h
@@ -27,12 +27,12 @@
 #ifndef LV2_STATE_H
 #define LV2_STATE_H
 
+#include "lv2/core/lv2.h"
+
 #include <stdbool.h>
 #include <stddef.h>
 #include <stdint.h>
 
-#include "lv2/core/lv2.h"
-
 #define LV2_STATE_URI    "http://lv2plug.in/ns/ext/state"  ///< http://lv2plug.in/ns/ext/state
 #define LV2_STATE_PREFIX LV2_STATE_URI "#"                 ///< http://lv2plug.in/ns/ext/state#
 
diff --git a/lv2/ui/ui.h b/lv2/ui/ui.h
index a99b8d8..450a41e 100644
--- a/lv2/ui/ui.h
+++ b/lv2/ui/ui.h
@@ -28,11 +28,11 @@
 #ifndef LV2_UI_H
 #define LV2_UI_H
 
+#include "lv2/core/lv2.h"
+
 #include <stdbool.h>
 #include <stdint.h>
 
-#include "lv2/core/lv2.h"
-
 #define LV2_UI_URI    "http://lv2plug.in/ns/extensions/ui"  ///< http://lv2plug.in/ns/extensions/ui
 #define LV2_UI_PREFIX LV2_UI_URI "#"                        ///< http://lv2plug.in/ns/extensions/ui#
 
diff --git a/lv2/uri-map/uri-map.h b/lv2/uri-map/uri-map.h
index 5974a81..7bd2724 100644
--- a/lv2/uri-map/uri-map.h
+++ b/lv2/uri-map/uri-map.h
@@ -36,10 +36,10 @@
 #define LV2_URI_MAP_URI    "http://lv2plug.in/ns/ext/uri-map"  ///< http://lv2plug.in/ns/ext/uri-map
 #define LV2_URI_MAP_PREFIX LV2_URI_MAP_URI "#"                 ///< http://lv2plug.in/ns/ext/uri-map#
 
-#include <stdint.h>
-
 #include "lv2/core/attributes.h"
 
+#include <stdint.h>
+
 #ifdef __cplusplus
 extern "C" {
 #endif
diff --git a/lv2/worker/worker.h b/lv2/worker/worker.h
index 6926887..f874d84 100644
--- a/lv2/worker/worker.h
+++ b/lv2/worker/worker.h
@@ -26,10 +26,10 @@
 #ifndef LV2_WORKER_H
 #define LV2_WORKER_H
 
-#include <stdint.h>
-
 #include "lv2/core/lv2.h"
 
+#include <stdint.h>
+
 #define LV2_WORKER_URI    "http://lv2plug.in/ns/ext/worker"  ///< http://lv2plug.in/ns/ext/worker
 #define LV2_WORKER_PREFIX LV2_WORKER_URI "#"                 ///< http://lv2plug.in/ns/ext/worker#