4 files changed, 7 insertions, 7 deletions
diff --git a/src/lib/auditor_api_handle.c b/src/lib/auditor_api_handle.c
index ccb7cc1eb..731dcf0c3 100644
--- a/src/lib/auditor_api_handle.c
+++ b/src/lib/auditor_api_handle.c
@@ -525,7 +525,7 @@ TALER_AUDITOR_disconnect (struct TALER_AUDITOR_Handle *auditor)
     free_version_request (auditor->vr);
     auditor->vr = NULL;
   }
-  GNUNET_free_non_null (auditor->version);
+  GNUNET_free (auditor->version);
   if (NULL != auditor->retry_task)
   {
     GNUNET_SCHEDULER_cancel (auditor->retry_task);
diff --git a/src/lib/exchange_api_common.c b/src/lib/exchange_api_common.c
index 07f5e1873..2cde8d136 100644
--- a/src/lib/exchange_api_common.c
+++ b/src/lib/exchange_api_common.c
@@ -427,8 +427,8 @@ TALER_EXCHANGE_free_reserve_history (
     switch (rhistory[i].type)
     {
     case TALER_EXCHANGE_RTT_CREDIT:
-      GNUNET_free_non_null (rhistory[i].details.in_details.wire_reference);
-      GNUNET_free_non_null (rhistory[i].details.in_details.sender_url);
+      GNUNET_free (rhistory[i].details.in_details.wire_reference);
+      GNUNET_free (rhistory[i].details.in_details.sender_url);
       break;
     case TALER_EXCHANGE_RTT_WITHDRAWAL:
       break;
diff --git a/src/lib/exchange_api_handle.c b/src/lib/exchange_api_handle.c
index c3ae16633..6fa8979d0 100644
--- a/src/lib/exchange_api_handle.c
+++ b/src/lib/exchange_api_handle.c
@@ -1135,7 +1135,7 @@ free_key_data (struct TALER_EXCHANGE_Keys *key_data)
   GNUNET_array_grow (key_data->auditors,
                      key_data->auditors_size,
                      0);
-  GNUNET_free_non_null (key_data->version);
+  GNUNET_free (key_data->version);
   key_data->version = NULL;
 }
 
diff --git a/src/lib/exchange_api_refresh_common.c b/src/lib/exchange_api_refresh_common.c
index 9e9f6e0c0..8ac0bdfc9 100644
--- a/src/lib/exchange_api_refresh_common.c
+++ b/src/lib/exchange_api_refresh_common.c
@@ -61,7 +61,7 @@ TALER_EXCHANGE_free_melt_data_ (struct MeltData *md)
   }
 
   for (unsigned int i = 0; i<TALER_CNC_KAPPA; i++)
-    GNUNET_free_non_null (md->fresh_coins[i]);
+    GNUNET_free (md->fresh_coins[i]);
   /* Finally, clean up a bit... */
   GNUNET_CRYPTO_zero_keys (md,
                            sizeof (struct MeltData));
@@ -613,8 +613,8 @@ TALER_EXCHANGE_refresh_prepare (
   for (unsigned int i = 0; i < TALER_CNC_KAPPA; i++)
   {
     for (unsigned int j = 0; j < fresh_pks_len; j++)
-      GNUNET_free_non_null (rce[i].new_coins[j].coin_ev);
-    GNUNET_free_non_null (rce[i].new_coins);
+      GNUNET_free (rce[i].new_coins[j].coin_ev);
+    GNUNET_free (rce[i].new_coins);
   }
   TALER_EXCHANGE_free_melt_data_ (&md);
   return buf;