diff --git a/contrib/gnunet.tag b/contrib/gnunet.tag
index 1cf4f0de8..46ce9fd6b 100644
--- a/contrib/gnunet.tag
+++ b/contrib/gnunet.tag
@@ -35,10 +35,129 @@
+
+
+ gnunet_common.h
+
+ gnunet_db_lib.h
+
+ #define
+ GNUNET_free
+ gnunet_common.h
+ (ptr)
+
+
+ #define
+ GNUNET_free_non_null
+ gnunet_common.h
+ (ptr)
+
+
+ #define
+ GNUNET_malloc_large
+ gnunet_common.h
+ (size)
+
+
+ #define
+ GNUNET_realloc
+ gnunet_common.h
+ (ptr, size)
+
+
+ #define
+ GNUNET_new
+ gnunet_common.h
+ (type)
+
+
+ #define
+ GNUNET_malloc
+ gnunet_common.h
+ (size)
+
+
+ #define
+ GNUNET_new_array
+ gnunet_common.h
+ (n, type)
+
+
+
+ gnunet_db_lib.h
+
+ gnunet_db_lib.h
+
+ #define
+ GNUNET_DB_STATUS_SUCCESS_ONE_RESULT
+ gnunet_db_lib.h
+
+
+
+ #define
+ GNUNET_DB_STATUS_SUCCESS_NO_RESULTS
+ gnunet_db_lib.h
+
+
+
gnunet_pq_lib.h
gnunet_pq_lib.h
+
+ #define
+ GNUNET_PQ_query_param_auto_from_type
+ gnunet_pq_lib.h
+ (x)
+
+
+ #define
+ gnunet_pq_lib.h
+ GNUNET_PQ_result_spec_end
+
+
+
+ #define
+ gnunet_pq_lib.h
+ GNUNET_PQ_result_spec_auto_from_type
+ (name, dst)
+
+
+ struct GNUNET_PQ_ResultSpec
+ GNUNET_PQ_result_spec_absolute_time
+ gnunet_pq_lib.h
+ (const char *name, struct GNUNET_TIME_Absolute *at)
+
+
+ struct GNUNET_PQ_ResultSpec
+ GNUNET_PQ_result_spec_absolute_time_nbo
+ gnunet_pq_lib.h
+ (const char *name, struct GNUNET_TIME_AbsoluteNBO *at)
+
+
+ #define
+ gnunet_pq_lib.h
+ GNUNET_PQ_PREPARED_STATEMENT_END
+
+
+
+ #define
+ gnunet_pq_lib.h
+ GNUNET_PQ_EXECUTE_STATEMENT_END
+
+
+
+ struct GNUNET_PQ_QueryParam
+ GNUNET_PQ_query_param_absolute_time
+ gnunet_pq_lib.h
+ (const struct GNUNET_TIME_Absolute *x)
+
+
+ struct GNUNET_PQ_QueryParam
+ GNUNET_PQ_query_param_absolute_time_nbo
+ gnunet_pq_lib.h
+ (const struct GNUNET_TIME_AbsoluteNBO *x)
+
#define
GNUNET_PQ_query_param_end