Use angle brackets for library includes and clean up include paths

48 files changed, 68 insertions, 70 deletions

diff --git a/test/bad_syntax.lv2/bad_syntax.c b/test/bad_syntax.lv2/bad_syntax.c
index b1b52e7..692fc33 100644
--- a/test/bad_syntax.lv2/bad_syntax.c
+++ b/test/bad_syntax.lv2/bad_syntax.c
@@ -1,7 +1,7 @@
 // Copyright 2011-2019 David Robillard <d@drobilla.net>
 // SPDX-License-Identifier: ISC
 
-#include "lv2/core/lv2.h"
+#include <lv2/core/lv2.h>
 
 #include <stdint.h>
 #include <stdlib.h>
diff --git a/test/bad_syntax.lv2/test_bad_syntax.c b/test/bad_syntax.lv2/test_bad_syntax.c
index 39729d4..1e42ef3 100644
--- a/test/bad_syntax.lv2/test_bad_syntax.c
+++ b/test/bad_syntax.lv2/test_bad_syntax.c
@@ -3,7 +3,7 @@
 
 #undef NDEBUG
 
-#include "lilv/lilv.h"
+#include <lilv/lilv.h>
 
 #include <assert.h>
 #include <stdio.h>
diff --git a/test/cpp/meson.build b/test/cpp/meson.build
index 1d697fa..0c750de 100644
--- a/test/cpp/meson.build
+++ b/test/cpp/meson.build
@@ -31,7 +31,6 @@ test(
     files('test_lilv_hpp.cpp'),
     cpp_args: test_args + cpp_suppressions,
     dependencies: [lv2_dep, lilv_dep],
-    include_directories: include_directories('../../src'),
   ),
   suite: 'unit',
 )
diff --git a/test/cpp/test_lilv_hpp.cpp b/test/cpp/test_lilv_hpp.cpp
index 7e6de72..228fe1d 100644
--- a/test/cpp/test_lilv_hpp.cpp
+++ b/test/cpp/test_lilv_hpp.cpp
@@ -1,7 +1,7 @@
 // Copyright 2017-2019 David Robillard <d@drobilla.net>
 // SPDX-License-Identifier: ISC
 
-#include "lilv/lilvmm.hpp"
+#include <lilv/lilvmm.hpp>
 
 int
 main()
diff --git a/test/failed_instantiation.lv2/failed_instantiation.c b/test/failed_instantiation.lv2/failed_instantiation.c
index 7e134fc..e4e0efe 100644
--- a/test/failed_instantiation.lv2/failed_instantiation.c
+++ b/test/failed_instantiation.lv2/failed_instantiation.c
@@ -1,7 +1,7 @@
 // Copyright 2011-2019 David Robillard <d@drobilla.net>
 // SPDX-License-Identifier: ISC
 
-#include "lv2/core/lv2.h"
+#include <lv2/core/lv2.h>
 
 #include <stdint.h>
 #include <stdlib.h>
diff --git a/test/failed_instantiation.lv2/test_failed_instantiation.c b/test/failed_instantiation.lv2/test_failed_instantiation.c
index ed46d5a..9e677cf 100644
--- a/test/failed_instantiation.lv2/test_failed_instantiation.c
+++ b/test/failed_instantiation.lv2/test_failed_instantiation.c
@@ -3,7 +3,7 @@
 
 #undef NDEBUG
 
-#include "lilv/lilv.h"
+#include <lilv/lilv.h>
 
 #include <assert.h>
 #include <stdio.h>
diff --git a/test/failed_lib_descriptor.lv2/failed_lib_descriptor.c b/test/failed_lib_descriptor.lv2/failed_lib_descriptor.c
index 2d0baee..4de2ebe 100644
--- a/test/failed_lib_descriptor.lv2/failed_lib_descriptor.c
+++ b/test/failed_lib_descriptor.lv2/failed_lib_descriptor.c
@@ -1,7 +1,7 @@
 // Copyright 2011-2019 David Robillard <d@drobilla.net>
 // SPDX-License-Identifier: ISC
 
-#include "lv2/core/lv2.h"
+#include <lv2/core/lv2.h>
 
 #include <stdlib.h>
 
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 f4fb879..dc37244 100644
--- a/test/failed_lib_descriptor.lv2/test_failed_lib_descriptor.c
+++ b/test/failed_lib_descriptor.lv2/test_failed_lib_descriptor.c
@@ -3,7 +3,7 @@
 
 #undef NDEBUG
 
-#include "lilv/lilv.h"
+#include <lilv/lilv.h>
 
 #include <assert.h>
 #include <stdio.h>
diff --git a/test/lib_descriptor.lv2/lib_descriptor.c b/test/lib_descriptor.lv2/lib_descriptor.c
index bae1659..5a269ad 100644
--- a/test/lib_descriptor.lv2/lib_descriptor.c
+++ b/test/lib_descriptor.lv2/lib_descriptor.c
@@ -1,7 +1,7 @@
 // Copyright 2011-2019 David Robillard <d@drobilla.net>
 // SPDX-License-Identifier: ISC
 
-#include "lv2/core/lv2.h"
+#include <lv2/core/lv2.h>
 
 #include <stdint.h>
 #include <stdlib.h>
diff --git a/test/lib_descriptor.lv2/test_lib_descriptor.c b/test/lib_descriptor.lv2/test_lib_descriptor.c
index e971662..29a51fd 100644
--- a/test/lib_descriptor.lv2/test_lib_descriptor.c
+++ b/test/lib_descriptor.lv2/test_lib_descriptor.c
@@ -3,7 +3,7 @@
 
 #undef NDEBUG
 
-#include "lilv/lilv.h"
+#include <lilv/lilv.h>
 
 #include <assert.h>
 #include <stdio.h>
diff --git a/test/lilv_test_uri_map.h b/test/lilv_test_uri_map.h
index d7f3e20..832b723 100644
--- a/test/lilv_test_uri_map.h
+++ b/test/lilv_test_uri_map.h
@@ -4,8 +4,8 @@
 #ifndef LILV_TEST_URI_MAP_H
 #define LILV_TEST_URI_MAP_H
 
-#include "lv2/urid/urid.h"
-#include "serd/serd.h"
+#include <lv2/urid/urid.h>
+#include <serd/serd.h>
 
 #include <assert.h>
 #include <stdint.h>
diff --git a/test/lilv_test_utils.c b/test/lilv_test_utils.c
index 3063449..1cb8d13 100644
--- a/test/lilv_test_utils.c
+++ b/test/lilv_test_utils.c
@@ -3,11 +3,11 @@
 
 #include "lilv_test_utils.h"
 
-#include "lilv/lilv.h"
-#include "serd/serd.h"
-#include "zix/allocator.h"
-#include "zix/filesystem.h"
-#include "zix/path.h"
+#include <lilv/lilv.h>
+#include <serd/serd.h>
+#include <zix/allocator.h>
+#include <zix/filesystem.h>
+#include <zix/path.h>
 
 #include <errno.h>
 #include <stdbool.h>
diff --git a/test/lilv_test_utils.h b/test/lilv_test_utils.h
index a389959..0943238 100644
--- a/test/lilv_test_utils.h
+++ b/test/lilv_test_utils.h
@@ -4,8 +4,8 @@
 #ifndef LILV_TEST_UTILS_H
 #define LILV_TEST_UTILS_H
 
-#include "lilv/lilv.h"
-#include "zix/attributes.h"
+#include <lilv/lilv.h>
+#include <zix/attributes.h>
 
 #define MANIFEST_PREFIXES \
   "\
diff --git a/test/meson.build b/test/meson.build
index 3aa1869..1780bab 100644
--- a/test/meson.build
+++ b/test/meson.build
@@ -81,7 +81,6 @@ foreach unit : unit_tests
       'test_@0@'.format(unit),
       files('lilv_test_utils.c', 'test_@0@.c'.format(unit)),
       c_args: define_args + test_args + c_suppressions,
-      include_directories: include_directories('../src'),
       dependencies: [lv2_dep, lilv_dep],
     ),
     suite: 'unit',
diff --git a/test/missing_descriptor.lv2/missing_descriptor.c b/test/missing_descriptor.lv2/missing_descriptor.c
index ffcf7d6..c1fa47a 100644
--- a/test/missing_descriptor.lv2/missing_descriptor.c
+++ b/test/missing_descriptor.lv2/missing_descriptor.c
@@ -1,7 +1,7 @@
 // Copyright 2011-2018 David Robillard <d@drobilla.net>
 // SPDX-License-Identifier: ISC
 
-#include "lv2/core/lv2.h"
+#include <lv2/core/lv2.h>
 
 LV2_SYMBOL_EXPORT
 extern const char* msg;
diff --git a/test/missing_descriptor.lv2/test_missing_descriptor.c b/test/missing_descriptor.lv2/test_missing_descriptor.c
index c76779d..ed7b868 100644
--- a/test/missing_descriptor.lv2/test_missing_descriptor.c
+++ b/test/missing_descriptor.lv2/test_missing_descriptor.c
@@ -3,7 +3,7 @@
 
 #undef NDEBUG
 
-#include "lilv/lilv.h"
+#include <lilv/lilv.h>
 
 #include <assert.h>
 #include <stdio.h>
diff --git a/test/missing_name.lv2/missing_name.c b/test/missing_name.lv2/missing_name.c
index 8538e73..8099cc4 100644
--- a/test/missing_name.lv2/missing_name.c
+++ b/test/missing_name.lv2/missing_name.c
@@ -1,7 +1,7 @@
 // Copyright 2011-2019 David Robillard <d@drobilla.net>
 // SPDX-License-Identifier: ISC
 
-#include "lv2/core/lv2.h"
+#include <lv2/core/lv2.h>
 
 #include <stdint.h>
 #include <stdlib.h>
diff --git a/test/missing_name.lv2/test_missing_name.c b/test/missing_name.lv2/test_missing_name.c
index a8df1ab..368ad5f 100644
--- a/test/missing_name.lv2/test_missing_name.c
+++ b/test/missing_name.lv2/test_missing_name.c
@@ -3,7 +3,7 @@
 
 #undef NDEBUG
 
-#include "lilv/lilv.h"
+#include <lilv/lilv.h>
 
 #include <assert.h>
 #include <stdio.h>
diff --git a/test/missing_plugin.lv2/missing_plugin.c b/test/missing_plugin.lv2/missing_plugin.c
index f496c6d..15b790f 100644
--- a/test/missing_plugin.lv2/missing_plugin.c
+++ b/test/missing_plugin.lv2/missing_plugin.c
@@ -1,7 +1,7 @@
 // Copyright 2011-2019 David Robillard <d@drobilla.net>
 // SPDX-License-Identifier: ISC
 
-#include "lv2/core/lv2.h"
+#include <lv2/core/lv2.h>
 
 #include <stdint.h>
 #include <stdlib.h>
diff --git a/test/missing_plugin.lv2/test_missing_plugin.c b/test/missing_plugin.lv2/test_missing_plugin.c
index dfa9158..e62b236 100644
--- a/test/missing_plugin.lv2/test_missing_plugin.c
+++ b/test/missing_plugin.lv2/test_missing_plugin.c
@@ -3,7 +3,7 @@
 
 #undef NDEBUG
 
-#include "lilv/lilv.h"
+#include <lilv/lilv.h>
 
 #include <assert.h>
 #include <stdio.h>
diff --git a/test/missing_port.lv2/missing_port.c b/test/missing_port.lv2/missing_port.c
index ce98c30..d85af8c 100644
--- a/test/missing_port.lv2/missing_port.c
+++ b/test/missing_port.lv2/missing_port.c
@@ -1,7 +1,7 @@
 // Copyright 2011-2019 David Robillard <d@drobilla.net>
 // SPDX-License-Identifier: ISC
 
-#include "lv2/core/lv2.h"
+#include <lv2/core/lv2.h>
 
 #include <stdint.h>
 #include <stdlib.h>
diff --git a/test/missing_port.lv2/test_missing_port.c b/test/missing_port.lv2/test_missing_port.c
index 463fd63..4d5323d 100644
--- a/test/missing_port.lv2/test_missing_port.c
+++ b/test/missing_port.lv2/test_missing_port.c
@@ -3,7 +3,7 @@
 
 #undef NDEBUG
 
-#include "lilv/lilv.h"
+#include <lilv/lilv.h>
 
 #include <assert.h>
 #include <stdio.h>
diff --git a/test/missing_port_name.lv2/missing_port_name.c b/test/missing_port_name.lv2/missing_port_name.c
index d10498f..6f14ba3 100644
--- a/test/missing_port_name.lv2/missing_port_name.c
+++ b/test/missing_port_name.lv2/missing_port_name.c
@@ -1,7 +1,7 @@
 // Copyright 2011-2019 David Robillard <d@drobilla.net>
 // SPDX-License-Identifier: ISC
 
-#include "lv2/core/lv2.h"
+#include <lv2/core/lv2.h>
 
 #include <stdint.h>
 #include <stdlib.h>
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 58e8120..b483b84 100644
--- a/test/missing_port_name.lv2/test_missing_port_name.c
+++ b/test/missing_port_name.lv2/test_missing_port_name.c
@@ -3,7 +3,7 @@
 
 #undef NDEBUG
 
-#include "lilv/lilv.h"
+#include <lilv/lilv.h>
 
 #include <assert.h>
 #include <stdio.h>
diff --git a/test/new_version.lv2/new_version.c b/test/new_version.lv2/new_version.c
index 64be4f5..3521c6e 100644
--- a/test/new_version.lv2/new_version.c
+++ b/test/new_version.lv2/new_version.c
@@ -1,7 +1,7 @@
 // Copyright 2011-2019 David Robillard <d@drobilla.net>
 // SPDX-License-Identifier: ISC
 
-#include "lv2/core/lv2.h"
+#include <lv2/core/lv2.h>
 
 #include <stdint.h>
 #include <stdlib.h>
diff --git a/test/old_version.lv2/old_version.c b/test/old_version.lv2/old_version.c
index 64be4f5..3521c6e 100644
--- a/test/old_version.lv2/old_version.c
+++ b/test/old_version.lv2/old_version.c
@@ -1,7 +1,7 @@
 // Copyright 2011-2019 David Robillard <d@drobilla.net>
 // SPDX-License-Identifier: ISC
 
-#include "lv2/core/lv2.h"
+#include <lv2/core/lv2.h>
 
 #include <stdint.h>
 #include <stdlib.h>
diff --git a/test/test_bad_port_index.c b/test/test_bad_port_index.c
index c8eeb21..6177dbb 100644
--- a/test/test_bad_port_index.c
+++ b/test/test_bad_port_index.c
@@ -5,7 +5,7 @@
 
 #include "lilv_test_utils.h"
 
-#include "lilv/lilv.h"
+#include <lilv/lilv.h>
 
 #include <assert.h>
 #include <stdint.h>
diff --git a/test/test_bad_port_symbol.c b/test/test_bad_port_symbol.c
index 31fe1c6..3f01c82 100644
--- a/test/test_bad_port_symbol.c
+++ b/test/test_bad_port_symbol.c
@@ -5,7 +5,7 @@
 
 #include "lilv_test_utils.h"
 
-#include "lilv/lilv.h"
+#include <lilv/lilv.h>
 
 #include <assert.h>
 #include <stdint.h>
diff --git a/test/test_classes.c b/test/test_classes.c
index 2d33a57..52dd711 100644
--- a/test/test_classes.c
+++ b/test/test_classes.c
@@ -5,7 +5,7 @@
 
 #include "lilv_test_utils.h"
 
-#include "lilv/lilv.h"
+#include <lilv/lilv.h>
 
 #include <assert.h>
 #include <string.h>
diff --git a/test/test_discovery.c b/test/test_discovery.c
index 35cdef6..be9cde8 100644
--- a/test/test_discovery.c
+++ b/test/test_discovery.c
@@ -5,7 +5,7 @@
 
 #include "lilv_test_utils.h"
 
-#include "lilv/lilv.h"
+#include <lilv/lilv.h>
 
 #include <assert.h>
 #include <string.h>
diff --git a/test/test_get_symbol.c b/test/test_get_symbol.c
index 5dc5898..2236df8 100644
--- a/test/test_get_symbol.c
+++ b/test/test_get_symbol.c
@@ -5,7 +5,7 @@
 
 #include "lilv_test_utils.h"
 
-#include "lilv/lilv.h"
+#include <lilv/lilv.h>
 
 #include <assert.h>
 #include <string.h>
diff --git a/test/test_no_author.c b/test/test_no_author.c
index 1a2b8dd..70991c2 100644
--- a/test/test_no_author.c
+++ b/test/test_no_author.c
@@ -5,7 +5,7 @@
 
 #include "lilv_test_utils.h"
 
-#include "lilv/lilv.h"
+#include <lilv/lilv.h>
 
 #include <assert.h>
 
diff --git a/test/test_no_verify.c b/test/test_no_verify.c
index 7d28314..9c63ea2 100644
--- a/test/test_no_verify.c
+++ b/test/test_no_verify.c
@@ -5,7 +5,7 @@
 
 #include "lilv_test_utils.h"
 
-#include "lilv/lilv.h"
+#include <lilv/lilv.h>
 
 #include <assert.h>
 
diff --git a/test/test_plugin.c b/test/test_plugin.c
index 2652159..0bd1870 100644
--- a/test/test_plugin.c
+++ b/test/test_plugin.c
@@ -5,7 +5,7 @@
 
 #include "lilv_test_utils.h"
 
-#include "lilv/lilv.h"
+#include <lilv/lilv.h>
 
 #include <assert.h>
 #include <float.h>
diff --git a/test/test_plugin.lv2/test_plugin.c b/test/test_plugin.lv2/test_plugin.c
index 124f64c..572443b 100644
--- a/test/test_plugin.lv2/test_plugin.c
+++ b/test/test_plugin.lv2/test_plugin.c
@@ -1,12 +1,12 @@
 // Copyright 2011-2022 David Robillard <d@drobilla.net>
 // SPDX-License-Identifier: ISC
 
-#include "lv2/atom/atom.h"
-#include "lv2/core/lv2.h"
-#include "lv2/state/state.h"
-#include "lv2/urid/urid.h"
-#include "zix/filesystem.h"
-#include "zix/path.h"
+#include <lv2/atom/atom.h>
+#include <lv2/core/lv2.h>
+#include <lv2/state/state.h>
+#include <lv2/urid/urid.h>
+#include <zix/filesystem.h>
+#include <zix/path.h>
 
 #include <stdint.h>
 #include <stdio.h>
diff --git a/test/test_port.c b/test/test_port.c
index 5991189..ac115a6 100644
--- a/test/test_port.c
+++ b/test/test_port.c
@@ -5,7 +5,7 @@
 
 #include "lilv_test_utils.h"
 
-#include "lilv/lilv.h"
+#include <lilv/lilv.h>
 
 #include <assert.h>
 #include <stdbool.h>
diff --git a/test/test_preset.c b/test/test_preset.c
index d091318..f282097 100644
--- a/test/test_preset.c
+++ b/test/test_preset.c
@@ -5,8 +5,8 @@
 
 #include "lilv_test_utils.h"
 
-#include "lilv/lilv.h"
-#include "lv2/presets/presets.h"
+#include <lilv/lilv.h>
+#include <lv2/presets/presets.h>
 
 #include <assert.h>
 
diff --git a/test/test_project.c b/test/test_project.c
index d37d9a1..43a23a2 100644
--- a/test/test_project.c
+++ b/test/test_project.c
@@ -5,7 +5,7 @@
 
 #include "lilv_test_utils.h"
 
-#include "lilv/lilv.h"
+#include <lilv/lilv.h>
 
 #include <assert.h>
 #include <string.h>
diff --git a/test/test_project_no_author.c b/test/test_project_no_author.c
index 3426e72..44ce728 100644
--- a/test/test_project_no_author.c
+++ b/test/test_project_no_author.c
@@ -5,7 +5,7 @@
 
 #include "lilv_test_utils.h"
 
-#include "lilv/lilv.h"
+#include <lilv/lilv.h>
 
 #include <assert.h>
 
diff --git a/test/test_prototype.c b/test/test_prototype.c
index 8ffd6e4..3225ffa 100644
--- a/test/test_prototype.c
+++ b/test/test_prototype.c
@@ -5,7 +5,7 @@
 
 #include "lilv_test_utils.h"
 
-#include "lilv/lilv.h"
+#include <lilv/lilv.h>
 
 #include <assert.h>
 #include <string.h>
diff --git a/test/test_reload_bundle.c b/test/test_reload_bundle.c
index a2630fc..779adeb 100644
--- a/test/test_reload_bundle.c
+++ b/test/test_reload_bundle.c
@@ -5,7 +5,7 @@
 
 #include "lilv_test_utils.h"
 
-#include "lilv/lilv.h"
+#include <lilv/lilv.h>
 
 #include <assert.h>
 #include <string.h>
diff --git a/test/test_replace_version.c b/test/test_replace_version.c
index dc2a75f..4465e3c 100644
--- a/test/test_replace_version.c
+++ b/test/test_replace_version.c
@@ -5,8 +5,8 @@
 
 #include "lilv_test_utils.h"
 
-#include "lilv/lilv.h"
-#include "lv2/core/lv2.h"
+#include <lilv/lilv.h>
+#include <lv2/core/lv2.h>
 
 #include <assert.h>
 #include <stdlib.h>
diff --git a/test/test_state.c b/test/test_state.c
index bc310eb..7d3ddf7 100644
--- a/test/test_state.c
+++ b/test/test_state.c
@@ -6,14 +6,14 @@
 #include "lilv_test_uri_map.h"
 #include "lilv_test_utils.h"
 
-#include "lilv/lilv.h"
-#include "lv2/core/lv2.h"
-#include "lv2/state/state.h"
-#include "lv2/urid/urid.h"
-#include "serd/serd.h"
-#include "zix/allocator.h"
-#include "zix/filesystem.h"
-#include "zix/path.h"
+#include <lilv/lilv.h>
+#include <lv2/core/lv2.h>
+#include <lv2/state/state.h>
+#include <lv2/urid/urid.h>
+#include <serd/serd.h>
+#include <zix/allocator.h>
+#include <zix/filesystem.h>
+#include <zix/path.h>
 
 #ifdef _WIN32
 #  include <direct.h>
diff --git a/test/test_ui.c b/test/test_ui.c
index 78ea871..73b32fe 100644
--- a/test/test_ui.c
+++ b/test/test_ui.c
@@ -5,7 +5,7 @@
 
 #include "lilv_test_utils.h"
 
-#include "lilv/lilv.h"
+#include <lilv/lilv.h>
 
 #include <assert.h>
 #include <stdio.h>
diff --git a/test/test_util.c b/test/test_util.c
index 2e609da..22edbbe 100644
--- a/test/test_util.c
+++ b/test/test_util.c
@@ -5,9 +5,9 @@
 
 #include "lilv_test_utils.h"
 
-#include "lilv/lilv.h"
-#include "zix/filesystem.h"
-#include "zix/path.h"
+#include <lilv/lilv.h>
+#include <zix/filesystem.h>
+#include <zix/path.h>
 
 #include <assert.h>
 #include <stdio.h>
diff --git a/test/test_value.c b/test/test_value.c
index 3314701..90d167d 100644
--- a/test/test_value.c
+++ b/test/test_value.c
@@ -5,7 +5,7 @@
 
 #include "lilv_test_utils.h"
 
-#include "lilv/lilv.h"
+#include <lilv/lilv.h>
 
 #include <assert.h>
 #include <float.h>
diff --git a/test/test_verify.c b/test/test_verify.c
index 3a2031b..55149c5 100644
--- a/test/test_verify.c
+++ b/test/test_verify.c
@@ -5,7 +5,7 @@
 
 #include "lilv_test_utils.h"
 
-#include "lilv/lilv.h"
+#include <lilv/lilv.h>
 
 #include <assert.h>
 
diff --git a/test/test_world.c b/test/test_world.c
index 269e95f..29bfeaf 100644
--- a/test/test_world.c
+++ b/test/test_world.c
@@ -5,7 +5,7 @@
 
 #include "lilv_test_utils.h"
 
-#include "lilv/lilv.h"
+#include <lilv/lilv.h>
 
 #include <assert.h>
 #include <stddef.h>