diff --git a/lib/wp/iterator.h b/lib/wp/iterator.h
index 7f839eae..14104fd9 100644
--- a/lib/wp/iterator.h
+++ b/lib/wp/iterator.h
@@ -49,7 +49,7 @@ typedef struct _WpIteratorMethods WpIteratorMethods;
  * This allows future expansion of the struct
  * \ingroup wpiterator
  */
-static const guint32 WP_ITERATOR_METHODS_VERSION = 0;
+#define  WP_ITERATOR_METHODS_VERSION 0U
 
 struct _WpIteratorMethods
 {
diff --git a/lib/wp/object-interest.h b/lib/wp/object-interest.h
index aa33bac3..d25e3f29 100644
--- a/lib/wp/object-interest.h
+++ b/lib/wp/object-interest.h
@@ -74,11 +74,11 @@ typedef enum { /*< flags >*/
  * have been matched
  * \ingroup wpobjectinterest
  */
-static const gint WP_INTEREST_MATCH_ALL =
-    (WP_INTEREST_MATCH_GTYPE |
-     WP_INTEREST_MATCH_PW_GLOBAL_PROPERTIES |
-     WP_INTEREST_MATCH_PW_PROPERTIES |
-     WP_INTEREST_MATCH_G_PROPERTIES);
+#define WP_INTEREST_MATCH_ALL \
+    (WP_INTEREST_MATCH_GTYPE | \
+     WP_INTEREST_MATCH_PW_GLOBAL_PROPERTIES | \
+     WP_INTEREST_MATCH_PW_PROPERTIES | \
+     WP_INTEREST_MATCH_G_PROPERTIES)
 
 /*!
  * \brief Flags to alter the behaviour of wp_object_interest_matches_full()
diff --git a/lib/wp/proxy.h b/lib/wp/proxy.h
index 2407986f..17187012 100644
--- a/lib/wp/proxy.h
+++ b/lib/wp/proxy.h
@@ -39,21 +39,21 @@ typedef enum { /*< flags >*/
  * This is a subset of \em WP_PIPEWIRE_OBJECT_FEATURES_ALL
  * \ingroup wpproxy
  */
-static const WpObjectFeatures WP_PIPEWIRE_OBJECT_FEATURES_MINIMAL =
-    (WP_PROXY_FEATURE_BOUND | WP_PIPEWIRE_OBJECT_FEATURE_INFO);
+#define WP_PIPEWIRE_OBJECT_FEATURES_MINIMAL \
+    (WP_PROXY_FEATURE_BOUND | WP_PIPEWIRE_OBJECT_FEATURE_INFO)
 
 /*!
  * \brief The complete common feature set for proxies implementing
  * WpPipewireObject. This is a subset of \em WP_OBJECT_FEATURES_ALL
  * \ingroup wpproxy
  */
-static const WpObjectFeatures WP_PIPEWIRE_OBJECT_FEATURES_ALL =
-    (WP_PIPEWIRE_OBJECT_FEATURES_MINIMAL |
-     WP_PIPEWIRE_OBJECT_FEATURE_PARAM_PROPS |
-     WP_PIPEWIRE_OBJECT_FEATURE_PARAM_FORMAT |
-     WP_PIPEWIRE_OBJECT_FEATURE_PARAM_PROFILE |
-     WP_PIPEWIRE_OBJECT_FEATURE_PARAM_PORT_CONFIG |
-     WP_PIPEWIRE_OBJECT_FEATURE_PARAM_ROUTE);
+#define WP_PIPEWIRE_OBJECT_FEATURES_ALL \
+    (WP_PIPEWIRE_OBJECT_FEATURES_MINIMAL | \
+     WP_PIPEWIRE_OBJECT_FEATURE_PARAM_PROPS | \
+     WP_PIPEWIRE_OBJECT_FEATURE_PARAM_FORMAT | \
+     WP_PIPEWIRE_OBJECT_FEATURE_PARAM_PROFILE | \
+     WP_PIPEWIRE_OBJECT_FEATURE_PARAM_PORT_CONFIG | \
+     WP_PIPEWIRE_OBJECT_FEATURE_PARAM_ROUTE)
 
 /*!
  * \brief The WpProxy GType
diff --git a/tests/wp/spa-pod.c b/tests/wp/spa-pod.c
index 04f23bfe..70b9b4d6 100644
--- a/tests/wp/spa-pod.c
+++ b/tests/wp/spa-pod.c
@@ -1026,7 +1026,7 @@ test_spa_pod_port_config (void)
      "channels",     "i", channels,
      NULL);
   g_autoptr (WpSpaPodBuilder) position_builder = wp_spa_pod_builder_new_array ();
-  for (guint i = 0; i < channels; i++)
+  for (gint i = 0; i < channels; i++)
     wp_spa_pod_builder_add_id (position_builder, 0);
   wp_spa_pod_builder_add_property (builder, "position");
   g_autoptr (WpSpaPod) position = wp_spa_pod_builder_end (position_builder);