3 files changed, 6 insertions, 6 deletions
diff --git a/include/lv2/atom/forge.h b/include/lv2/atom/forge.h
index d651d70..f894a5a 100644
--- a/include/lv2/atom/forge.h
+++ b/include/lv2/atom/forge.h
@@ -306,7 +306,7 @@ lv2_atom_forge_pad(LV2_Atom_Forge* forge, uint32_t written)
 static inline LV2_Atom_Forge_Ref
 lv2_atom_forge_write(LV2_Atom_Forge* forge, const void* data, uint32_t size)
 {
-  LV2_Atom_Forge_Ref out = lv2_atom_forge_raw(forge, data, size);
+  const LV2_Atom_Forge_Ref out = lv2_atom_forge_raw(forge, data, size);
   if (out) {
     lv2_atom_forge_pad(forge, size);
   }
@@ -495,7 +495,7 @@ lv2_atom_forge_vector(LV2_Atom_Forge* forge,
     {(uint32_t)sizeof(LV2_Atom_Vector_Body) + n_elems * child_size,
      forge->Vector},
     {child_size, child_type}};
-  LV2_Atom_Forge_Ref out = lv2_atom_forge_write(forge, &a, sizeof(a));
+  const LV2_Atom_Forge_Ref out = lv2_atom_forge_write(forge, &a, sizeof(a));
   if (out) {
     lv2_atom_forge_write(forge, elems, child_size * n_elems);
   }
diff --git a/include/lv2/atom/util.h b/include/lv2/atom/util.h
index 556fb58..b1a1e93 100644
--- a/include/lv2/atom/util.h
+++ b/include/lv2/atom/util.h
@@ -373,7 +373,7 @@ lv2_atom_object_body_get(uint32_t size, const LV2_Atom_Object_Body* body, ...)
   LV2_ATOM_OBJECT_BODY_FOREACH (body, size, prop) {
     va_start(args, body);
     for (int i = 0; i < n_queries; ++i) {
-      uint32_t         qkey = va_arg(args, uint32_t);
+      const uint32_t   qkey = va_arg(args, uint32_t);
       const LV2_Atom** qval = va_arg(args, const LV2_Atom**);
       if (qkey == prop->key && !*qval) {
         *qval = &prop->value;
@@ -428,7 +428,7 @@ lv2_atom_object_get(const LV2_Atom_Object* object, ...)
   LV2_ATOM_OBJECT_FOREACH (object, prop) {
     va_start(args, object);
     for (int i = 0; i < n_queries; ++i) {
-      uint32_t         qkey = va_arg(args, uint32_t);
+      const uint32_t   qkey = va_arg(args, uint32_t);
       const LV2_Atom** qval = va_arg(args, const LV2_Atom**);
       if (qkey == prop->key && !*qval) {
         *qval = &prop->value;
diff --git a/include/lv2/core/lv2_util.h b/include/lv2/core/lv2_util.h
index 69b92e5..4e98e07 100644
--- a/include/lv2/core/lv2_util.h
+++ b/include/lv2/core/lv2_util.h
@@ -70,8 +70,8 @@ lv2_features_query(const LV2_Feature* const* features, ...)
 
   const char* uri = NULL;
   while ((uri = va_arg(args, const char*))) {
-    void** data     = va_arg(args, void**);
-    bool   required = (bool)va_arg(args, int);
+    void**     data     = va_arg(args, void**);
+    const bool required = (bool)va_arg(args, int);
 
     *data = lv2_features_data(features, uri);
     if (required && !*data) {