organize #include, remove redundant includes

21 files changed, 201 insertions, 233 deletions

diff --git a/src/include/taler_mint_service.h b/src/include/taler_mint_service.h
index 4c71c002a..4fd9a281d 100644
--- a/src/include/taler_mint_service.h
+++ b/src/include/taler_mint_service.h
@@ -22,7 +22,6 @@
 #define _TALER_MINT_SERVICE_H
 
 #include "taler_util.h"
-#include <jansson.h>
 
 /**
  * @brief Handle to this library context
diff --git a/src/include/taler_mintdb_lib.h b/src/include/taler_mintdb_lib.h
index 646693dee..739194a40 100644
--- a/src/include/taler_mintdb_lib.h
+++ b/src/include/taler_mintdb_lib.h
@@ -23,7 +23,6 @@
 #ifndef TALER_MINTDB_LIB_H
 #define TALER_MINTDB_LIB_H
 
-#include <gnunet/gnunet_util_lib.h>
 #include "taler_signatures.h"
 
 /**
diff --git a/src/include/taler_mintdb_plugin.h b/src/include/taler_mintdb_plugin.h
index 1a4a6c602..6cc8fd76c 100644
--- a/src/include/taler_mintdb_plugin.h
+++ b/src/include/taler_mintdb_plugin.h
@@ -23,8 +23,6 @@
 #define TALER_MINTDB_PLUGIN_H
 
 #include <gnunet/gnunet_util_lib.h>
-#include "taler_util.h"
-#include "taler_signatures.h"
 #include "taler_mintdb_lib.h"
 
 
diff --git a/src/include/taler_pq_lib.h b/src/include/taler_pq_lib.h
index d02dc55a6..06ff580fe 100644
--- a/src/include/taler_pq_lib.h
+++ b/src/include/taler_pq_lib.h
@@ -108,7 +108,7 @@ struct TALER_PQ_QueryParam
 /**
  * End of query parameter specification.
  */
-#define TALER_PQ_QUERY_PARAM_END { TALER_PQ_QF_END, NULL, 0 }
+#define TALER_PQ_query_param_end { TALER_PQ_QF_END, NULL, 0 }
 
 /**
  * Generate fixed-size query parameter with size given explicitly.
@@ -116,7 +116,7 @@ struct TALER_PQ_QueryParam
  * @param x pointer to the query parameter to pass
  * @param s number of bytes of @a x to use for the query
  */
-#define TALER_PQ_QUERY_PARAM_PTR_SIZED(x,s) { TALER_PQ_QF_FIXED_BLOB, (x), (s) }
+#define TALER_PQ_query_param_fixed_size(x,s) { TALER_PQ_QF_FIXED_BLOB, (x), (s) }
 
 
 /**
@@ -125,7 +125,7 @@ struct TALER_PQ_QueryParam
  *
  * @param x pointer to the query parameter to pass.
  */
-#define TALER_PQ_QUERY_PARAM_PTR(x) { TALER_PQ_QF_VARSIZE_BLOB, x, sizeof (*(x)) }
+#define TALER_PQ_query_param_auto_from_type(x) { TALER_PQ_QF_VARSIZE_BLOB, x, sizeof (*(x)) }
 
 
 /**
@@ -137,7 +137,7 @@ struct TALER_PQ_QueryParam
  * @param x pointer to the query parameter to pass
  */
 struct TALER_PQ_QueryParam
-TALER_PQ_QUERY_PARAM_AMOUNT_NBO(const struct TALER_AmountNBO *x);
+TALER_PQ_query_param_amount_nbo(const struct TALER_AmountNBO *x);
 
 
 /**
@@ -149,7 +149,7 @@ TALER_PQ_QUERY_PARAM_AMOUNT_NBO(const struct TALER_AmountNBO *x);
  * @param x pointer to the query parameter to pass
  */
 struct TALER_PQ_QueryParam
-TALER_PQ_QUERY_PARAM_AMOUNT(const struct TALER_Amount *x);
+TALER_PQ_query_param_amount(const struct TALER_Amount *x);
 
 
 /**
@@ -159,7 +159,7 @@ TALER_PQ_QUERY_PARAM_AMOUNT(const struct TALER_Amount *x);
  * @param x the query parameter to pass.
  */
 struct TALER_PQ_QueryParam
-TALER_PQ_QUERY_PARAM_RSA_PUBLIC_KEY(const struct GNUNET_CRYPTO_rsa_PublicKey *x);
+TALER_PQ_query_param_rsa_public_key(const struct GNUNET_CRYPTO_rsa_PublicKey *x);
 
 
 /**
@@ -169,7 +169,7 @@ TALER_PQ_QUERY_PARAM_RSA_PUBLIC_KEY(const struct GNUNET_CRYPTO_rsa_PublicKey *x)
  * @param x the query parameter to pass
  */
 struct TALER_PQ_QueryParam
-TALER_PQ_QUERY_PARAM_RSA_SIGNATURE(const struct GNUNET_CRYPTO_rsa_Signature *x);
+TALER_PQ_query_param_rsa_signature(const struct GNUNET_CRYPTO_rsa_Signature *x);
 
 
 /**
@@ -179,7 +179,7 @@ TALER_PQ_QUERY_PARAM_RSA_SIGNATURE(const struct GNUNET_CRYPTO_rsa_Signature *x);
  * @param x pointer to the query parameter to pass
  */
 struct TALER_PQ_QueryParam
-TALER_PQ_QUERY_PARAM_ABSOLUTE_TIME(const struct GNUNET_TIME_Absolute *x);
+TALER_PQ_query_param_absolute_time(const struct GNUNET_TIME_Absolute *x);
 
 
 /**
@@ -277,7 +277,7 @@ struct TALER_PQ_ResultSpec
  *
  * @return array last entry for the result specification to use
  */
-#define TALER_PQ_RESULT_SPEC_END { TALER_PQ_RF_END, NULL, 0, NULL, NULL }
+#define TALER_PQ_result_spec_end { TALER_PQ_RF_END, NULL, 0, NULL, NULL }
 
 /**
  * We expect a fixed-size result, with size given explicitly
@@ -287,7 +287,7 @@ struct TALER_PQ_ResultSpec
  * @param s number of bytes we should use in @a dst
  * @return array entry for the result specification to use
  */
-#define TALER_PQ_RESULT_SPEC_SIZED(name, dst, s) { TALER_PQ_RF_FIXED_BLOB,  (void *) (dst), (s), (name), NULL }
+#define TALER_PQ_result_spec_fixed_size(name, dst, s) { TALER_PQ_RF_FIXED_BLOB,  (void *) (dst), (s), (name), NULL }
 
 
 /**
@@ -297,7 +297,7 @@ struct TALER_PQ_ResultSpec
  * @param dst point to where to store the result, type fits expected result size
  * @return array entry for the result specification to use
  */
-#define TALER_PQ_RESULT_SPEC(name, dst) { TALER_PQ_RF_FIXED_BLOB, (void *) (dst), sizeof (*(dst)), name, NULL }
+#define TALER_PQ_result_spec_auto_from_type(name, dst) { TALER_PQ_RF_FIXED_BLOB, (void *) (dst), sizeof (*(dst)), name, NULL }
 
 
 /**
@@ -309,7 +309,7 @@ struct TALER_PQ_ResultSpec
  * @return array entry for the result specification to use
  */
 struct TALER_PQ_ResultSpec
-TALER_PQ_RESULT_SPEC_VAR (const char *name,
+TALER_PQ_result_spec_variable_size (const char *name,
 			  void **dst,
 			  size_t *sptr);
 
@@ -322,7 +322,7 @@ TALER_PQ_RESULT_SPEC_VAR (const char *name,
  * @return array entry for the result specification to use
  */
 struct TALER_PQ_ResultSpec
-TALER_PQ_RESULT_SPEC_AMOUNT_NBO (const char *name,
+TALER_PQ_result_spec_amount_nbo (const char *name,
 				 struct TALER_AmountNBO *amount);
 
 
@@ -334,7 +334,7 @@ TALER_PQ_RESULT_SPEC_AMOUNT_NBO (const char *name,
  * @return array entry for the result specification to use
  */
 struct TALER_PQ_ResultSpec
-TALER_PQ_RESULT_SPEC_AMOUNT (const char *name,
+TALER_PQ_result_spec_amount (const char *name,
 			     struct TALER_Amount *amount);
 
 
@@ -346,7 +346,7 @@ TALER_PQ_RESULT_SPEC_AMOUNT (const char *name,
  * @return array entry for the result specification to use
  */
 struct TALER_PQ_ResultSpec
-TALER_PQ_RESULT_SPEC_RSA_PUBLIC_KEY (const char *name,
+TALER_PQ_result_spec_rsa_public_key (const char *name,
 				     struct GNUNET_CRYPTO_rsa_PublicKey **rsa);
 
 
@@ -358,7 +358,7 @@ TALER_PQ_RESULT_SPEC_RSA_PUBLIC_KEY (const char *name,
  * @return array entry for the result specification to use
  */
 struct TALER_PQ_ResultSpec
-TALER_PQ_RESULT_SPEC_RSA_SIGNATURE (const char *name,
+TALER_PQ_result_spec_rsa_signature (const char *name,
 				    struct GNUNET_CRYPTO_rsa_Signature **sig);
 
 
@@ -370,7 +370,7 @@ TALER_PQ_RESULT_SPEC_RSA_SIGNATURE (const char *name,
  * @return array entry for the result specification to use
  */
 struct TALER_PQ_ResultSpec
-TALER_PQ_RESULT_SPEC_ABSOLUTE_TIME (const char *name,
+TALER_PQ_result_spec_absolute_time (const char *name,
 				    struct GNUNET_TIME_Absolute *at);
 
 
diff --git a/src/include/taler_util.h b/src/include/taler_util.h
index cad899685..c9db9f789 100644
--- a/src/include/taler_util.h
+++ b/src/include/taler_util.h
@@ -108,7 +108,7 @@ TALER_config_get_denom (struct GNUNET_CONFIGURATION_Handle *cfg,
  * @return a pointer to the dir path (to be freed by the caller)
  */
 char *
-TALER_os_installation_get_path (enum GNUNET_OS_InstallationPathKind dirkind);
+TALER_OS_installation_get_path (enum GNUNET_OS_InstallationPathKind dirkind);
 
 
 /**
diff --git a/src/mint-tools/taler-mint-dbinit.c b/src/mint-tools/taler-mint-dbinit.c
index 0eefc63b4..3293a69ab 100644
--- a/src/mint-tools/taler-mint-dbinit.c
+++ b/src/mint-tools/taler-mint-dbinit.c
@@ -21,9 +21,7 @@
 #include "platform.h"
 #include <gnunet/gnunet_util_lib.h>
 #include <libpq-fe.h>
-#include "taler_util.h"
 #include "taler_mintdb_plugin.h"
-#include "taler_mintdb_lib.h"
 
 /**
  * Mint directory with the keys.
diff --git a/src/mint-tools/taler-mint-keyup.c b/src/mint-tools/taler-mint-keyup.c
index cc60756a9..70c664433 100644
--- a/src/mint-tools/taler-mint-keyup.c
+++ b/src/mint-tools/taler-mint-keyup.c
@@ -22,8 +22,6 @@
  * @author Christian Grothoff
  */
 #include <platform.h>
-#include <gnunet/gnunet_util_lib.h>
-#include "taler_util.h"
 #include "taler_mintdb_lib.h"
 
 /**
diff --git a/src/mint-tools/taler-mint-reservemod.c b/src/mint-tools/taler-mint-reservemod.c
index 645a2f32e..9dff5731c 100644
--- a/src/mint-tools/taler-mint-reservemod.c
+++ b/src/mint-tools/taler-mint-reservemod.c
@@ -22,11 +22,7 @@
 #include "platform.h"
 #include <gnunet/gnunet_util_lib.h>
 #include <libpq-fe.h>
-#include "taler_util.h"
-#include "taler_signatures.h"
-#include "taler_pq_lib.h"
 #include "taler_mintdb_plugin.h"
-#include "taler_mintdb_lib.h"
 
 /**
  * After what time to inactive reserves expire?
diff --git a/src/mint/taler-mint-httpd.c b/src/mint/taler-mint-httpd.c
index deb30661f..b9146c5d8 100644
--- a/src/mint/taler-mint-httpd.c
+++ b/src/mint/taler-mint-httpd.c
@@ -26,8 +26,6 @@
 #include <jansson.h>
 #include <microhttpd.h>
 #include <pthread.h>
-#include "taler_signatures.h"
-#include "taler_util.h"
 #include "taler-mint-httpd_parsing.h"
 #include "taler-mint-httpd_mhd.h"
 #include "taler-mint-httpd_deposit.h"
diff --git a/src/mint/taler-mint-httpd_db.c b/src/mint/taler-mint-httpd_db.c
index b4256c037..22f225c22 100644
--- a/src/mint/taler-mint-httpd_db.c
+++ b/src/mint/taler-mint-httpd_db.c
@@ -21,12 +21,8 @@
 #include "platform.h"
 #include <pthread.h>
 #include <jansson.h>
-#include "taler-mint-httpd_db.h"
-#include "taler_signatures.h"
 #include "taler-mint-httpd_responses.h"
-#include "taler_util.h"
 #include "taler-mint-httpd_keystate.h"
-#include "taler_mintdb_lib.h"
 
 
 /**
diff --git a/src/mint/taler-mint-httpd_db.h b/src/mint/taler-mint-httpd_db.h
index 4319a81e5..56a4dd9cb 100644
--- a/src/mint/taler-mint-httpd_db.h
+++ b/src/mint/taler-mint-httpd_db.h
@@ -22,8 +22,6 @@
 #define TALER_MINT_HTTPD_DB_H
 
 #include <microhttpd.h>
-#include <gnunet/gnunet_util_lib.h>
-#include "taler_util.h"
 #include "taler_mintdb_plugin.h"
 
 
diff --git a/src/mint/taler-mint-httpd_deposit.c b/src/mint/taler-mint-httpd_deposit.c
index bf182d00c..2e9facdff 100644
--- a/src/mint/taler-mint-httpd_deposit.c
+++ b/src/mint/taler-mint-httpd_deposit.c
@@ -30,11 +30,7 @@
 #include <jansson.h>
 #include <microhttpd.h>
 #include <pthread.h>
-#include "taler_mintdb_plugin.h"
-#include "taler_signatures.h"
-#include "taler_util.h"
 #include "taler-mint-httpd_parsing.h"
-#include "taler-mint-httpd_db.h"
 #include "taler-mint-httpd_deposit.h"
 #include "taler-mint-httpd_responses.h"
 #include "taler-mint-httpd_keystate.h"
diff --git a/src/mint/taler-mint-httpd_refresh.c b/src/mint/taler-mint-httpd_refresh.c
index cde7d22ca..0ffba6e87 100644
--- a/src/mint/taler-mint-httpd_refresh.c
+++ b/src/mint/taler-mint-httpd_refresh.c
@@ -24,9 +24,6 @@
 #include <gnunet/gnunet_util_lib.h>
 #include <jansson.h>
 #include <microhttpd.h>
-#include "taler_mintdb_plugin.h"
-#include "taler_signatures.h"
-#include "taler_util.h"
 #include "taler-mint-httpd_parsing.h"
 #include "taler-mint-httpd_mhd.h"
 #include "taler-mint-httpd_refresh.h"
diff --git a/src/mint/taler-mint-httpd_test.c b/src/mint/taler-mint-httpd_test.c
index 61bd4d968..22c13908e 100644
--- a/src/mint/taler-mint-httpd_test.c
+++ b/src/mint/taler-mint-httpd_test.c
@@ -24,7 +24,6 @@
 #include <jansson.h>
 #include <microhttpd.h>
 #include "taler_signatures.h"
-#include "taler_util.h"
 #include "taler-mint-httpd_test.h"
 #include "taler-mint-httpd_parsing.h"
 #include "taler-mint-httpd_responses.h"
diff --git a/src/mintdb/mintdb_plugin.c b/src/mintdb/mintdb_plugin.c
index 4480e27c5..2e8d206fd 100644
--- a/src/mintdb/mintdb_plugin.c
+++ b/src/mintdb/mintdb_plugin.c
@@ -20,7 +20,6 @@
  * @author Sree Harsha Totakura <sreeharsha@totakura.in>
  */
 #include "platform.h"
-#include "taler_mintdb_lib.h"
 #include "taler_mintdb_plugin.h"
 #include <ltdl.h>
 
@@ -112,7 +111,7 @@ plugin_init ()
   opath = lt_dlgetsearchpath ();
   if (NULL != opath)
     old_dlsearchpath = GNUNET_strdup (opath);
-  path = TALER_os_installation_get_path (GNUNET_OS_IPK_LIBDIR);
+  path = TALER_OS_installation_get_path (GNUNET_OS_IPK_LIBDIR);
   if (NULL != path)
   {
     if (NULL != opath)
diff --git a/src/mintdb/plugin_mintdb_postgres.c b/src/mintdb/plugin_mintdb_postgres.c
index e5eb7cce7..3800f03b2 100644
--- a/src/mintdb/plugin_mintdb_postgres.c
+++ b/src/mintdb/plugin_mintdb_postgres.c
@@ -23,7 +23,6 @@
  */
 #include "platform.h"
 #include "taler_pq_lib.h"
-#include "taler_signatures.h"
 #include "taler_mintdb_plugin.h"
 #include <pthread.h>
 #include <libpq-fe.h>
@@ -862,15 +861,15 @@ postgres_insert_denomination (void *cls,
   int ret;
 
   struct TALER_PQ_QueryParam params[] = {
-    TALER_PQ_QUERY_PARAM_RSA_PUBLIC_KEY (dki->denom_pub.rsa_public_key),
-    TALER_PQ_QUERY_PARAM_PTR (&issue->start.abs_value_us__),
-    TALER_PQ_QUERY_PARAM_PTR (&issue->expire_withdraw.abs_value_us__),
-    TALER_PQ_QUERY_PARAM_PTR (&issue->expire_spend.abs_value_us__),
-    TALER_PQ_QUERY_PARAM_PTR (&issue->expire_legal.abs_value_us__),
-    TALER_PQ_QUERY_PARAM_AMOUNT_NBO (&issue->value),
-    TALER_PQ_QUERY_PARAM_AMOUNT_NBO (&issue->fee_withdraw),
-    TALER_PQ_QUERY_PARAM_AMOUNT_NBO (&issue->fee_refresh),
-    TALER_PQ_QUERY_PARAM_END
+    TALER_PQ_query_param_rsa_public_key (dki->denom_pub.rsa_public_key),
+    TALER_PQ_query_param_auto_from_type (&issue->start.abs_value_us__),
+    TALER_PQ_query_param_auto_from_type (&issue->expire_withdraw.abs_value_us__),
+    TALER_PQ_query_param_auto_from_type (&issue->expire_spend.abs_value_us__),
+    TALER_PQ_query_param_auto_from_type (&issue->expire_legal.abs_value_us__),
+    TALER_PQ_query_param_amount_nbo (&issue->value),
+    TALER_PQ_query_param_amount_nbo (&issue->fee_withdraw),
+    TALER_PQ_query_param_amount_nbo (&issue->fee_refresh),
+    TALER_PQ_query_param_end
   };
   result = TALER_PQ_exec_prepared (session->conn,
                                    "insert_denomination",
@@ -906,13 +905,13 @@ postgres_reserve_get (void *cls,
 {
   PGresult *result;
   struct TALER_PQ_QueryParam params[] = {
-    TALER_PQ_QUERY_PARAM_PTR(&reserve->pub),
-    TALER_PQ_QUERY_PARAM_END
+    TALER_PQ_query_param_auto_from_type(&reserve->pub),
+    TALER_PQ_query_param_end
   };
   struct TALER_PQ_ResultSpec rs[] = {
-    TALER_PQ_RESULT_SPEC_AMOUNT("current_balance", &reserve->balance),
-    TALER_PQ_RESULT_SPEC_ABSOLUTE_TIME("expiration_date", &reserve->expiry),
-    TALER_PQ_RESULT_SPEC_END
+    TALER_PQ_result_spec_amount("current_balance", &reserve->balance),
+    TALER_PQ_result_spec_absolute_time("expiration_date", &reserve->expiry),
+    TALER_PQ_result_spec_end
   };
 
   result = TALER_PQ_exec_prepared (session->conn,
@@ -962,10 +961,10 @@ postgres_reserves_update (void *cls,
   if (NULL == reserve)
     return GNUNET_SYSERR;
   struct TALER_PQ_QueryParam params[] = {
-    TALER_PQ_QUERY_PARAM_ABSOLUTE_TIME (&reserve->expiry),
-    TALER_PQ_QUERY_PARAM_AMOUNT (&reserve->balance),
-    TALER_PQ_QUERY_PARAM_PTR (&reserve->pub),
-    TALER_PQ_QUERY_PARAM_END
+    TALER_PQ_query_param_absolute_time (&reserve->expiry),
+    TALER_PQ_query_param_amount (&reserve->balance),
+    TALER_PQ_query_param_auto_from_type (&reserve->pub),
+    TALER_PQ_query_param_end
   };
   result = TALER_PQ_exec_prepared (session->conn,
                                    "update_reserve",
@@ -1034,10 +1033,10 @@ postgres_reserves_in_insert (void *cls,
     GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
                 "Reserve does not exist; creating a new one\n");
     struct TALER_PQ_QueryParam params[] = {
-      TALER_PQ_QUERY_PARAM_PTR (reserve_pub),
-      TALER_PQ_QUERY_PARAM_AMOUNT (balance),
-      TALER_PQ_QUERY_PARAM_ABSOLUTE_TIME (&expiry),
-      TALER_PQ_QUERY_PARAM_END
+      TALER_PQ_query_param_auto_from_type (reserve_pub),
+      TALER_PQ_query_param_amount (balance),
+      TALER_PQ_query_param_absolute_time (&expiry),
+      TALER_PQ_query_param_end
     };
     result = TALER_PQ_exec_prepared (session->conn,
                                      "create_reserve",
@@ -1073,11 +1072,11 @@ postgres_reserves_in_insert (void *cls,
   /* create new incoming transaction, SQL "primary key" logic
      is used to guard against duplicates! */
   struct TALER_PQ_QueryParam params[] = {
-    TALER_PQ_QUERY_PARAM_PTR (&reserve.pub),
-    TALER_PQ_QUERY_PARAM_AMOUNT (balance),
-    TALER_PQ_QUERY_PARAM_PTR_SIZED (details, strlen (details)),
-    TALER_PQ_QUERY_PARAM_ABSOLUTE_TIME (&expiry),
-    TALER_PQ_QUERY_PARAM_END
+    TALER_PQ_query_param_auto_from_type (&reserve.pub),
+    TALER_PQ_query_param_amount (balance),
+    TALER_PQ_query_param_fixed_size (details, strlen (details)),
+    TALER_PQ_query_param_absolute_time (&expiry),
+    TALER_PQ_query_param_end
   };
   result = TALER_PQ_exec_prepared (session->conn,
                                    "create_reserves_in_transaction",
@@ -1143,8 +1142,8 @@ postgres_get_collectable_blindcoin (void *cls,
 {
   PGresult *result;
   struct TALER_PQ_QueryParam params[] = {
-    TALER_PQ_QUERY_PARAM_PTR (h_blind),
-    TALER_PQ_QUERY_PARAM_END
+    TALER_PQ_query_param_auto_from_type (h_blind),
+    TALER_PQ_query_param_end
   };
   struct GNUNET_CRYPTO_rsa_PublicKey *denom_pub;
   struct GNUNET_CRYPTO_rsa_Signature *denom_sig;
@@ -1166,11 +1165,11 @@ postgres_get_collectable_blindcoin (void *cls,
     goto cleanup;
   }
   struct TALER_PQ_ResultSpec rs[] = {
-    TALER_PQ_RESULT_SPEC_RSA_PUBLIC_KEY("denom_pub", &denom_pub),
-    TALER_PQ_RESULT_SPEC_RSA_SIGNATURE("denom_sig", &denom_sig),
-    TALER_PQ_RESULT_SPEC("reserve_sig", &collectable->reserve_sig),
-    TALER_PQ_RESULT_SPEC("reserve_pub", &collectable->reserve_pub),
-    TALER_PQ_RESULT_SPEC_END
+    TALER_PQ_result_spec_rsa_public_key("denom_pub", &denom_pub),
+    TALER_PQ_result_spec_rsa_signature("denom_sig", &denom_sig),
+    TALER_PQ_result_spec_auto_from_type("reserve_sig", &collectable->reserve_sig),
+    TALER_PQ_result_spec_auto_from_type("reserve_pub", &collectable->reserve_pub),
+    TALER_PQ_result_spec_end
   };
 
   if (GNUNET_OK != TALER_PQ_extract_result (result, rs, 0))
@@ -1216,12 +1215,12 @@ postgres_insert_collectable_blindcoin (void *cls,
   struct TALER_MINTDB_Reserve reserve;
   int ret = GNUNET_SYSERR;
   struct TALER_PQ_QueryParam params[] = {
-    TALER_PQ_QUERY_PARAM_PTR (h_blind),
-    TALER_PQ_QUERY_PARAM_RSA_PUBLIC_KEY (collectable->denom_pub.rsa_public_key),
-    TALER_PQ_QUERY_PARAM_RSA_SIGNATURE (collectable->sig.rsa_signature),
-    TALER_PQ_QUERY_PARAM_PTR (&collectable->reserve_pub),
-    TALER_PQ_QUERY_PARAM_PTR (&collectable->reserve_sig),
-    TALER_PQ_QUERY_PARAM_END
+    TALER_PQ_query_param_auto_from_type (h_blind),
+    TALER_PQ_query_param_rsa_public_key (collectable->denom_pub.rsa_public_key),
+    TALER_PQ_query_param_rsa_signature (collectable->sig.rsa_signature),
+    TALER_PQ_query_param_auto_from_type (&collectable->reserve_pub),
+    TALER_PQ_query_param_auto_from_type (&collectable->reserve_sig),
+    TALER_PQ_query_param_end
   };
 
   if (GNUNET_OK != postgres_start (cls,
@@ -1294,8 +1293,8 @@ postgres_get_reserve_history (void *cls,
   {
     struct TALER_MINTDB_BankTransfer *bt;
     struct TALER_PQ_QueryParam params[] = {
-      TALER_PQ_QUERY_PARAM_PTR (reserve_pub),
-      TALER_PQ_QUERY_PARAM_END
+      TALER_PQ_query_param_auto_from_type (reserve_pub),
+      TALER_PQ_query_param_end
     };
 
     result = TALER_PQ_exec_prepared (session->conn,
@@ -1351,8 +1350,8 @@ postgres_get_reserve_history (void *cls,
     struct GNUNET_CRYPTO_rsa_Signature *denom_sig;
 
     struct TALER_PQ_QueryParam params[] = {
-      TALER_PQ_QUERY_PARAM_PTR (reserve_pub),
-      TALER_PQ_QUERY_PARAM_END
+      TALER_PQ_query_param_auto_from_type (reserve_pub),
+      TALER_PQ_query_param_end
     };
     result = TALER_PQ_exec_prepared (session->conn,
                                      "get_reserves_blindcoins",
@@ -1368,11 +1367,11 @@ postgres_get_reserve_history (void *cls,
       goto cleanup;
     }
     struct TALER_PQ_ResultSpec rs[] = {
-      TALER_PQ_RESULT_SPEC ("blind_ev", &blind_ev),
-      TALER_PQ_RESULT_SPEC_RSA_PUBLIC_KEY ("denom_pub", &denom_pub),
-      TALER_PQ_RESULT_SPEC_RSA_SIGNATURE ("denom_sig", &denom_sig),
-      TALER_PQ_RESULT_SPEC ("reserve_sig", &reserve_sig),
-      TALER_PQ_RESULT_SPEC_END
+      TALER_PQ_result_spec_auto_from_type ("blind_ev", &blind_ev),
+      TALER_PQ_result_spec_rsa_public_key ("denom_pub", &denom_pub),
+      TALER_PQ_result_spec_rsa_signature ("denom_sig", &denom_sig),
+      TALER_PQ_result_spec_auto_from_type ("reserve_sig", &reserve_sig),
+      TALER_PQ_result_spec_end
     };
     GNUNET_assert (NULL != rh);
     GNUNET_assert (NULL != rh_head);
@@ -1427,10 +1426,10 @@ postgres_have_deposit (void *cls,
                        const struct TALER_MINTDB_Deposit *deposit)
 {
   struct TALER_PQ_QueryParam params[] = {
-    TALER_PQ_QUERY_PARAM_PTR (&deposit->coin.coin_pub),
-    TALER_PQ_QUERY_PARAM_PTR (&deposit->transaction_id),
-    TALER_PQ_QUERY_PARAM_PTR (&deposit->merchant_pub),
-    TALER_PQ_QUERY_PARAM_END
+    TALER_PQ_query_param_auto_from_type (&deposit->coin.coin_pub),
+    TALER_PQ_query_param_auto_from_type (&deposit->transaction_id),
+    TALER_PQ_query_param_auto_from_type (&deposit->merchant_pub),
+    TALER_PQ_query_param_end
   };
   PGresult *result;
   int ret;
@@ -1480,18 +1479,18 @@ postgres_insert_deposit (void *cls,
   ret = GNUNET_SYSERR;
   json_wire_enc = json_dumps (deposit->wire, JSON_COMPACT);
   struct TALER_PQ_QueryParam params[]= {
-    TALER_PQ_QUERY_PARAM_PTR (&deposit->coin.coin_pub),
-    TALER_PQ_QUERY_PARAM_RSA_PUBLIC_KEY (deposit->coin.denom_pub.rsa_public_key),
-    TALER_PQ_QUERY_PARAM_RSA_SIGNATURE (deposit->coin.denom_sig.rsa_signature),
-    TALER_PQ_QUERY_PARAM_PTR (&deposit->transaction_id),
-    TALER_PQ_QUERY_PARAM_AMOUNT (&deposit->amount_with_fee),
-    TALER_PQ_QUERY_PARAM_PTR (&deposit->merchant_pub),
-    TALER_PQ_QUERY_PARAM_PTR (&deposit->h_contract),
-    TALER_PQ_QUERY_PARAM_PTR (&deposit->h_wire),
-    TALER_PQ_QUERY_PARAM_PTR (&deposit->csig),
-    TALER_PQ_QUERY_PARAM_PTR_SIZED (json_wire_enc,
+    TALER_PQ_query_param_auto_from_type (&deposit->coin.coin_pub),
+    TALER_PQ_query_param_rsa_public_key (deposit->coin.denom_pub.rsa_public_key),
+    TALER_PQ_query_param_rsa_signature (deposit->coin.denom_sig.rsa_signature),
+    TALER_PQ_query_param_auto_from_type (&deposit->transaction_id),
+    TALER_PQ_query_param_amount (&deposit->amount_with_fee),
+    TALER_PQ_query_param_auto_from_type (&deposit->merchant_pub),
+    TALER_PQ_query_param_auto_from_type (&deposit->h_contract),
+    TALER_PQ_query_param_auto_from_type (&deposit->h_wire),
+    TALER_PQ_query_param_auto_from_type (&deposit->csig),
+    TALER_PQ_query_param_fixed_size (json_wire_enc,
                                     strlen (json_wire_enc)),
-    TALER_PQ_QUERY_PARAM_END
+    TALER_PQ_query_param_end
   };
   result = TALER_PQ_exec_prepared (session->conn, "insert_deposit", params);
   if (PGRES_COMMAND_OK != PQresultStatus (result))
@@ -1527,8 +1526,8 @@ postgres_get_refresh_session (void *cls,
 {
   PGresult *result;
   struct TALER_PQ_QueryParam params[] = {
-    TALER_PQ_QUERY_PARAM_PTR(session_hash),
-    TALER_PQ_QUERY_PARAM_END
+    TALER_PQ_query_param_auto_from_type(session_hash),
+    TALER_PQ_query_param_end
   };
   int ret;
   uint16_t num_oldcoins;
@@ -1559,10 +1558,10 @@ postgres_get_refresh_session (void *cls,
   }
   memset (refresh_session, 0, sizeof (struct TALER_MINTDB_RefreshSession));
   struct TALER_PQ_ResultSpec rs[] = {
-    TALER_PQ_RESULT_SPEC("num_oldcoins", &num_oldcoins),
-    TALER_PQ_RESULT_SPEC("num_newcoins", &num_newcoins),
-    TALER_PQ_RESULT_SPEC("noreveal_index", &noreveal_index),
-    TALER_PQ_RESULT_SPEC_END
+    TALER_PQ_result_spec_auto_from_type("num_oldcoins", &num_oldcoins),
+    TALER_PQ_result_spec_auto_from_type("num_newcoins", &num_newcoins),
+    TALER_PQ_result_spec_auto_from_type("noreveal_index", &noreveal_index),
+    TALER_PQ_result_spec_end
   };
   if (GNUNET_OK != TALER_PQ_extract_result (result, rs, 0))
   {
@@ -1602,11 +1601,11 @@ postgres_create_refresh_session (void *cls,
   uint16_t num_newcoins;
   uint16_t noreveal_index;
   struct TALER_PQ_QueryParam params[] = {
-    TALER_PQ_QUERY_PARAM_PTR(session_hash),
-    TALER_PQ_QUERY_PARAM_PTR(&num_oldcoins),
-    TALER_PQ_QUERY_PARAM_PTR(&num_newcoins),
-    TALER_PQ_QUERY_PARAM_PTR(&noreveal_index),
-    TALER_PQ_QUERY_PARAM_END
+    TALER_PQ_query_param_auto_from_type(session_hash),
+    TALER_PQ_query_param_auto_from_type(&num_oldcoins),
+    TALER_PQ_query_param_auto_from_type(&num_newcoins),
+    TALER_PQ_query_param_auto_from_type(&noreveal_index),
+    TALER_PQ_query_param_end
   };
   num_oldcoins = htons (refresh_session->num_oldcoins);
   num_newcoins = htons (refresh_session->num_newcoins);
@@ -1648,11 +1647,11 @@ postgres_insert_refresh_melt (void *cls,
 
   {
     struct TALER_PQ_QueryParam params[] = {
-      TALER_PQ_QUERY_PARAM_PTR(&melt->session_hash),
-      TALER_PQ_QUERY_PARAM_PTR(&oldcoin_index_nbo),
-      TALER_PQ_QUERY_PARAM_PTR(&melt->coin.coin_pub),
-      TALER_PQ_QUERY_PARAM_RSA_PUBLIC_KEY(melt->coin.denom_pub.rsa_public_key),
-      TALER_PQ_QUERY_PARAM_END
+      TALER_PQ_query_param_auto_from_type(&melt->session_hash),
+      TALER_PQ_query_param_auto_from_type(&oldcoin_index_nbo),
+      TALER_PQ_query_param_auto_from_type(&melt->coin.coin_pub),
+      TALER_PQ_query_param_rsa_public_key(melt->coin.denom_pub.rsa_public_key),
+      TALER_PQ_query_param_end
     };
     result = TALER_PQ_exec_prepared (session->conn,
                                      "insert_refresh_melt",
@@ -1691,18 +1690,18 @@ postgres_get_refresh_melt (void *cls,
   // FIXME: check logic!
   uint16_t oldcoin_index_nbo = htons (oldcoin_index);
   struct TALER_PQ_Query params[] = {
-    TALER_PQ_QUERY_PARAM_PTR (session_hash),
-    TALER_PQ_QUERY_PARAM_PTR (&oldcoin_index_nbo),
-    TALER_PQ_QUERY_PARAM_END
+    TALER_PQ_query_param_auto_from_type (session_hash),
+    TALER_PQ_query_param_auto_from_type (&oldcoin_index_nbo),
+    TALER_PQ_query_param_end
   };
   struct TALER_PQ_ResultSpec rs[] = {
-    TALER_PQ_RESULT_SPEC ("coin_pub", &melt->coin),
-    TALER_PQ_RESULT_SPEC ("coin_sig", &melt->coin_sig),
-    TALER_PQ_RESULT_SPEC ("denom_pub", &melt->coin),
-    TALER_PQ_RESULT_SPEC ("denom_sig", &melt->coin),
-    TALER_PQ_RESULT_SPEC_AMOUNT ("amount", melt->amount_with_fee),
-    TALER_PQ_RESULT_SPEC_AMOUNT ("fee", melt->melt_fee),
-    TALER_PQ_RESULT_SPEC_END
+    TALER_PQ_result_spec_auto_from_type ("coin_pub", &melt->coin),
+    TALER_PQ_result_spec_auto_from_type ("coin_sig", &melt->coin_sig),
+    TALER_PQ_result_spec_auto_from_type ("denom_pub", &melt->coin),
+    TALER_PQ_result_spec_auto_from_type ("denom_sig", &melt->coin),
+    TALER_PQ_result_spec_amount ("amount", melt->amount_with_fee),
+    TALER_PQ_result_spec_amount ("fee", melt->melt_fee),
+    TALER_PQ_result_spec_end
   };
 
   result = TALER_PQ_exec_prepared (session->conn,
@@ -1752,10 +1751,10 @@ postgres_insert_refresh_order (void *cls,
 
   {
     struct TALER_PQ_QueryParam params[] = {
-      TALER_PQ_QUERY_PARAM_PTR (&newcoin_index_nbo),
-      TALER_PQ_QUERY_PARAM_PTR (session_hash),
-      TALER_PQ_QUERY_PARAM_RSA_PUBLIC_KEY (denom_pubs->rsa_public_key),
-      TALER_PQ_QUERY_PARAM_END
+      TALER_PQ_query_param_auto_from_type (&newcoin_index_nbo),
+      TALER_PQ_query_param_auto_from_type (session_hash),
+      TALER_PQ_query_param_rsa_public_key (denom_pubs->rsa_public_key),
+      TALER_PQ_query_param_end
     };
     result = TALER_PQ_exec_prepared (session->conn,
                                      "insert_refresh_order",
@@ -1800,9 +1799,9 @@ postgres_get_refresh_order (void *cls,
   uint16_t newcoin_index_nbo = htons (num_newcoins);
 
   struct TALER_PQ_QueryParam params[] = {
-    TALER_PQ_QUERY_PARAM_PTR(session_hash),
-    TALER_PQ_QUERY_PARAM_PTR(&newcoin_index_nbo),
-    TALER_PQ_QUERY_PARAM_END
+    TALER_PQ_query_param_auto_from_type(session_hash),
+    TALER_PQ_query_param_auto_from_type(&newcoin_index_nbo),
+    TALER_PQ_query_param_end
   };
 
   PGresult *result = TALER_PQ_exec_prepared (session->conn,
@@ -1823,8 +1822,8 @@ postgres_get_refresh_order (void *cls,
   }
   GNUNET_assert (1 == PQntuples (result));
   struct TALER_PQ_ResultSpec rs[] = {
-    TALER_PQ_RESULT_SPEC_RSA_PUBLIC_KEY ("denom_pub", &denom_pubs->rsa_public_key),
-    TALER_PQ_RESULT_SPEC_END
+    TALER_PQ_result_spec_rsa_public_key ("denom_pub", &denom_pubs->rsa_public_key),
+    TALER_PQ_result_spec_end
   };
   if (GNUNET_OK != TALER_PQ_extract_result (result, rs, 0))
   {
@@ -1863,14 +1862,14 @@ postgres_insert_refresh_commit_coins (void *cls,
   uint16_t cnc_index_nbo = htons (i);
   uint16_t newcoin_index_nbo = htons (num_newcoins);
   struct TALER_PQ_QueryParam params[] = {
-    TALER_PQ_QUERY_PARAM_PTR(session_hash),
-    TALER_PQ_QUERY_PARAM_PTR_SIZED(commit_coins->coin_ev, commit_coins->coin_ev_size),
-    TALER_PQ_QUERY_PARAM_PTR(&cnc_index_nbo),
-    TALER_PQ_QUERY_PARAM_PTR(&newcoin_index_nbo),
-    TALER_PQ_QUERY_PARAM_PTR_SIZED (commit_coins->refresh_link->coin_priv_enc,
+    TALER_PQ_query_param_auto_from_type(session_hash),
+    TALER_PQ_query_param_fixed_size(commit_coins->coin_ev, commit_coins->coin_ev_size),
+    TALER_PQ_query_param_auto_from_type(&cnc_index_nbo),
+    TALER_PQ_query_param_auto_from_type(&newcoin_index_nbo),
+    TALER_PQ_query_param_fixed_size (commit_coins->refresh_link->coin_priv_enc,
                                     commit_coins->refresh_link->blinding_key_enc_size +
                                     sizeof (struct TALER_CoinSpendPrivateKeyP)),
-    TALER_PQ_QUERY_PARAM_END
+    TALER_PQ_query_param_end
   };
 
   PGresult *result = TALER_PQ_exec_prepared (session->conn,
@@ -1921,10 +1920,10 @@ postgres_get_refresh_commit_coins (void *cls,
   uint16_t cnc_index_nbo = htons (cnc_index);
   uint16_t newcoin_index_nbo = htons (newcoin_index);
   struct TALER_PQ_QueryParam params[] = {
-    TALER_PQ_QUERY_PARAM_PTR(session_hash),
-    TALER_PQ_QUERY_PARAM_PTR(&cnc_index_nbo),
-    TALER_PQ_QUERY_PARAM_PTR(&newcoin_index_nbo),
-    TALER_PQ_QUERY_PARAM_END
+    TALER_PQ_query_param_auto_from_type(session_hash),
+    TALER_PQ_query_param_auto_from_type(&cnc_index_nbo),
+    TALER_PQ_query_param_auto_from_type(&newcoin_index_nbo),
+    TALER_PQ_query_param_end
   };
   void *c_buf;
   size_t c_buf_size;
@@ -1950,9 +1949,9 @@ postgres_get_refresh_commit_coins (void *cls,
   }
 
   struct TALER_PQ_ResultSpec rs[] = {
-    TALER_PQ_RESULT_SPEC_VAR("coin_ev", &c_buf, &c_buf_size),
-    TALER_PQ_RESULT_SPEC_VAR("link_vector_enc", &rl_buf, &rl_buf_size),
-    TALER_PQ_RESULT_SPEC_END
+    TALER_PQ_result_spec_variable_size("coin_ev", &c_buf, &c_buf_size),
+    TALER_PQ_result_spec_variable_size("link_vector_enc", &rl_buf, &rl_buf_size),
+    TALER_PQ_result_spec_end
   };
   if (GNUNET_YES != TALER_PQ_extract_result (result, rs, 0))
   {
@@ -2000,12 +1999,12 @@ postgres_insert_refresh_commit_links (void *cls,
   uint16_t cnc_index_nbo = htons (i);
   uint16_t oldcoin_index_nbo = htons (j);
   struct TALER_PQ_QueryParam params[] = {
-    TALER_PQ_QUERY_PARAM_PTR(session_hash),
-    TALER_PQ_QUERY_PARAM_PTR(&commit_link->transfer_pub),
-    TALER_PQ_QUERY_PARAM_PTR(&cnc_index_nbo),
-    TALER_PQ_QUERY_PARAM_PTR(&oldcoin_index_nbo),
-    TALER_PQ_QUERY_PARAM_PTR(&commit_link->shared_secret_enc),
-    TALER_PQ_QUERY_PARAM_END
+    TALER_PQ_query_param_auto_from_type(session_hash),
+    TALER_PQ_query_param_auto_from_type(&commit_link->transfer_pub),
+    TALER_PQ_query_param_auto_from_type(&cnc_index_nbo),
+    TALER_PQ_query_param_auto_from_type(&oldcoin_index_nbo),
+    TALER_PQ_query_param_auto_from_type(&commit_link->shared_secret_enc),
+    TALER_PQ_query_param_end
   };
 
   PGresult *result = TALER_PQ_exec_prepared (session->conn,
@@ -2056,10 +2055,10 @@ postgres_get_refresh_commit_links (void *cls,
   uint16_t oldcoin_index_nbo = htons (num_links);
 
   struct TALER_PQ_QueryParam params[] = {
-    TALER_PQ_QUERY_PARAM_PTR(session_hash),
-    TALER_PQ_QUERY_PARAM_PTR(&cnc_index_nbo),
-    TALER_PQ_QUERY_PARAM_PTR(&oldcoin_index_nbo),
-    TALER_PQ_QUERY_PARAM_END
+    TALER_PQ_query_param_auto_from_type(session_hash),
+    TALER_PQ_query_param_auto_from_type(&cnc_index_nbo),
+    TALER_PQ_query_param_auto_from_type(&oldcoin_index_nbo),
+    TALER_PQ_query_param_end
   };
 
   PGresult *result = TALER_PQ_exec_prepared (session->conn,
@@ -2079,9 +2078,9 @@ postgres_get_refresh_commit_links (void *cls,
   }
 
   struct TALER_PQ_ResultSpec rs[] = {
-    TALER_PQ_RESULT_SPEC("transfer_pub", &links->transfer_pub),
-    TALER_PQ_RESULT_SPEC("link_secret_enc", &links->shared_secret_enc),
-    TALER_PQ_RESULT_SPEC_END
+    TALER_PQ_result_spec_auto_from_type("transfer_pub", &links->transfer_pub),
+    TALER_PQ_result_spec_auto_from_type("link_secret_enc", &links->shared_secret_enc),
+    TALER_PQ_result_spec_end
   };
 
   if (GNUNET_YES != TALER_PQ_extract_result (result, rs, 0))
@@ -2167,10 +2166,10 @@ postgres_insert_refresh_collectable (void *cls,
 
   {
     struct TALER_PQ_QueryParam params[] = {
-      TALER_PQ_QUERY_PARAM_PTR(session_hash),
-      TALER_PQ_QUERY_PARAM_PTR(&newcoin_index_nbo),
-      TALER_PQ_QUERY_PARAM_RSA_SIGNATURE(ev_sig->rsa_signature),
-      TALER_PQ_QUERY_PARAM_END
+      TALER_PQ_query_param_auto_from_type(session_hash),
+      TALER_PQ_query_param_auto_from_type(&newcoin_index_nbo),
+      TALER_PQ_query_param_rsa_signature(ev_sig->rsa_signature),
+      TALER_PQ_query_param_end
     };
     result = TALER_PQ_exec_prepared (session->conn,
                                      "insert_refresh_collectable",
@@ -2205,8 +2204,8 @@ postgres_get_link_data_list (void *cls,
   struct TALER_MINTDB_LinkDataList *ldl;
   struct TALER_MINTDB_LinkDataList *pos;
   struct TALER_PQ_QueryParam params[] = {
-    TALER_PQ_QUERY_PARAM_PTR(coin_pub),
-    TALER_PQ_QUERY_PARAM_END
+    TALER_PQ_query_param_auto_from_type(coin_pub),
+    TALER_PQ_query_param_end
   };
   PGresult *result = TALER_PQ_exec_prepared (session->conn, "get_link", params);
 
@@ -2233,10 +2232,10 @@ postgres_get_link_data_list (void *cls,
     void *ld_buf;
     size_t ld_buf_size;
     struct TALER_PQ_ResultSpec rs[] = {
-      TALER_PQ_RESULT_SPEC_VAR("link_vector_enc", &ld_buf, &ld_buf_size),
-      TALER_PQ_RESULT_SPEC_RSA_PUBLIC_KEY("denom_pub", &denom_pub),
-      TALER_PQ_RESULT_SPEC_RSA_SIGNATURE("ev_sig", &sig),
-      TALER_PQ_RESULT_SPEC_END
+      TALER_PQ_result_spec_variable_size("link_vector_enc", &ld_buf, &ld_buf_size),
+      TALER_PQ_result_spec_rsa_public_key("denom_pub", &denom_pub),
+      TALER_PQ_result_spec_rsa_signature("ev_sig", &sig),
+      TALER_PQ_result_spec_end
     };
 
     if (GNUNET_OK != TALER_PQ_extract_result (result, rs, i))
@@ -2299,8 +2298,8 @@ postgres_get_transfer (void *cls,
 {
   // FIXME: check logic!
   struct TALER_PQ_QueryParam params[] = {
-    TALER_PQ_QUERY_PARAM_PTR(coin_pub),
-    TALER_PQ_QUERY_PARAM_END
+    TALER_PQ_query_param_auto_from_type(coin_pub),
+    TALER_PQ_query_param_end
   };
 
   PGresult *result = TALER_PQ_exec_prepared (session->conn, "get_transfer", params);
@@ -2328,9 +2327,9 @@ postgres_get_transfer (void *cls,
   }
 
   struct TALER_PQ_ResultSpec rs[] = {
-    TALER_PQ_RESULT_SPEC("transfer_pub", transfer_pub),
-    TALER_PQ_RESULT_SPEC("link_secret_enc", shared_secret_enc),
-    TALER_PQ_RESULT_SPEC_END
+    TALER_PQ_result_spec_auto_from_type("transfer_pub", transfer_pub),
+    TALER_PQ_result_spec_auto_from_type("link_secret_enc", shared_secret_enc),
+    TALER_PQ_result_spec_end
   };
 
   if (GNUNET_OK != TALER_PQ_extract_result (result, rs, 0))
@@ -2375,8 +2374,8 @@ postgres_get_coin_transactions (void *cls,
   {
     struct TALER_MINTDB_Deposit *deposit;
     struct TALER_PQ_QueryParam params[] = {
-      TALER_PQ_QUERY_PARAM_PTR (&coin_pub->eddsa_pub),
-      TALER_PQ_QUERY_PARAM_END
+      TALER_PQ_query_param_auto_from_type (&coin_pub->eddsa_pub),
+      TALER_PQ_query_param_end
     };
     json_error_t json_error;
     void *json_wire_enc;
@@ -2395,19 +2394,19 @@ postgres_get_coin_transactions (void *cls,
     {
       deposit = GNUNET_new (struct TALER_MINTDB_Deposit);
       struct TALER_PQ_ResultSpec rs[] = {
-        TALER_PQ_RESULT_SPEC ("coin_pub", &deposit->coin),
-        TALER_PQ_RESULT_SPEC ("coin_sig", &deposit->csig),
-        TALER_PQ_RESULT_SPEC ("merchant_pub", &deposit->merchant_pub),
-        TALER_PQ_RESULT_SPEC ("h_contract", &deposit->h_contract),
-        TALER_PQ_RESULT_SPEC ("h_wire", &deposit->h_wire),
-        TALER_PQ_RESULT_SPEC_VAR ("wire", &json_wire_enc, &json_wire_enc_size),
-        TALER_PQ_RESULT_SPEC ("transaction_id", &deposit->transaction_id),
+        TALER_PQ_result_spec_auto_from_type ("coin_pub", &deposit->coin),
+        TALER_PQ_result_spec_auto_from_type ("coin_sig", &deposit->csig),
+        TALER_PQ_result_spec_auto_from_type ("merchant_pub", &deposit->merchant_pub),
+        TALER_PQ_result_spec_auto_from_type ("h_contract", &deposit->h_contract),
+        TALER_PQ_result_spec_auto_from_type ("h_wire", &deposit->h_wire),
+        TALER_PQ_result_spec_variable_size ("wire", &json_wire_enc, &json_wire_enc_size),
+        TALER_PQ_result_spec_auto_from_type ("transaction_id", &deposit->transaction_id),
         /**  FIXME:
-         * TALER_PQ_RESULT_SPEC ("timestamp", &deposit->timestamp),
-         * TALER_PQ_RESULT_SPEC ("refund_deadline", &deposit->refund_deadline),
+         * TALER_PQ_result_spec_auto_from_type ("timestamp", &deposit->timestamp),
+         * TALER_PQ_result_spec_auto_from_type ("refund_deadline", &deposit->refund_deadline),
          * TALER_PQ_RESULT_AMOUNT_NBO ("deposit_fee", &deposit->deposit_fee)
          */
-        TALER_PQ_RESULT_SPEC_END
+        TALER_PQ_result_spec_end
       };
       if ((GNUNET_OK != TALER_PQ_extract_result (result, rs, i)) ||
 	  (GNUNET_OK != TALER_PQ_extract_amount (result,
diff --git a/src/pq/pq_helper.c b/src/pq/pq_helper.c
index 98c02de73..5da1ced41 100644
--- a/src/pq/pq_helper.c
+++ b/src/pq/pq_helper.c
@@ -33,7 +33,7 @@
  * @return array entry for the query parameters to use
  */
 struct TALER_PQ_QueryParam
-TALER_PQ_QUERY_PARAM_AMOUNT_NBO (const struct TALER_AmountNBO *x)
+TALER_PQ_query_param_amount_nbo (const struct TALER_AmountNBO *x)
 {
   struct TALER_PQ_QueryParam res =
     { TALER_PQ_QF_AMOUNT_NBO, x, sizeof (*x) };
@@ -51,7 +51,7 @@ TALER_PQ_QUERY_PARAM_AMOUNT_NBO (const struct TALER_AmountNBO *x)
  * @return array entry for the query parameters to use
  */
 struct TALER_PQ_QueryParam
-TALER_PQ_QUERY_PARAM_AMOUNT (const struct TALER_Amount *x)
+TALER_PQ_query_param_amount (const struct TALER_Amount *x)
 {
   struct TALER_PQ_QueryParam res =
     { TALER_PQ_QF_AMOUNT, x, sizeof (*x) };
@@ -67,7 +67,7 @@ TALER_PQ_QUERY_PARAM_AMOUNT (const struct TALER_Amount *x)
  * @return array entry for the query parameters to use
  */
 struct TALER_PQ_QueryParam
-TALER_PQ_QUERY_PARAM_RSA_PUBLIC_KEY (const struct GNUNET_CRYPTO_rsa_PublicKey *x)
+TALER_PQ_query_param_rsa_public_key (const struct GNUNET_CRYPTO_rsa_PublicKey *x)
 {
   struct TALER_PQ_QueryParam res =
     { TALER_PQ_QF_RSA_PUBLIC_KEY, (x), 0 };
@@ -83,7 +83,7 @@ TALER_PQ_QUERY_PARAM_RSA_PUBLIC_KEY (const struct GNUNET_CRYPTO_rsa_PublicKey *x
  * @return array entry for the query parameters to use
  */
 struct TALER_PQ_QueryParam
-TALER_PQ_QUERY_PARAM_RSA_SIGNATURE (const struct GNUNET_CRYPTO_rsa_Signature *x)
+TALER_PQ_query_param_rsa_signature (const struct GNUNET_CRYPTO_rsa_Signature *x)
 {
   struct TALER_PQ_QueryParam res =
     { TALER_PQ_QF_RSA_SIGNATURE, (x), 0 };
@@ -99,7 +99,7 @@ TALER_PQ_QUERY_PARAM_RSA_SIGNATURE (const struct GNUNET_CRYPTO_rsa_Signature *x)
  * @return array entry for the query parameters to use
  */
 struct TALER_PQ_QueryParam
-TALER_PQ_QUERY_PARAM_ABSOLUTE_TIME (const struct GNUNET_TIME_Absolute *x)
+TALER_PQ_query_param_absolute_time (const struct GNUNET_TIME_Absolute *x)
 {
   struct TALER_PQ_QueryParam res =
     { TALER_PQ_QF_TIME_ABSOLUTE, x, sizeof (*x) };
@@ -116,7 +116,7 @@ TALER_PQ_QUERY_PARAM_ABSOLUTE_TIME (const struct GNUNET_TIME_Absolute *x)
  * @return array entry for the result specification to use
  */
 struct TALER_PQ_ResultSpec
-TALER_PQ_RESULT_SPEC_VAR (const char *name,
+TALER_PQ_result_spec_variable_size (const char *name,
 			  void **dst,
 			  size_t *sptr)
 {
@@ -134,7 +134,7 @@ TALER_PQ_RESULT_SPEC_VAR (const char *name,
  * @return array entry for the result specification to use
  */
 struct TALER_PQ_ResultSpec
-TALER_PQ_RESULT_SPEC_AMOUNT_NBO (const char *name,
+TALER_PQ_result_spec_amount_nbo (const char *name,
 				 struct TALER_AmountNBO *amount)
 {
   struct TALER_PQ_ResultSpec res = 
@@ -151,7 +151,7 @@ TALER_PQ_RESULT_SPEC_AMOUNT_NBO (const char *name,
  * @return array entry for the result specification to use
  */
 struct TALER_PQ_ResultSpec
-TALER_PQ_RESULT_SPEC_AMOUNT (const char *name,
+TALER_PQ_result_spec_amount (const char *name,
 			     struct TALER_Amount *amount)
 {
   struct TALER_PQ_ResultSpec res = 
@@ -168,7 +168,7 @@ TALER_PQ_RESULT_SPEC_AMOUNT (const char *name,
  * @return array entry for the result specification to use
  */
 struct TALER_PQ_ResultSpec
-TALER_PQ_RESULT_SPEC_RSA_PUBLIC_KEY (const char *name,
+TALER_PQ_result_spec_rsa_public_key (const char *name,
 				     struct GNUNET_CRYPTO_rsa_PublicKey **rsa)
 {
   struct TALER_PQ_ResultSpec res = 
@@ -185,7 +185,7 @@ TALER_PQ_RESULT_SPEC_RSA_PUBLIC_KEY (const char *name,
  * @return array entry for the result specification to use
  */
 struct TALER_PQ_ResultSpec
-TALER_PQ_RESULT_SPEC_RSA_SIGNATURE (const char *name,
+TALER_PQ_result_spec_rsa_signature (const char *name,
 				    struct GNUNET_CRYPTO_rsa_Signature **sig)
 {
   struct TALER_PQ_ResultSpec res = 
@@ -202,7 +202,7 @@ TALER_PQ_RESULT_SPEC_RSA_SIGNATURE (const char *name,
  * @return array entry for the result specification to use
  */
 struct TALER_PQ_ResultSpec
-TALER_PQ_RESULT_SPEC_ABSOLUTE_TIME (const char *name,
+TALER_PQ_result_spec_absolute_time (const char *name,
 				    struct GNUNET_TIME_Absolute *at)
 {
   struct TALER_PQ_ResultSpec res = 
diff --git a/src/pq/test_pq.c b/src/pq/test_pq.c
index d34171110..185b95ca1 100644
--- a/src/pq/test_pq.c
+++ b/src/pq/test_pq.c
@@ -124,30 +124,30 @@ run_queries (PGconn *conn)
 		     &hamount);		     
   TALER_string_to_amount ("EUR:4.4",
 			  &hamount);
-  /* FIXME: test TALER_PQ_RESULT_SPEC_VAR */
+  /* FIXME: test TALER_PQ_result_spec_variable_size */
   {
     struct TALER_PQ_QueryParam params_insert[] = {
-      TALER_PQ_QUERY_PARAM_RSA_PUBLIC_KEY (pub),
-      TALER_PQ_QUERY_PARAM_RSA_SIGNATURE (sig),
-      TALER_PQ_QUERY_PARAM_ABSOLUTE_TIME (&abs_time),
-      TALER_PQ_QUERY_PARAM_ABSOLUTE_TIME (&forever),
-      TALER_PQ_QUERY_PARAM_PTR (&hc),
-      TALER_PQ_QUERY_PARAM_AMOUNT (&hamount),
-      TALER_PQ_QUERY_PARAM_AMOUNT_NBO (&namount),
-      TALER_PQ_QUERY_PARAM_END
+      TALER_PQ_query_param_rsa_public_key (pub),
+      TALER_PQ_query_param_rsa_signature (sig),
+      TALER_PQ_query_param_absolute_time (&abs_time),
+      TALER_PQ_query_param_absolute_time (&forever),
+      TALER_PQ_query_param_auto_from_type (&hc),
+      TALER_PQ_query_param_amount (&hamount),
+      TALER_PQ_query_param_amount_nbo (&namount),
+      TALER_PQ_query_param_end
     };
     struct TALER_PQ_QueryParam params_select[] = {
-      TALER_PQ_QUERY_PARAM_END
+      TALER_PQ_query_param_end
     };
     struct TALER_PQ_ResultSpec results_select[] = {
-      TALER_PQ_RESULT_SPEC_RSA_PUBLIC_KEY ("pub", &pub2),
-      TALER_PQ_RESULT_SPEC_RSA_SIGNATURE ("sig", &sig2),
-      TALER_PQ_RESULT_SPEC_ABSOLUTE_TIME ("abs_time", &abs_time2),
-      TALER_PQ_RESULT_SPEC_ABSOLUTE_TIME ("forever", &forever2),
-      TALER_PQ_RESULT_SPEC ("hash", &hc2),
-      TALER_PQ_RESULT_SPEC_AMOUNT ("hamount", &hamount2),
-      TALER_PQ_RESULT_SPEC_AMOUNT_NBO ("namount", &namount2),
-      TALER_PQ_RESULT_SPEC_END
+      TALER_PQ_result_spec_rsa_public_key ("pub", &pub2),
+      TALER_PQ_result_spec_rsa_signature ("sig", &sig2),
+      TALER_PQ_result_spec_absolute_time ("abs_time", &abs_time2),
+      TALER_PQ_result_spec_absolute_time ("forever", &forever2),
+      TALER_PQ_result_spec_auto_from_type ("hash", &hc2),
+      TALER_PQ_result_spec_amount ("hamount", &hamount2),
+      TALER_PQ_result_spec_amount_nbo ("namount", &namount2),
+      TALER_PQ_result_spec_end
     };
     
     result = TALER_PQ_exec_prepared (conn,
diff --git a/src/util/json.c b/src/util/json.c
index f6f2e49a1..1747cd927 100644
--- a/src/util/json.c
+++ b/src/util/json.c
@@ -21,7 +21,6 @@
 #include "platform.h"
 #include <gnunet/gnunet_util_lib.h>
 #include "taler_util.h"
-#include "taler_json_lib.h"
 
 /**
  * Shorthand for exit jumps.
diff --git a/src/util/os_installation.c b/src/util/os_installation.c
index ad89f4e58..1308fa3f3 100644
--- a/src/util/os_installation.c
+++ b/src/util/os_installation.c
@@ -454,7 +454,7 @@ os_get_exec_path ()
  * @return a pointer to the dir path (to be freed by the caller)
  */
 char *
-TALER_os_installation_get_path (enum GNUNET_OS_InstallationPathKind dirkind)
+TALER_OS_installation_get_path (enum GNUNET_OS_InstallationPathKind dirkind)
 {
   size_t n;
   const char *dirname;
diff --git a/src/util/wireformats.c b/src/util/wireformats.c
index df32f2d3d..e86044d7e 100644
--- a/src/util/wireformats.c
+++ b/src/util/wireformats.c
@@ -22,7 +22,6 @@
 #include "platform.h"
 #include <gnunet/gnunet_util_lib.h>
 #include "taler_util.h"
-#include "taler_json_lib.h"
 
 /**
  * Shorthand for exit jumps.