Clean up include guards

30 files changed, 86 insertions, 81 deletions

diff --git a/include/lv2/atom/atom.h b/include/lv2/atom/atom.h
index a6178cf..1e27878 100644
--- a/include/lv2/atom/atom.h
+++ b/include/lv2/atom/atom.h
@@ -1,8 +1,8 @@
 // Copyright 2008-2016 David Robillard <d@drobilla.net>
 // SPDX-License-Identifier: ISC
 
-#ifndef LV2_ATOM_H
-#define LV2_ATOM_H
+#ifndef LV2_ATOM_ATOM_H
+#define LV2_ATOM_ATOM_H
 
 /**
    @defgroup atom Atom
@@ -244,4 +244,4 @@ typedef struct {
    @}
 */
 
-#endif /* LV2_ATOM_H */
+#endif // LV2_ATOM_ATOM_H
diff --git a/include/lv2/atom/forge.h b/include/lv2/atom/forge.h
index 5e9bef8..5110b99 100644
--- a/include/lv2/atom/forge.h
+++ b/include/lv2/atom/forge.h
@@ -667,4 +667,4 @@ LV2_RESTORE_WARNINGS
    @}
 */
 
-#endif /* LV2_ATOM_FORGE_H */
+#endif // LV2_ATOM_FORGE_H
diff --git a/include/lv2/atom/util.h b/include/lv2/atom/util.h
index f585f82..43cc466 100644
--- a/include/lv2/atom/util.h
+++ b/include/lv2/atom/util.h
@@ -507,4 +507,4 @@ lv2_atom_object_get_typed(const LV2_Atom_Object* object, ...)
    @}
 */
 
-#endif /* LV2_ATOM_UTIL_H */
+#endif // LV2_ATOM_UTIL_H
diff --git a/include/lv2/buf-size/buf-size.h b/include/lv2/buf-size/buf-size.h
index 17be7bc..c1a00e1 100644
--- a/include/lv2/buf-size/buf-size.h
+++ b/include/lv2/buf-size/buf-size.h
@@ -1,8 +1,8 @@
 // Copyright 2007-2016 David Robillard <d@drobilla.net>
 // SPDX-License-Identifier: ISC
 
-#ifndef LV2_BUF_SIZE_H
-#define LV2_BUF_SIZE_H
+#ifndef LV2_BUF_SIZE_BUF_SIZE_H
+#define LV2_BUF_SIZE_BUF_SIZE_H
 
 /**
    @defgroup buf-size Buffer Size
@@ -35,4 +35,4 @@
    @}
 */
 
-#endif /* LV2_BUF_SIZE_H */
+#endif // LV2_BUF_SIZE_BUF_SIZE_H
diff --git a/include/lv2/core/attributes.h b/include/lv2/core/attributes.h
index ab46931..2db876f 100644
--- a/include/lv2/core/attributes.h
+++ b/include/lv2/core/attributes.h
@@ -43,4 +43,4 @@
    @}
 */
 
-#endif /* LV2_CORE_ATTRIBUTES_H */
+#endif // LV2_CORE_ATTRIBUTES_H
diff --git a/include/lv2/core/lv2.h b/include/lv2/core/lv2.h
index 22ed02f..b085ac5 100644
--- a/include/lv2/core/lv2.h
+++ b/include/lv2/core/lv2.h
@@ -3,8 +3,8 @@
 // Copyright 2000-2002 Richard W.E. Furse, Paul Barton-Davis, Stefan Westerfeld.
 // SPDX-License-Identifier: ISC
 
-#ifndef LV2_H_INCLUDED
-#define LV2_H_INCLUDED
+#ifndef LV2_CORE_LV2_H
+#define LV2_CORE_LV2_H
 
 /**
    @defgroup lv2 LV2
@@ -469,4 +469,4 @@ typedef const LV2_Lib_Descriptor* (*LV2_Lib_Descriptor_Function)(
    @}
 */
 
-#endif /* LV2_H_INCLUDED */
+#endif // LV2_CORE_LV2_H
diff --git a/include/lv2/core/lv2_util.h b/include/lv2/core/lv2_util.h
index 8cd2872..167e263 100644
--- a/include/lv2/core/lv2_util.h
+++ b/include/lv2/core/lv2_util.h
@@ -1,6 +1,9 @@
 // Copyright 2016 David Robillard <d@drobilla.net>
 // SPDX-License-Identifier: ISC
 
+#ifndef LV2_CORE_LV2_UTIL_H
+#define LV2_CORE_LV2_UTIL_H
+
 /**
    @defgroup util Utilities
    @ingroup lv2core
@@ -88,3 +91,5 @@ lv2_features_query(const LV2_Feature* const* features, ...)
 /**
    @}
 */
+
+#endif // LV2_CORE_LV2_UTIL_H
diff --git a/include/lv2/data-access/data-access.h b/include/lv2/data-access/data-access.h
index 2809d93..4586273 100644
--- a/include/lv2/data-access/data-access.h
+++ b/include/lv2/data-access/data-access.h
@@ -1,8 +1,8 @@
 // Copyright 2008-2016 David Robillard <d@drobilla.net>
 // SPDX-License-Identifier: ISC
 
-#ifndef LV2_DATA_ACCESS_H
-#define LV2_DATA_ACCESS_H
+#ifndef LV2_DATA_ACCESS_DATA_ACCESS_H
+#define LV2_DATA_ACCESS_DATA_ACCESS_H
 
 /**
    @defgroup data-access Data Access
@@ -57,4 +57,4 @@ typedef struct {
    @}
 */
 
-#endif /* LV2_DATA_ACCESS_H */
+#endif // LV2_DATA_ACCESS_DATA_ACCESS_H
diff --git a/include/lv2/dynmanifest/dynmanifest.h b/include/lv2/dynmanifest/dynmanifest.h
index d67c750..740c0a4 100644
--- a/include/lv2/dynmanifest/dynmanifest.h
+++ b/include/lv2/dynmanifest/dynmanifest.h
@@ -1,8 +1,8 @@
 // Copyright 2008-2011 Stefano D'Angelo <zanga.mail@gmail.com>
 // SPDX-License-Identifier: ISC
 
-#ifndef LV2_DYN_MANIFEST_H_INCLUDED
-#define LV2_DYN_MANIFEST_H_INCLUDED
+#ifndef LV2_DYNMANIFEST_DYNMANIFEST_H
+#define LV2_DYNMANIFEST_DYNMANIFEST_H
 
 /**
    @defgroup dynmanifest Dynamic Manifest
@@ -143,4 +143,4 @@ lv2_dyn_manifest_close(LV2_Dyn_Manifest_Handle handle);
    @}
 */
 
-#endif /* LV2_DYN_MANIFEST_H_INCLUDED */
+#endif // LV2_DYNMANIFEST_DYNMANIFEST_H
diff --git a/include/lv2/event/event-helpers.h b/include/lv2/event/event-helpers.h
index 0bf352f..a9eb423 100644
--- a/include/lv2/event/event-helpers.h
+++ b/include/lv2/event/event-helpers.h
@@ -1,8 +1,8 @@
 // Copyright 2008-2015 David Robillard <d@drobilla.net>
 // SPDX-License-Identifier: ISC
 
-#ifndef LV2_EVENT_HELPERS_H
-#define LV2_EVENT_HELPERS_H
+#ifndef LV2_EVENT_EVENT_HELPERS_H
+#define LV2_EVENT_EVENT_HELPERS_H
 
 /**
    @file event-helpers.h Helper functions for the LV2 Event extension
@@ -239,4 +239,4 @@ LV2_RESTORE_WARNINGS
 } /* extern "C" */
 #endif
 
-#endif /* LV2_EVENT_HELPERS_H */
+#endif // LV2_EVENT_EVENT_HELPERS_H
diff --git a/include/lv2/event/event.h b/include/lv2/event/event.h
index b880de1..e255291 100644
--- a/include/lv2/event/event.h
+++ b/include/lv2/event/event.h
@@ -2,8 +2,8 @@
 // Copyright 2006-2007 Lars Luthman <lars.luthman@gmail.com>
 // SPDX-License-Identifier: ISC
 
-#ifndef LV2_EVENT_H
-#define LV2_EVENT_H
+#ifndef LV2_EVENT_EVENT_H
+#define LV2_EVENT_EVENT_H
 
 /**
    @defgroup event Event
@@ -282,4 +282,4 @@ LV2_RESTORE_WARNINGS
    @}
 */
 
-#endif /* LV2_EVENT_H */
+#endif // LV2_EVENT_EVENT_H
diff --git a/include/lv2/instance-access/instance-access.h b/include/lv2/instance-access/instance-access.h
index a87ecaf..70c2789 100644
--- a/include/lv2/instance-access/instance-access.h
+++ b/include/lv2/instance-access/instance-access.h
@@ -1,8 +1,8 @@
 // Copyright 2008-2016 David Robillard <d@drobilla.net>
 // SPDX-License-Identifier: ISC
 
-#ifndef LV2_INSTANCE_ACCESS_H
-#define LV2_INSTANCE_ACCESS_H
+#ifndef LV2_INSTANCE_ACCESS_INSTANCE_ACCESS_H
+#define LV2_INSTANCE_ACCESS_INSTANCE_ACCESS_H
 
 /**
    @defgroup instance-access Instance Access
@@ -25,4 +25,4 @@
    @}
 */
 
-#endif /* LV2_INSTANCE_ACCESS_H */
+#endif // LV2_INSTANCE_ACCESS_INSTANCE_ACCESS_H
diff --git a/include/lv2/log/log.h b/include/lv2/log/log.h
index cdaa6d3..b460f45 100644
--- a/include/lv2/log/log.h
+++ b/include/lv2/log/log.h
@@ -1,8 +1,8 @@
 // Copyright 2012-2016 David Robillard <d@drobilla.net>
 // SPDX-License-Identifier: ISC
 
-#ifndef LV2_LOG_H
-#define LV2_LOG_H
+#ifndef LV2_LOG_LOG_H
+#define LV2_LOG_LOG_H
 
 /**
    @defgroup log Log
@@ -97,4 +97,4 @@ typedef struct {
    @}
 */
 
-#endif /* LV2_LOG_H */
+#endif // LV2_LOG_LOG_H
diff --git a/include/lv2/log/logger.h b/include/lv2/log/logger.h
index b7d2856..83cd653 100644
--- a/include/lv2/log/logger.h
+++ b/include/lv2/log/logger.h
@@ -1,8 +1,8 @@
 // Copyright 2012-2016 David Robillard <d@drobilla.net>
 // SPDX-License-Identifier: ISC
 
-#ifndef LV2_ATOM_LOGGER_H
-#define LV2_ATOM_LOGGER_H
+#ifndef LV2_LOG_LOGGER_H
+#define LV2_LOG_LOGGER_H
 
 /**
    @defgroup logger Logger
@@ -141,4 +141,4 @@ lv2_log_warning(LV2_Log_Logger* logger, const char* fmt, ...)
    @}
 */
 
-#endif /* LV2_LOG_LOGGER_H */
+#endif // LV2_LOG_LOGGER_H
diff --git a/include/lv2/midi/midi.h b/include/lv2/midi/midi.h
index cef7bc8..2a687fb 100644
--- a/include/lv2/midi/midi.h
+++ b/include/lv2/midi/midi.h
@@ -1,8 +1,8 @@
 // Copyright 2012-2016 David Robillard <d@drobilla.net>
 // SPDX-License-Identifier: ISC
 
-#ifndef LV2_MIDI_H
-#define LV2_MIDI_H
+#ifndef LV2_MIDI_MIDI_H
+#define LV2_MIDI_MIDI_H
 
 /**
    @defgroup midi MIDI
@@ -232,4 +232,4 @@ lv2_midi_message_type(const uint8_t* msg)
    @}
 */
 
-#endif /* LV2_MIDI_H */
+#endif // LV2_MIDI_MIDI_H
diff --git a/include/lv2/morph/morph.h b/include/lv2/morph/morph.h
index e60a7d5..88bfe81 100644
--- a/include/lv2/morph/morph.h
+++ b/include/lv2/morph/morph.h
@@ -1,8 +1,8 @@
 // Copyright 2012-2016 David Robillard <d@drobilla.net>
 // SPDX-License-Identifier: ISC
 
-#ifndef LV2_MORPH_H
-#define LV2_MORPH_H
+#ifndef LV2_MORPH_MORPH_H
+#define LV2_MORPH_MORPH_H
 
 /**
    @defgroup morph Morph
@@ -32,4 +32,4 @@
    @}
 */
 
-#endif /* LV2_MORPH_H */
+#endif // LV2_MORPH_MORPH_H
diff --git a/include/lv2/options/options.h b/include/lv2/options/options.h
index 48f7bfb..0169b46 100644
--- a/include/lv2/options/options.h
+++ b/include/lv2/options/options.h
@@ -1,8 +1,8 @@
 // Copyright 2012-2016 David Robillard <d@drobilla.net>
 // SPDX-License-Identifier: ISC
 
-#ifndef LV2_OPTIONS_H
-#define LV2_OPTIONS_H
+#ifndef LV2_OPTIONS_OPTIONS_H
+#define LV2_OPTIONS_OPTIONS_H
 
 /**
    @defgroup options Options
@@ -133,4 +133,4 @@ typedef struct {
    @}
 */
 
-#endif /* LV2_OPTIONS_H */
+#endif // LV2_OPTIONS_OPTIONS_H
diff --git a/include/lv2/parameters/parameters.h b/include/lv2/parameters/parameters.h
index 6c17a1c..b20c83e 100644
--- a/include/lv2/parameters/parameters.h
+++ b/include/lv2/parameters/parameters.h
@@ -1,8 +1,8 @@
 // Copyright 2012-2016 David Robillard <d@drobilla.net>
 // SPDX-License-Identifier: ISC
 
-#ifndef LV2_PARAMETERS_H
-#define LV2_PARAMETERS_H
+#ifndef LV2_PARAMETERS_PARAMETERS_H
+#define LV2_PARAMETERS_PARAMETERS_H
 
 /**
    @defgroup parameters Parameters
@@ -52,4 +52,4 @@
    @}
 */
 
-#endif /* LV2_PARAMETERS_H */
+#endif // LV2_PARAMETERS_PARAMETERS_H
diff --git a/include/lv2/patch/patch.h b/include/lv2/patch/patch.h
index 16b7889..99fd8e9 100644
--- a/include/lv2/patch/patch.h
+++ b/include/lv2/patch/patch.h
@@ -1,8 +1,8 @@
 // Copyright 2012-2016 David Robillard <d@drobilla.net>
 // SPDX-License-Identifier: ISC
 
-#ifndef LV2_PATCH_H
-#define LV2_PATCH_H
+#ifndef LV2_PATCH_PATCH_H
+#define LV2_PATCH_PATCH_H
 
 /**
    @defgroup patch Patch
@@ -57,4 +57,4 @@
    @}
 */
 
-#endif /* LV2_PATCH_H */
+#endif // LV2_PATCH_PATCH_H
diff --git a/include/lv2/port-groups/port-groups.h b/include/lv2/port-groups/port-groups.h
index 303890a..ff00533 100644
--- a/include/lv2/port-groups/port-groups.h
+++ b/include/lv2/port-groups/port-groups.h
@@ -1,8 +1,8 @@
 // Copyright 2012-2016 David Robillard <d@drobilla.net>
 // SPDX-License-Identifier: ISC
 
-#ifndef LV2_PORT_GROUPS_H
-#define LV2_PORT_GROUPS_H
+#ifndef LV2_PORT_GROUPS_PORT_GROUPS_H
+#define LV2_PORT_GROUPS_PORT_GROUPS_H
 
 /**
    @defgroup port-groups Port Groups
@@ -61,4 +61,4 @@
    @}
 */
 
-#endif /* LV2_PORT_GROUPS_H */
+#endif // LV2_PORT_GROUPS_PORT_GROUPS_H
diff --git a/include/lv2/port-props/port-props.h b/include/lv2/port-props/port-props.h
index ff45140..6007f4b 100644
--- a/include/lv2/port-props/port-props.h
+++ b/include/lv2/port-props/port-props.h
@@ -1,8 +1,8 @@
 // Copyright 2012-2016 David Robillard <d@drobilla.net>
 // SPDX-License-Identifier: ISC
 
-#ifndef LV2_PORT_PROPS_H
-#define LV2_PORT_PROPS_H
+#ifndef LV2_PORT_PROPS_PORT_PROPS_H
+#define LV2_PORT_PROPS_PORT_PROPS_H
 
 /**
    @defgroup port-props Port Properties
@@ -37,4 +37,4 @@
    @}
 */
 
-#endif /* LV2_PORT_PROPS_H */
+#endif // LV2_PORT_PROPS_PORT_PROPS_H
diff --git a/include/lv2/presets/presets.h b/include/lv2/presets/presets.h
index 7100605..ecd23a2 100644
--- a/include/lv2/presets/presets.h
+++ b/include/lv2/presets/presets.h
@@ -1,8 +1,8 @@
 // Copyright 2012-2016 David Robillard <d@drobilla.net>
 // SPDX-License-Identifier: ISC
 
-#ifndef LV2_PRESETS_H
-#define LV2_PRESETS_H
+#ifndef LV2_PRESETS_PRESETS_H
+#define LV2_PRESETS_PRESETS_H
 
 /**
    @defgroup presets Presets
@@ -32,4 +32,4 @@
    @}
 */
 
-#endif /* LV2_PRESETS_H */
+#endif // LV2_PRESETS_PRESETS_H
diff --git a/include/lv2/resize-port/resize-port.h b/include/lv2/resize-port/resize-port.h
index cd4828e..7593a6d 100644
--- a/include/lv2/resize-port/resize-port.h
+++ b/include/lv2/resize-port/resize-port.h
@@ -1,8 +1,8 @@
 // Copyright 2007-2016 David Robillard <d@drobilla.net>
 // SPDX-License-Identifier: ISC
 
-#ifndef LV2_RESIZE_PORT_H
-#define LV2_RESIZE_PORT_H
+#ifndef LV2_RESIZE_PORT_RESIZE_PORT_H
+#define LV2_RESIZE_PORT_RESIZE_PORT_H
 
 /**
    @defgroup resize-port Resize Port
@@ -73,4 +73,4 @@ typedef struct {
    @}
 */
 
-#endif /* LV2_RESIZE_PORT_H */
+#endif // LV2_RESIZE_PORT_RESIZE_PORT_H
diff --git a/include/lv2/state/state.h b/include/lv2/state/state.h
index 9c5d9d8..a44f3cc 100644
--- a/include/lv2/state/state.h
+++ b/include/lv2/state/state.h
@@ -2,8 +2,8 @@
 // Copyright 2010 Leonard Ritter <paniq@paniq.org>
 // SPDX-License-Identifier: ISC
 
-#ifndef LV2_STATE_H
-#define LV2_STATE_H
+#ifndef LV2_STATE_STATE_H
+#define LV2_STATE_STATE_H
 
 /**
    @defgroup state State
@@ -376,4 +376,4 @@ typedef struct {
    @}
 */
 
-#endif /* LV2_STATE_H */
+#endif // LV2_STATE_STATE_H
diff --git a/include/lv2/time/time.h b/include/lv2/time/time.h
index 83408c9..2d81dc7 100644
--- a/include/lv2/time/time.h
+++ b/include/lv2/time/time.h
@@ -1,8 +1,8 @@
 // Copyright 2011-2016 David Robillard <d@drobilla.net>
 // SPDX-License-Identifier: ISC
 
-#ifndef LV2_TIME_H
-#define LV2_TIME_H
+#ifndef LV2_TIME_TIME_H
+#define LV2_TIME_TIME_H
 
 /**
    @defgroup time Time
@@ -43,4 +43,4 @@
    @}
 */
 
-#endif /* LV2_TIME_H */
+#endif // LV2_TIME_TIME_H
diff --git a/include/lv2/ui/ui.h b/include/lv2/ui/ui.h
index 5ef75a3..4d2fed7 100644
--- a/include/lv2/ui/ui.h
+++ b/include/lv2/ui/ui.h
@@ -2,8 +2,8 @@
 // Copyright 2006-2011 Lars Luthman <lars.luthman@gmail.com>
 // SPDX-License-Identifier: ISC
 
-#ifndef LV2_UI_H
-#define LV2_UI_H
+#ifndef LV2_UI_UI_H
+#define LV2_UI_UI_H
 
 /**
    @defgroup ui User Interfaces
@@ -526,4 +526,4 @@ typedef const LV2UI_Descriptor* (*LV2UI_DescriptorFunction)(uint32_t index);
    @}
 */
 
-#endif /* LV2_UI_H */
+#endif // LV2_UI_UI_H
diff --git a/include/lv2/units/units.h b/include/lv2/units/units.h
index 0b8d416..a6ac4c5 100644
--- a/include/lv2/units/units.h
+++ b/include/lv2/units/units.h
@@ -1,8 +1,8 @@
 // Copyright 2012-2016 David Robillard <d@drobilla.net>
 // SPDX-License-Identifier: ISC
 
-#ifndef LV2_UNITS_H
-#define LV2_UNITS_H
+#ifndef LV2_UNITS_UNITS_H
+#define LV2_UNITS_UNITS_H
 
 /**
    @defgroup units Units
@@ -59,4 +59,4 @@
    @}
 */
 
-#endif /* LV2_UNITS_H */
+#endif // LV2_UNITS_UNITS_H
diff --git a/include/lv2/uri-map/uri-map.h b/include/lv2/uri-map/uri-map.h
index 0c683d0..dc25a55 100644
--- a/include/lv2/uri-map/uri-map.h
+++ b/include/lv2/uri-map/uri-map.h
@@ -1,8 +1,8 @@
 // Copyright 2008-2016 David Robillard <d@drobilla.net>
 // SPDX-License-Identifier: ISC
 
-#ifndef LV2_URI_MAP_H
-#define LV2_URI_MAP_H
+#ifndef LV2_URI_MAP_URI_MAP_H
+#define LV2_URI_MAP_URI_MAP_H
 
 /**
    @defgroup uri-map URI Map
@@ -105,4 +105,4 @@ LV2_RESTORE_WARNINGS
    @}
 */
 
-#endif /* LV2_URI_MAP_H */
+#endif // LV2_URI_MAP_URI_MAP_H
diff --git a/include/lv2/urid/urid.h b/include/lv2/urid/urid.h
index 5890307..8dc4332 100644
--- a/include/lv2/urid/urid.h
+++ b/include/lv2/urid/urid.h
@@ -2,8 +2,8 @@
 // Copyright 2011 Gabriel M. Beddingfield <gabrbedd@gmail.com>
 // SPDX-License-Identifier: ISC
 
-#ifndef LV2_URID_H
-#define LV2_URID_H
+#ifndef LV2_URID_URID_H
+#define LV2_URID_URID_H
 
 /**
    @defgroup urid URID
@@ -124,4 +124,4 @@ typedef struct {
    @}
 */
 
-#endif /* LV2_URID_H */
+#endif // LV2_URID_URID_H
diff --git a/include/lv2/worker/worker.h b/include/lv2/worker/worker.h
index 0b0e792..613198b 100644
--- a/include/lv2/worker/worker.h
+++ b/include/lv2/worker/worker.h
@@ -1,8 +1,8 @@
 // Copyright 2012-2016 David Robillard <d@drobilla.net>
 // SPDX-License-Identifier: ISC
 
-#ifndef LV2_WORKER_H
-#define LV2_WORKER_H
+#ifndef LV2_WORKER_WORKER_H
+#define LV2_WORKER_WORKER_H
 
 /**
    @defgroup worker Worker
@@ -167,4 +167,4 @@ typedef struct {
    @}
 */
 
-#endif /* LV2_WORKER_H */
+#endif // LV2_WORKER_WORKER_H