fixing a few missing renames for structs

6 files changed, 93 insertions, 88 deletions

diff --git a/src/mint/taler-mint-httpd_db.c b/src/mint/taler-mint-httpd_db.c
index f1253bd51..6a06d1fe7 100644
--- a/src/mint/taler-mint-httpd_db.c
+++ b/src/mint/taler-mint-httpd_db.c
@@ -40,18 +40,18 @@
  * @return #GNUNET_OK on success, #GNUNET_SYSERR on errors
  */
 static int
-calculate_transaction_list_totals (struct TALER_MINT_DB_TransactionList *tl,
+calculate_transaction_list_totals (struct TALER_MINTDB_TransactionList *tl,
                                    const struct TALER_Amount *off,
                                    struct TALER_Amount *ret)
 {
   struct TALER_Amount spent = *off;
-  struct TALER_MINT_DB_TransactionList *pos;
+  struct TALER_MINTDB_TransactionList *pos;
 
   for (pos = tl; NULL != pos; pos = pos->next)
   {
     switch (pos->type)
     {
-    case TALER_MINT_DB_TT_DEPOSIT:
+    case TALER_MINTDB_TT_DEPOSIT:
       if (GNUNET_OK !=
           TALER_amount_add (&spent,
                             &spent,
@@ -61,7 +61,7 @@ calculate_transaction_list_totals (struct TALER_MINT_DB_TransactionList *tl,
         return GNUNET_SYSERR;
       }
       break;
-    case TALER_MINT_DB_TT_REFRESH_MELT:
+    case TALER_MINTDB_TT_REFRESH_MELT:
       if (GNUNET_OK !=
           TALER_amount_add (&spent,
                             &spent,
@@ -71,7 +71,7 @@ calculate_transaction_list_totals (struct TALER_MINT_DB_TransactionList *tl,
         return GNUNET_SYSERR;
       }
       break;
-    case TALER_MINT_DB_TT_LOCK:
+    case TALER_MINTDB_TT_LOCK:
       /* should check if lock is still active,
          and if it is for THIS operation; if
          lock is inactive, delete it; if lock
@@ -99,34 +99,39 @@ calculate_transaction_list_totals (struct TALER_MINT_DB_TransactionList *tl,
  */
 int
 TMH_DB_execute_deposit (struct MHD_Connection *connection,
-                               const struct Deposit *deposit)
+                        const struct TALER_MINTDB_Deposit *deposit)
 {
   struct TALER_MINTDB_Session *session;
-  struct TALER_MINT_DB_TransactionList *tl;
+  struct TALER_MINTDB_TransactionList *tl;
   struct TALER_Amount spent;
   struct TALER_Amount value;
+  struct TALER_Amount amount_without_fee;
   struct TMH_KS_StateHandle *mks;
   struct TALER_MINTDB_DenominationKeyIssueInformation *dki;
   int ret;
 
   if (NULL == (session = TMH_plugin->get_session (TMH_plugin->cls,
-                                              GNUNET_NO)))
+                                                  GNUNET_NO)))
   {
     GNUNET_break (0);
     return TMH_RESPONSE_reply_internal_db_error (connection);
   }
   if (GNUNET_YES ==
       TMH_plugin->have_deposit (TMH_plugin->cls,
-                            session,
-                            deposit))
+                                session,
+                                deposit))
   {
+    GNUNET_assert (GNUNET_OK ==
+                   TALER_amount_subtract (&amount_without_fee,
+                                          &deposit->amount_with_fee,
+                                          &deposit->deposit_fee));
     return TMH_RESPONSE_reply_deposit_success (connection,
-                                             &deposit->coin.coin_pub,
-                                             &deposit->h_wire,
-                                             &deposit->h_contract,
-                                             deposit->transaction_id,
-                                             &deposit->merchant_pub,
-                                             &deposit->amount_with_fee);
+                                               &deposit->coin.coin_pub,
+                                               &deposit->h_wire,
+                                               &deposit->h_contract,
+                                               deposit->transaction_id,
+                                               &deposit->merchant_pub,
+                                               &amount_without_fee);
   }
   mks = TMH_KS_acquire ();
   dki = TMH_KS_denomination_key_lookup (mks,
@@ -214,7 +219,7 @@ TMH_DB_execute_withdraw_status (struct MHD_Connection *connection,
                                        const struct TALER_ReservePublicKeyP *reserve_pub)
 {
   struct TALER_MINTDB_Session *session;
-  struct ReserveHistory *rh;
+  struct TALER_MINTDB_ReserveHistory *rh;
   int res;
 
   if (NULL == (session = TMH_plugin->get_session (TMH_plugin->cls,
@@ -262,10 +267,10 @@ TMH_DB_execute_withdraw_sign (struct MHD_Connection *connection,
                                      const struct TALER_ReserveSignatureP *signature)
 {
   struct TALER_MINTDB_Session *session;
-  struct ReserveHistory *rh;
-  const struct ReserveHistory *pos;
+  struct TALER_MINTDB_ReserveHistory *rh;
+  const struct TALER_MINTDB_ReserveHistory *pos;
   struct TMH_KS_StateHandle *key_state;
-  struct CollectableBlindcoin collectable;
+  struct TALER_MINTDB_CollectableBlindcoin collectable;
   struct TALER_MINTDB_DenominationKeyIssueInformation *dki;
   struct TALER_MINTDB_DenominationKeyIssueInformation *tdki;
   struct GNUNET_CRYPTO_rsa_Signature *sig;
@@ -369,7 +374,7 @@ TMH_DB_execute_withdraw_sign (struct MHD_Connection *connection,
   {
     switch (pos->type)
     {
-    case TALER_MINT_DB_RO_BANK_TO_MINT:
+    case TALER_MINTDB_RO_BANK_TO_MINT:
       if (0 == (res & 1))
         deposit_total = pos->details.bank->amount;
       else
@@ -385,7 +390,7 @@ TMH_DB_execute_withdraw_sign (struct MHD_Connection *connection,
         }
       res |= 1;
       break;
-    case TALER_MINT_DB_RO_WITHDRAW_COIN:
+    case TALER_MINTDB_RO_WITHDRAW_COIN:
       tdki = TMH_KS_denomination_key_lookup (key_state,
                                        &pos->details.withdraw->denom_pub);
       TALER_amount_ntoh (&value,
@@ -499,11 +504,11 @@ refresh_accept_melts (struct MHD_Connection *connection,
                       uint16_t oldcoin_index)
 {
   struct TALER_DenominationKeyValidityPS *dki;
-  struct TALER_MINT_DB_TransactionList *tl;
+  struct TALER_MINTDB_TransactionList *tl;
   struct TALER_Amount coin_value;
   struct TALER_Amount coin_residual;
   struct TALER_Amount spent;
-  struct RefreshMelt melt;
+  struct TALER_MINTDB_RefreshMelt melt;
   int res;
 
   dki = &TMH_KS_denomination_key_lookup (key_state,
@@ -608,11 +613,11 @@ TMH_DB_execute_refresh_melt (struct MHD_Connection *connection,
                                     unsigned int coin_count,
                                     const struct TALER_CoinPublicInfo *coin_public_infos,
                                     const struct TMH_DB_MeltDetails *coin_melt_details,
-                                    struct RefreshCommitCoin *const* commit_coin,
-                                    struct RefreshCommitLink *const* commit_link)
+                                    struct TALER_MINTDB_RefreshCommitCoin *const* commit_coin,
+                                    struct TALER_MINTDB_RefreshCommitLinkP *const* commit_link)
 {
   struct TMH_KS_StateHandle *key_state;
-  struct RefreshSession refresh_session;
+  struct TALER_MINTDB_RefreshSession refresh_session;
   struct TALER_MINTDB_Session *session;
   int res;
   unsigned int i;
@@ -774,7 +779,7 @@ check_commitment (struct MHD_Connection *connection,
                   unsigned int off,
                   unsigned int num_oldcoins,
                   const struct TALER_TransferPrivateKeyP *transfer_privs,
-                  const struct RefreshMelt *melts,
+                  const struct TALER_MINTDB_RefreshMelt *melts,
                   unsigned int num_newcoins,
                   const struct TALER_DenominationPublicKey *denom_pubs)
 {
@@ -783,11 +788,11 @@ check_commitment (struct MHD_Connection *connection,
   int secret_initialized = GNUNET_NO;
   struct GNUNET_CRYPTO_EcdhePublicKey coin_ecdhe;
   struct GNUNET_CRYPTO_EcdhePrivateKey transfer_ecdhe;
-  struct RefreshCommitLink *commit_links;
-  struct RefreshCommitCoin *commit_coins;
+  struct TALER_MINTDB_RefreshCommitLinkP *commit_links;
+  struct TALER_MINTDB_RefreshCommitCoin *commit_coins;
 
   commit_links = GNUNET_malloc (num_oldcoins *
-                                sizeof (struct RefreshCommitLink));
+                                sizeof (struct TALER_MINTDB_RefreshCommitLinkP));
   if (GNUNET_OK !=
       TMH_plugin->get_refresh_commit_links (TMH_plugin->cls,
                                         session,
@@ -885,7 +890,7 @@ check_commitment (struct MHD_Connection *connection,
 
   /* Check that the commitments for all new coins were correct */
   commit_coins = GNUNET_malloc (num_newcoins *
-                                sizeof (struct RefreshCommitCoin));
+                                sizeof (struct TALER_MINTDB_RefreshCommitCoin));
 
   if (GNUNET_OK !=
       TMH_plugin->get_refresh_commit_coins (TMH_plugin->cls,
@@ -984,7 +989,7 @@ refresh_mint_coin (struct MHD_Connection *connection,
                    const struct GNUNET_HashCode *session_hash,
                    struct TMH_KS_StateHandle *key_state,
                    const struct TALER_DenominationPublicKey *denom_pub,
-                   const struct RefreshCommitCoin *commit_coin,
+                   const struct TALER_MINTDB_RefreshCommitCoin *commit_coin,
                    unsigned int coin_off)
 {
   struct TALER_MINTDB_DenominationKeyIssueInformation *dki;
@@ -1044,12 +1049,12 @@ TMH_DB_execute_refresh_reveal (struct MHD_Connection *connection,
 {
   int res;
   struct TALER_MINTDB_Session *session;
-  struct RefreshSession refresh_session;
+  struct TALER_MINTDB_RefreshSession refresh_session;
   struct TMH_KS_StateHandle *key_state;
-  struct RefreshMelt *melts;
+  struct TALER_MINTDB_RefreshMelt *melts;
   struct TALER_DenominationPublicKey *denom_pubs;
   struct TALER_DenominationSignature *ev_sigs;
-  struct RefreshCommitCoin *commit_coins;
+  struct TALER_MINTDB_RefreshCommitCoin *commit_coins;
   unsigned int i;
   unsigned int j;
   unsigned int off;
@@ -1077,7 +1082,7 @@ TMH_DB_execute_refresh_reveal (struct MHD_Connection *connection,
   }
 
   melts = GNUNET_malloc (refresh_session.num_oldcoins *
-                         sizeof (struct RefreshMelt));
+                         sizeof (struct TALER_MINTDB_RefreshMelt));
   for (j=0;j<refresh_session.num_oldcoins;j++)
   {
     if (GNUNET_OK !=
@@ -1147,7 +1152,7 @@ TMH_DB_execute_refresh_reveal (struct MHD_Connection *connection,
   }
 
   commit_coins = GNUNET_malloc (refresh_session.num_newcoins *
-                                sizeof (struct RefreshCommitCoin));
+                                sizeof (struct TALER_MINTDB_RefreshCommitCoin));
   if (GNUNET_OK !=
       TMH_plugin->get_refresh_commit_coins (TMH_plugin->cls,
                                         session,
@@ -1232,7 +1237,7 @@ TMH_DB_execute_refresh_link (struct MHD_Connection *connection,
   struct TALER_MINTDB_Session *session;
   struct TALER_TransferPublicKeyP transfer_pub;
   struct TALER_EncryptedLinkSecretP shared_secret_enc;
-  struct LinkDataList *ldl;
+  struct TALER_MINTDB_LinkDataList *ldl;
 
   if (NULL == (session = TMH_plugin->get_session (TMH_plugin->cls,
                                               GNUNET_NO)))
diff --git a/src/mint/taler-mint-httpd_db.h b/src/mint/taler-mint-httpd_db.h
index 8d51463d8..f92a999f0 100644
--- a/src/mint/taler-mint-httpd_db.h
+++ b/src/mint/taler-mint-httpd_db.h
@@ -39,7 +39,7 @@
  */
 int
 TMH_DB_execute_deposit (struct MHD_Connection *connection,
-                        const struct Deposit *deposit);
+                        const struct TALER_MINTDB_Deposit *deposit);
 
 
 /**
@@ -85,7 +85,7 @@ struct TMH_DB_MeltDetails
 {
   /**
    * Signature allowing the melt (using
-   * a `struct RefreshMeltConfirmSignRequestBody`) to sign over.
+   * a `struct TALER_MINTDB_RefreshMeltConfirmSignRequestBody`) to sign over.
    */
   struct TALER_CoinSpendSignatureP melt_sig;
 
@@ -127,8 +127,8 @@ TMH_DB_execute_refresh_melt (struct MHD_Connection *connection,
                              unsigned int coin_count,
                              const struct TALER_CoinPublicInfo *coin_public_infos,
                              const struct TMH_DB_MeltDetails *coin_melt_details,
-                             struct RefreshCommitCoin *const* commit_coin,
-                             struct RefreshCommitLink *const* commit_link);
+                             struct TALER_MINTDB_RefreshCommitCoin *const* commit_coin,
+                             struct TALER_MINTDB_RefreshCommitLinkP *const* commit_link);
 
 
 /**
diff --git a/src/mint/taler-mint-httpd_deposit.c b/src/mint/taler-mint-httpd_deposit.c
index 09e101f60..cdf6d6a98 100644
--- a/src/mint/taler-mint-httpd_deposit.c
+++ b/src/mint/taler-mint-httpd_deposit.c
@@ -53,7 +53,7 @@
  */
 static int
 verify_and_execute_deposit (struct MHD_Connection *connection,
-                            const struct Deposit *deposit)
+                            const struct TALER_MINTDB_Deposit *deposit)
 {
   struct TMH_KS_StateHandle *key_state;
   struct TALER_DepositRequestPS dr;
@@ -133,7 +133,7 @@ parse_and_handle_deposit_request (struct MHD_Connection *connection,
                                   json_t *wire)
 {
   int res;
-  struct Deposit deposit;
+  struct TALER_MINTDB_Deposit deposit;
   char *wire_enc;
   size_t len;
   struct TMH_PARSE_FieldSpecification spec[] = {
diff --git a/src/mint/taler-mint-httpd_refresh.c b/src/mint/taler-mint-httpd_refresh.c
index 53671dfab..dd625a6af 100644
--- a/src/mint/taler-mint-httpd_refresh.c
+++ b/src/mint/taler-mint-httpd_refresh.c
@@ -62,8 +62,8 @@ handle_refresh_melt_binary (struct MHD_Connection *connection,
                             struct TALER_CoinPublicInfo *coin_public_infos,
                             const struct TMH_DB_MeltDetails *coin_melt_details,
                             const struct GNUNET_HashCode *session_hash,
-                            struct RefreshCommitCoin *const* commit_coin,
-                            struct RefreshCommitLink *const* commit_link)
+                            struct TALER_MINTDB_RefreshCommitCoin *const* commit_coin,
+                            struct TALER_MINTDB_RefreshCommitLinkP *const* commit_link)
 
 {
   unsigned int i;
@@ -300,7 +300,7 @@ verify_coin_public_info (struct MHD_Connection *connection,
  * @param num_new_coins size of 2nd dimension
  */
 static void
-free_commit_coins (struct RefreshCommitCoin **commit_coin,
+free_commit_coins (struct TALER_MINTDB_RefreshCommitCoin **commit_coin,
                    unsigned int kappa,
                    unsigned int num_new_coins)
 {
@@ -329,7 +329,7 @@ free_commit_coins (struct RefreshCommitCoin **commit_coin,
  * @param num_old_coins size of 2nd dimension
  */
 static void
-free_commit_links (struct RefreshCommitLink **commit_link,
+free_commit_links (struct TALER_MINTDB_RefreshCommitLinkP **commit_link,
                    unsigned int kappa,
                    unsigned int num_old_coins)
 {
@@ -388,8 +388,8 @@ handle_refresh_melt_json (struct MHD_Connection *connection,
   unsigned int coin_count;
   struct GNUNET_HashCode session_hash;
   struct GNUNET_HashContext *hash_context;
-  struct RefreshCommitCoin *commit_coin[TALER_CNC_KAPPA];
-  struct RefreshCommitLink *commit_link[TALER_CNC_KAPPA];
+  struct TALER_MINTDB_RefreshCommitCoin *commit_coin[TALER_CNC_KAPPA];
+  struct TALER_MINTDB_RefreshCommitLinkP *commit_link[TALER_CNC_KAPPA];
 
   /* For the signature check, we hash most of the inputs together
      (except for the signatures on the coins). */
@@ -492,12 +492,12 @@ handle_refresh_melt_json (struct MHD_Connection *connection,
   for (i = 0; i < TALER_CNC_KAPPA; i++)
   {
     commit_coin[i] = GNUNET_malloc (num_newcoins *
-                                    sizeof (struct RefreshCommitCoin));
+                                    sizeof (struct TALER_MINTDB_RefreshCommitCoin));
     for (j = 0; j < num_newcoins; j++)
     {
       char *link_enc;
       size_t link_enc_size;
-      struct RefreshCommitCoin *rcc = &commit_coin[i][j];
+      struct TALER_MINTDB_RefreshCommitCoin *rcc = &commit_coin[i][j];
 
       res = TMH_PARSE_navigate_json (connection,
                                              coin_evs,
@@ -545,10 +545,10 @@ handle_refresh_melt_json (struct MHD_Connection *connection,
   for (i = 0; i < TALER_CNC_KAPPA; i++)
   {
     commit_link[i] = GNUNET_malloc (num_oldcoins *
-                                    sizeof (struct RefreshCommitLink));
+                                    sizeof (struct TALER_MINTDB_RefreshCommitLinkP));
     for (j = 0; j < num_oldcoins; j++)
     {
-      struct RefreshCommitLink *rcl = &commit_link[i][j];
+      struct TALER_MINTDB_RefreshCommitLinkP *rcl = &commit_link[i][j];
 
       res = TMH_PARSE_navigate_json (connection,
                                              transfer_pubs,
@@ -593,7 +593,7 @@ handle_refresh_melt_json (struct MHD_Connection *connection,
 
       GNUNET_CRYPTO_hash_context_read (hash_context,
                                        rcl,
-                                       sizeof (struct RefreshCommitLink));
+                                       sizeof (struct TALER_MINTDB_RefreshCommitLinkP));
     }
 
   }
diff --git a/src/mint/taler-mint-httpd_responses.c b/src/mint/taler-mint-httpd_responses.c
index c9ca51413..700090dba 100644
--- a/src/mint/taler-mint-httpd_responses.c
+++ b/src/mint/taler-mint-httpd_responses.c
@@ -277,7 +277,7 @@ TMH_RESPONSE_reply_invalid_json (struct MHD_Connection *connection)
  * @param h_contract hash of contract details
  * @param transaction_id transaction ID
  * @param merchant merchant public key
- * @param amount fraction of coin value to deposit
+ * @param amount_without_fee fraction of coin value to deposit, without the fee
  * @return MHD result code
  */
 int
@@ -287,7 +287,7 @@ TMH_RESPONSE_reply_deposit_success (struct MHD_Connection *connection,
                                   const struct GNUNET_HashCode *h_contract,
                                   uint64_t transaction_id,
                                   const struct TALER_MerchantPublicKeyP *merchant,
-                                  const struct TALER_Amount *amount)
+                                  const struct TALER_Amount *amount_without_fee)
 {
   struct TALER_DepositConfirmationPS dc;
   struct TALER_MintSignatureP sig;
@@ -299,8 +299,8 @@ TMH_RESPONSE_reply_deposit_success (struct MHD_Connection *connection,
   dc.h_contract = *h_contract;
   dc.h_wire = *h_wire;
   dc.transaction_id = GNUNET_htonll (transaction_id);
-  TALER_amount_hton (&dc.amount_with_fee,
-                     amount);
+  TALER_amount_hton (&dc.amount_without_fee,
+                     amount_without_fee);
   dc.coin_pub = *coin_pub;
   dc.merchant = *merchant;
   TMH_KS_sign (&dc.purpose,
@@ -324,23 +324,23 @@ TMH_RESPONSE_reply_deposit_success (struct MHD_Connection *connection,
  * @return json representation of the @a rh
  */
 static json_t *
-compile_transaction_history (const struct TALER_MINT_DB_TransactionList *tl)
+compile_transaction_history (const struct TALER_MINTDB_TransactionList *tl)
 {
   json_t *transaction;
   const char *type;
   struct TALER_Amount value;
   json_t *history;
-  const struct TALER_MINT_DB_TransactionList *pos;
+  const struct TALER_MINTDB_TransactionList *pos;
 
   history = json_array ();
   for (pos = tl; NULL != pos; pos = pos->next)
   {
     switch (pos->type)
     {
-    case TALER_MINT_DB_TT_DEPOSIT:
+    case TALER_MINTDB_TT_DEPOSIT:
       {
         struct TALER_DepositRequestPS dr;
-        const struct Deposit *deposit = pos->details.deposit;
+        const struct TALER_MINTDB_Deposit *deposit = pos->details.deposit;
 
         type = "deposit";
         value = deposit->amount_with_fee;
@@ -356,10 +356,10 @@ compile_transaction_history (const struct TALER_MINT_DB_TransactionList *tl)
                                                  &deposit->csig.ecdsa_signature);
         break;
       }
-    case TALER_MINT_DB_TT_REFRESH_MELT:
+    case TALER_MINTDB_TT_REFRESH_MELT:
       {
         struct TALER_RefreshMeltCoinAffirmationPS ms;
-        const struct RefreshMelt *melt = pos->details.melt;
+        const struct TALER_MINTDB_RefreshMelt *melt = pos->details.melt;
 
         type = "melt";
         value = melt->amount_with_fee;
@@ -373,7 +373,7 @@ compile_transaction_history (const struct TALER_MINT_DB_TransactionList *tl)
                                                  &melt->coin_sig.ecdsa_signature);
       }
       break;
-    case TALER_MINT_DB_TT_LOCK:
+    case TALER_MINTDB_TT_LOCK:
       {
         type = "lock";
         value = pos->details.lock->amount;
@@ -405,7 +405,7 @@ compile_transaction_history (const struct TALER_MINT_DB_TransactionList *tl)
  */
 int
 TMH_RESPONSE_reply_deposit_insufficient_funds (struct MHD_Connection *connection,
-                                             const struct TALER_MINT_DB_TransactionList *tl)
+                                             const struct TALER_MINTDB_TransactionList *tl)
 {
   json_t *history;
 
@@ -427,7 +427,7 @@ TMH_RESPONSE_reply_deposit_insufficient_funds (struct MHD_Connection *connection
  * @return json representation of the @a rh, NULL on error
  */
 static json_t *
-compile_reserve_history (const struct ReserveHistory *rh,
+compile_reserve_history (const struct TALER_MINTDB_ReserveHistory *rh,
                          struct TALER_Amount *balance)
 {
   struct TALER_Amount deposit_total;
@@ -436,7 +436,7 @@ compile_reserve_history (const struct ReserveHistory *rh,
   json_t *json_history;
   json_t *transaction;
   int ret;
-  const struct ReserveHistory *pos;
+  const struct TALER_MINTDB_ReserveHistory *pos;
   struct TALER_MINTDB_DenominationKeyIssueInformation *dki;
   struct TMH_KS_StateHandle *key_state;
   struct TALER_WithdrawRequestPS wr;
@@ -447,7 +447,7 @@ compile_reserve_history (const struct ReserveHistory *rh,
   {
     switch (pos->type)
     {
-    case TALER_MINT_DB_RO_BANK_TO_MINT:
+    case TALER_MINTDB_RO_BANK_TO_MINT:
       if (0 == ret)
         deposit_total = pos->details.bank->amount;
       else
@@ -466,7 +466,7 @@ compile_reserve_history (const struct ReserveHistory *rh,
                                         "wire", pos->details.bank->wire,
                                         "amount", TALER_json_from_amount (&pos->details.bank->amount)));
       break;
-    case TALER_MINT_DB_RO_WITHDRAW_COIN:
+    case TALER_MINTDB_RO_WITHDRAW_COIN:
       break;
     }
   }
@@ -477,9 +477,9 @@ compile_reserve_history (const struct ReserveHistory *rh,
   {
     switch (pos->type)
     {
-    case TALER_MINT_DB_RO_BANK_TO_MINT:
+    case TALER_MINTDB_RO_BANK_TO_MINT:
       break;
-    case TALER_MINT_DB_RO_WITHDRAW_COIN:
+    case TALER_MINTDB_RO_WITHDRAW_COIN:
 
       dki = TMH_KS_denomination_key_lookup (key_state,
                                       &pos->details.withdraw->denom_pub);
@@ -541,7 +541,7 @@ compile_reserve_history (const struct ReserveHistory *rh,
  */
 int
 TMH_RESPONSE_reply_withdraw_status_success (struct MHD_Connection *connection,
-                                          const struct ReserveHistory *rh)
+                                          const struct TALER_MINTDB_ReserveHistory *rh)
 {
   json_t *json_balance;
   json_t *json_history;
@@ -576,7 +576,7 @@ TMH_RESPONSE_reply_withdraw_status_success (struct MHD_Connection *connection,
  */
 int
 TMH_RESPONSE_reply_withdraw_sign_insufficient_funds (struct MHD_Connection *connection,
-                                                   const struct ReserveHistory *rh)
+                                                   const struct TALER_MINTDB_ReserveHistory *rh)
 {
   json_t *json_balance;
   json_t *json_history;
@@ -610,7 +610,7 @@ TMH_RESPONSE_reply_withdraw_sign_insufficient_funds (struct MHD_Connection *conn
  */
 int
 TMH_RESPONSE_reply_withdraw_sign_success (struct MHD_Connection *connection,
-                                        const struct CollectableBlindcoin *collectable)
+                                        const struct TALER_MINTDB_CollectableBlindcoin *collectable)
 {
   json_t *sig_json;
   int ret;
@@ -644,7 +644,7 @@ int
 TMH_RESPONSE_reply_refresh_melt_insufficient_funds (struct MHD_Connection *connection,
                                                   const union TALER_CoinSpendPublicKeyP *coin_pub,
                                                   struct TALER_Amount coin_value,
-                                                  struct TALER_MINT_DB_TransactionList *tl,
+                                                  struct TALER_MINTDB_TransactionList *tl,
                                                   struct TALER_Amount requested,
                                                   struct TALER_Amount residual)
 {
@@ -781,9 +781,9 @@ int
 TMH_RESPONSE_reply_refresh_link_success (struct MHD_Connection *connection,
                                        const struct TALER_TransferPublicKeyP *transfer_pub,
                                        const struct TALER_EncryptedLinkSecretP *shared_secret_enc,
-                                       const struct LinkDataList *ldl)
+                                       const struct TALER_MINTDB_LinkDataList *ldl)
 {
-  const struct LinkDataList *pos;
+  const struct TALER_MINTDB_LinkDataList *pos;
   json_t *root;
   json_t *list;
   int res;
diff --git a/src/mint/taler-mint-httpd_responses.h b/src/mint/taler-mint-httpd_responses.h
index c3a8daa70..3cee66a08 100644
--- a/src/mint/taler-mint-httpd_responses.h
+++ b/src/mint/taler-mint-httpd_responses.h
@@ -180,7 +180,7 @@ TMH_RESPONSE_reply_invalid_json (struct MHD_Connection *connection);
  * @param h_contract hash of contract details
  * @param transaction_id transaction ID
  * @param merchant merchant public key
- * @param amount fraction of coin value to deposit
+ * @param amount_without_fee fraction of coin value to deposit (without fee)
  * @return MHD result code
  */
 int
@@ -190,7 +190,7 @@ TMH_RESPONSE_reply_deposit_success (struct MHD_Connection *connection,
                                     const struct GNUNET_HashCode *h_contract,
                                     uint64_t transaction_id,
                                     const struct TALER_MerchantPublicKeyP *merchant,
-                                    const struct TALER_Amount *amount);
+                                    const struct TALER_Amount *amount_without_fee);
 
 
 /**
@@ -204,7 +204,7 @@ TMH_RESPONSE_reply_deposit_success (struct MHD_Connection *connection,
  */
 int
 TMH_RESPONSE_reply_deposit_insufficient_funds (struct MHD_Connection *connection,
-                                               const struct TALER_MINT_DB_TransactionList *tl);
+                                               const struct TALER_MINTDB_TransactionList *tl);
 
 
 /**
@@ -216,7 +216,7 @@ TMH_RESPONSE_reply_deposit_insufficient_funds (struct MHD_Connection *connection
  */
 int
 TMH_RESPONSE_reply_withdraw_status_success (struct MHD_Connection *connection,
-                                            const struct ReserveHistory *rh);
+                                            const struct TALER_MINTDB_ReserveHistory *rh);
 
 
 /**
@@ -230,7 +230,7 @@ TMH_RESPONSE_reply_withdraw_status_success (struct MHD_Connection *connection,
  */
 int
 TMH_RESPONSE_reply_withdraw_sign_insufficient_funds (struct MHD_Connection *connection,
-                                                     const struct ReserveHistory *rh);
+                                                     const struct TALER_MINTDB_ReserveHistory *rh);
 
 
 /**
@@ -242,7 +242,7 @@ TMH_RESPONSE_reply_withdraw_sign_insufficient_funds (struct MHD_Connection *conn
  */
 int
 TMH_RESPONSE_reply_withdraw_sign_success (struct MHD_Connection *connection,
-                                          const struct CollectableBlindcoin *collectable);
+                                          const struct TALER_MINTDB_CollectableBlindcoin *collectable);
 
 
 /**
@@ -278,7 +278,7 @@ int
 TMH_RESPONSE_reply_refresh_melt_insufficient_funds (struct MHD_Connection *connection,
                                                     const union TALER_CoinSpendPublicKeyP *coin_pub,
                                                     struct TALER_Amount coin_value,
-                                                    struct TALER_MINT_DB_TransactionList *tl,
+                                                    struct TALER_MINTDB_TransactionList *tl,
                                                     struct TALER_Amount requested,
                                                     struct TALER_Amount residual);
 
@@ -334,7 +334,7 @@ int
 TMH_RESPONSE_reply_refresh_link_success (struct MHD_Connection *connection,
                                          const struct TALER_TransferPublicKeyP *transfer_pub,
                                          const struct TALER_EncryptedLinkSecretP *shared_secret_enc,
-                                         const struct LinkDataList *ldl);
+                                         const struct TALER_MINTDB_LinkDataList *ldl);
 
 
 #endif