fix cyclic dependency by combining exchange-lib and auditor-lib directories

111 files changed, 135 insertions, 222 deletions

diff --git a/.gitignore b/.gitignore
index f2bb9e368..8e3596100 100644
--- a/.gitignore
+++ b/.gitignore
@@ -40,14 +40,14 @@ src/bank-lib/test_bank_api_new
 src/bank-lib/test_bank_api_with_fakebank
 src/bank-lib/test_bank_api_with_fakebank_new
 src/bank-lib/test_bank_api_with_fakebank_twisted
-src/exchange-lib/test_exchange_api_new
-src/exchange-lib/test_exchange_api
-src/exchange-lib/test_exchange_api_home/.local/share/taler/exchange/live-keys/
-src/exchange-lib/test_exchange_api_home/.local/share/taler/exchange/wirefees/
-src/exchange-lib/test_exchange_api_home/.local/share/taler/auditor/
-src/exchange-lib/test_exchange_api_home/.local/share/taler/auditors/
-src/exchange-lib/auditor.in
-src/exchange-lib/test_exchange_api_twisted
+src/lib/test_exchange_api_new
+src/lib/test_exchange_api
+src/lib/test_exchange_api_home/.local/share/taler/exchange/live-keys/
+src/lib/test_exchange_api_home/.local/share/taler/exchange/wirefees/
+src/lib/test_exchange_api_home/.local/share/taler/auditor/
+src/lib/test_exchange_api_home/.local/share/taler/auditors/
+src/lib/auditor.in
+src/lib/test_exchange_api_twisted
 src/exchange/taler-exchange-aggregator
 src/exchange/test_taler_exchange_aggregator-postgres
 src/exchange/test_taler_exchange_httpd_home/.local/share/taler/exchange/live-keys/
@@ -97,8 +97,8 @@ doc/manual/manual.tp
 doc/manual/manual.vr
 contrib/taler-exchange.tag
 doxygen-doc/
-src/exchange-lib/test_exchange_api_keys_cherry_picking
-src/exchange-lib/test_exchange_api_keys_cherry_picking_new
+src/lib/test_exchange_api_keys_cherry_picking
+src/lib/test_exchange_api_keys_cherry_picking_new
 src/auditor/taler-wire-auditor
 contrib/auditor-report.aux
 contrib/auditor-report.log
@@ -106,4 +106,4 @@ contrib/auditor-report.tex
 contrib/auditor-report.pdf
 src/bank-lib/taler-bank-transfer
 src/bank-lib/test_bank_api_twisted
-src/exchange-lib/test_exchange_api_new
+src/lib/test_exchange_api_new
diff --git a/configure.ac b/configure.ac
index ef622faab..ae0dda1a0 100644
--- a/configure.ac
+++ b/configure.ac
@@ -546,12 +546,11 @@ AC_CONFIG_FILES([Makefile
                  src/Makefile
                  src/auditor/Makefile
                  src/auditordb/Makefile
-                 src/auditor-lib/Makefile
                  src/bank-lib/Makefile
                  src/exchange/Makefile
                  src/exchangedb/Makefile
                  src/exchange-tools/Makefile
-                 src/exchange-lib/Makefile
+                 src/lib/Makefile
                  src/benchmark/Makefile
                  src/include/Makefile
                  src/json/Makefile
diff --git a/src/Makefile.am b/src/Makefile.am
index 8de5e4b87..80fa40dbc 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -22,12 +22,12 @@ pkgcfg_DATA = \
 EXTRA_DIST = \
   taler.conf
 
-SUBDIRS = include util wire json $(PQ_DIR) $(BANK_LIB) wire-plugins exchangedb exchange exchange-tools auditordb auditor 
+SUBDIRS = include util wire json $(PQ_DIR) $(BANK_LIB) wire-plugins exchangedb exchange exchange-tools auditordb auditor
 if HAVE_LIBCURL
- SUBDIRS += exchange-lib auditor-lib benchmark
+ SUBDIRS += lib benchmark
 else
 if HAVE_LIBGNURL
- SUBDIRS += exchange-lib auditor-lib benchmark
+ SUBDIRS += lib benchmark
 endif
 endif
 
diff --git a/src/auditor-lib/Makefile.am b/src/auditor-lib/Makefile.am
deleted file mode 100644
index 7d16d95b4..000000000
--- a/src/auditor-lib/Makefile.am
+++ /dev/null
@@ -1,90 +0,0 @@
-# This Makefile.am is in the public domain
-AM_CPPFLAGS = -I$(top_srcdir)/src/include
-
-if USE_COVERAGE
-  AM_CFLAGS = --coverage -O0
-  XLIB = -lgcov
-endif
-
-lib_LTLIBRARIES = \
-  libtalerauditor.la \
-  libtalerauditortesting.la
-
-libtalerauditor_la_LDFLAGS = \
-  -version-info 0:0:0 \
-  -no-undefined
-libtalerauditor_la_SOURCES = \
-  curl_defaults.c \
-  auditor_api_handle.c auditor_api_handle.h \
-  auditor_api_deposit_confirmation.c \
-  auditor_api_exchanges.c
-libtalerauditor_la_LIBADD = \
-  $(top_builddir)/src/json/libtalerjson.la \
-  $(top_builddir)/src/util/libtalerutil.la \
-  -lgnunetcurl \
-  -lgnunetjson \
-  -lgnunetutil \
-  -ljansson \
-  $(XLIB)
-
-if HAVE_LIBCURL
-libtalerauditor_la_LIBADD += -lcurl
-else
-if HAVE_LIBGNURL
-libtalerauditor_la_LIBADD += -lgnurl
-endif
-endif
-
-
-libtalerauditortesting_la_LDFLAGS = \
-  -version-info 0:0:0 \
-  -no-undefined
-libtalerauditortesting_la_SOURCES = \
-  testing_auditor_api_helpers.c \
-  testing_auditor_api_cmd_deposit_confirmation.c \
-  testing_auditor_api_cmd_exchanges.c \
-  testing_auditor_api_cmd_exec_auditor.c \
-  testing_auditor_api_cmd_exec_auditor_dbinit.c \
-  testing_auditor_api_cmd_exec_wire_auditor.c
-libtalerauditortesting_la_LIBADD = \
-  libtalerauditor.la \
-  $(top_builddir)/src/exchange-lib/libtalerexchange.la \
-  $(top_builddir)/src/exchange-lib/libtalertesting.la \
-  $(top_builddir)/src/wire/libtalerwire.la \
-  $(top_builddir)/src/json/libtalerjson.la \
-  $(top_builddir)/src/util/libtalerutil.la \
-  -lgnunetcurl \
-  -lgnunetjson \
-  -lgnunetutil \
-  -ljansson \
-  $(XLIB)
-
-
-check_PROGRAMS = \
-  test_auditor_api
-
-AM_TESTS_ENVIRONMENT=export TALER_PREFIX=$${TALER_PREFIX:-@libdir@};export PATH=$${TALER_PREFIX:-@prefix@}/bin:$$PATH;
-
-TESTS = \
-  $(check_PROGRAMS)
-
-test_auditor_api_SOURCES = \
-  test_auditor_api.c
-test_auditor_api_LDADD = \
-  libtalerauditortesting.la \
-  libtalerauditor.la \
-  $(top_builddir)/src/exchange-lib/libtalertesting.la \
-  $(top_builddir)/src/exchange-lib/libtalerexchange.la \
-  $(LIBGCRYPT_LIBS) \
-  $(top_builddir)/src/bank-lib/libtalerfakebank.la \
-  $(top_builddir)/src/bank-lib/libtalerbank.la \
-  $(top_builddir)/src/json/libtalerjson.la \
-  $(top_builddir)/src/util/libtalerutil.la \
-  -lgnunetcurl \
-  -lgnunetutil \
-  -ljansson
-
-
-EXTRA_DIST = \
-  test_auditor_api.conf \
-  test_auditor_api_expire_reserve_now.conf
diff --git a/src/auditor-lib/backoff.h b/src/auditor-lib/backoff.h
deleted file mode 100644
index 523a6b9eb..000000000
--- a/src/auditor-lib/backoff.h
+++ /dev/null
@@ -1,38 +0,0 @@
-/*
-  This file is part of TALER
-  Copyright (C) 2014-2018 GNUnet e.V.
-
-  TALER is free software; you can redistribute it and/or modify it under the
-  terms of the GNU General Public License as published by the Free Software
-  Foundation; either version 3, or (at your option) any later version.
-
-  TALER is distributed in the hope that it will be useful, but WITHOUT ANY
-  WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
-  A PARTICULAR PURPOSE.  See the GNU General Public License for more details.
-
-  You should have received a copy of the GNU General Public License along with
-  TALER; see the file COPYING.  If not, see
-  <http://www.gnu.org/licenses/>
-*/
-
-/**
- * @file auditor-lib/backoff.h
- * @brief backoff computation for the auditor lib
- * @author Florian Dold
- */
-
-
-#ifndef _TALER_BACKOFF_H
-#define _TALER_BACKOFF_H
-
-#include "platform.h"
-#include <gnunet/gnunet_time_lib.h>
-
-/**
- * Random exponential backoff used in the auditor lib.
- */
-#define AUDITOR_LIB_BACKOFF(r) GNUNET_TIME_randomized_backoff ( \
-    (r), \
-    GNUNET_TIME_relative_multiply (GNUNET_TIME_UNIT_SECONDS, 2));
-
-#endif
diff --git a/src/auditor-lib/test_exchange_api_home/.local/share/taler/auditor/offline-keys/auditor.priv b/src/auditor-lib/test_exchange_api_home/.local/share/taler/auditor/offline-keys/auditor.priv
deleted file mode 100644
index d71a7722c..000000000
--- a/src/auditor-lib/test_exchange_api_home/.local/share/taler/auditor/offline-keys/auditor.priv
+++ /dev/null
@@ -1 +0,0 @@
-~—}Kß+*hm»Ì^Ý-×á{œÝ{Œü0ÍZ4”
\ No newline at end of file
diff --git a/src/auditor-lib/test_exchange_api_home/.local/share/taler/exchange/wirefees/x-taler-bank.fee b/src/auditor-lib/test_exchange_api_home/.local/share/taler/exchange/wirefees/x-taler-bank.fee
deleted file mode 100644
index 68f27cad4..000000000
--- a/src/auditor-lib/test_exchange_api_home/.local/share/taler/exchange/wirefees/x-taler-bank.fee
+++ /dev/null
diff --git a/src/benchmark/Makefile.am b/src/benchmark/Makefile.am
index 4ac4efd67..193f539cd 100644
--- a/src/benchmark/Makefile.am
+++ b/src/benchmark/Makefile.am
@@ -20,8 +20,8 @@ taler_exchange_benchmark_LDADD = \
   $(top_builddir)/src/wire/libtalerwire.la \
   $(top_builddir)/src/json/libtalerjson.la \
   $(top_builddir)/src/util/libtalerutil.la \
-  $(top_builddir)/src/exchange-lib/libtalerexchange.la \
-  $(top_builddir)/src/exchange-lib/libtalertesting.la \
+  $(top_builddir)/src/lib/libtalerexchange.la \
+  $(top_builddir)/src/lib/libtalertesting.la \
   $(top_builddir)/src/bank-lib/libtalerfakebank.la \
   $(top_builddir)/src/bank-lib/libtalerbank.la \
   $(top_builddir)/src/bank-lib/libtalerbanktesting.la \
diff --git a/src/exchange-lib/test_exchange_api_home/.config/taler/account-1.json b/src/exchange-lib/test_exchange_api_home/.config/taler/account-1.json
deleted file mode 100644
index 48093f2aa..000000000
--- a/src/exchange-lib/test_exchange_api_home/.config/taler/account-1.json
+++ /dev/null
@@ -1,5 +0,0 @@
-{
-  "url": "payto://sepa/CH9300762011623852957",
-  "salt": "N83T9J9202WCC8TQFDMJDWEGZNBEKA33C1ZM241VNYH88RZNTHPW509Y1M2YF7Y098R8VRESWQ05H03BK1SPAZCWE54KARDCKT5N8AG",
-  "master_sig": "D4V5GJ998YK7D6N0N56AD0J6MZNFEW6MRZT2CFPVQ5ME3NMQ59AA2007CXYESSFGRN70CNCFM06858QSSENCWTZM8VHEJ93YQ20ZJ1R"
-}
\ No newline at end of file
diff --git a/src/exchange-lib/test_exchange_api_home/.config/taler/account-2.json b/src/exchange-lib/test_exchange_api_home/.config/taler/account-2.json
deleted file mode 100644
index 159e03171..000000000
--- a/src/exchange-lib/test_exchange_api_home/.config/taler/account-2.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "url": "payto://x-taler-bank/localhost:8082/2",
-  "master_sig": "HC47BZN3C0KJ2VPMJ5EJWD2FXJ72AET0NWFE6JGSGK5CXS4GSKJJ6Z7BTS56JWM7B40SD61Z5GYYMRRE3X9JTJBVMWE0X7XHNXQ9P38"
-}
\ No newline at end of file
diff --git a/src/exchange-lib/test_exchange_api_home/.config/taler/sepa.json b/src/exchange-lib/test_exchange_api_home/.config/taler/sepa.json
deleted file mode 100644
index b435ce86b..000000000
--- a/src/exchange-lib/test_exchange_api_home/.config/taler/sepa.json
+++ /dev/null
@@ -1,9 +0,0 @@
-{
-  "name": "Max Musterman",
-  "bic": "COBADEFF370",
-  "type": "sepa",
-  "sig": "4EVRC2MCJPXQC8MC00831DNWEXMZAP4JQDDE1A7R6KR3MANG24RC1VQ55AX5A2E35S58VW1VSTENFTPHG5MWG9BSN8B8WXSV21KKW20",
-  "address": "Musterstadt",
-  "salt": "3KTM1ZRMWGEQPQ254S4R5R4Q8XM0ZYWTCTE01TZ76MVBSQ6RX7A5DR08WXVH1DCHR1R7ACRB7X0EVC2XDW1CBZM9WFSD9TRMZ90BR98",
-  "iban": "DE89370400440532013000"
-}
\ No newline at end of file
diff --git a/src/exchange-lib/test_exchange_api_home/.config/taler/test.json b/src/exchange-lib/test_exchange_api_home/.config/taler/test.json
deleted file mode 100644
index eca394241..000000000
--- a/src/exchange-lib/test_exchange_api_home/.config/taler/test.json
+++ /dev/null
@@ -1,8 +0,0 @@
-{
-  "salt": "AZPRFVJ58NM6M7J5CZQPJAH3EW5DYM52AEZ9Y1C1ER3W94QV8D8TQKF6CK8MYQRA9QMSKDQTGZ306ZS9GQ0M6R01CJ20KPP49WFDZK8",
-  "name": "The exchange",
-  "account_number": 3,
-  "bank_url": "http://localhost:8082/",
-  "type": "test",
-  "sig": "RPQXP9S4P8PQP7HEZQNRSZCT0ATNEP8GW0P5TPM34V5RX86FCD670V44R9NETSYDDKB8SZV7TKY9PAJYTY51D3VDWY9XXQ5BPFRXR28"
-}
diff --git a/src/exchange-lib/test_exchange_api_home/.config/taler/x-taler-bank.json b/src/exchange-lib/test_exchange_api_home/.config/taler/x-taler-bank.json
deleted file mode 100644
index a15df27ca..000000000
--- a/src/exchange-lib/test_exchange_api_home/.config/taler/x-taler-bank.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "url": "payto://x-taler-bank/http://localhost:8082/2",
-  "master_sig": "KQ0BWSCNVR7HGGSAMCYK8ZM30RBS1MHMXT3QBN01PZWC9TV72FEE5RJ7T84C8134EPV6WEBXXY2MTFNE8ZXST6JEJQKR8HX6FQPVY10"
-}
\ No newline at end of file
diff --git a/src/exchange-lib/test_exchange_api_home/.local/share/taler/exchange/offline-keys/master.priv b/src/exchange-lib/test_exchange_api_home/.local/share/taler/exchange/offline-keys/master.priv
deleted file mode 100644
index 394926938..000000000
--- a/src/exchange-lib/test_exchange_api_home/.local/share/taler/exchange/offline-keys/master.priv
+++ /dev/null
@@ -1 +0,0 @@
-pÚ^ó-Ú33ˆ€X
XÁ!ˆ\0qúý�µmUþ_‰ˆ
\ No newline at end of file
diff --git a/src/exchange-lib/Makefile.am b/src/lib/Makefile.am
index f7fb55f0b..59b1f3165 100644
--- a/src/exchange-lib/Makefile.am
+++ b/src/lib/Makefile.am
@@ -8,13 +8,15 @@ endif
 
 lib_LTLIBRARIES = \
   libtalerexchange.la \
-  libtalertesting.la
+  libtalertesting.la \
+  libtalerauditor.la \
+  libtalerauditortesting.la
 
 libtalerexchange_la_LDFLAGS = \
   -version-info 4:0:0 \
   -no-undefined
 libtalerexchange_la_SOURCES = \
-  curl_defaults.c \
+  exchange_api_curl_defaults.c exchange_api_curl_defaults.h \
   exchange_api_common.c \
   exchange_api_handle.c exchange_api_handle.h \
   exchange_api_deposit.c \
@@ -27,7 +29,25 @@ libtalerexchange_la_SOURCES = \
   exchange_api_track_transfer.c \
   exchange_api_wire.c
 libtalerexchange_la_LIBADD = \
-  $(top_builddir)/src/auditor-lib/libtalerauditor.la \
+  libtalerauditor.la \
+  $(top_builddir)/src/json/libtalerjson.la \
+  $(top_builddir)/src/util/libtalerutil.la \
+  -lgnunetcurl \
+  -lgnunetjson \
+  -lgnunetutil \
+  -ljansson \
+  $(XLIB)
+
+
+libtalerauditor_la_LDFLAGS = \
+  -version-info 0:0:0 \
+  -no-undefined
+libtalerauditor_la_SOURCES = \
+  auditor_api_curl_defaults.c auditor_api_curl_defaults.h \
+  auditor_api_handle.c auditor_api_handle.h \
+  auditor_api_deposit_confirmation.c \
+  auditor_api_exchanges.c
+libtalerauditor_la_LIBADD = \
   $(top_builddir)/src/json/libtalerjson.la \
   $(top_builddir)/src/util/libtalerutil.la \
   -lgnunetcurl \
@@ -36,11 +56,20 @@ libtalerexchange_la_LIBADD = \
   -ljansson \
   $(XLIB)
 
+if HAVE_LIBCURL
+libtalerauditor_la_LIBADD += -lcurl
+else
+if HAVE_LIBGNURL
+libtalerauditor_la_LIBADD += -lgnurl
+endif
+endif
+
+
 libtalertesting_la_LDFLAGS = \
   -version-info 0:0:0 \
   -no-undefined
 libtalertesting_la_SOURCES = \
-  curl_defaults.c \
+  exchange_api_curl_defaults.c \
   testing_api_cmd_exec_aggregator.c \
   testing_api_cmd_exec_wirewatch.c \
   testing_api_cmd_exec_keyup.c \
@@ -92,6 +121,30 @@ libtalertesting_la_LIBADD = \
   -ljansson \
   $(XLIB)
 
+libtalerauditortesting_la_LDFLAGS = \
+  -version-info 0:0:0 \
+  -no-undefined
+libtalerauditortesting_la_SOURCES = \
+  testing_auditor_api_helpers.c \
+  testing_auditor_api_cmd_deposit_confirmation.c \
+  testing_auditor_api_cmd_exchanges.c \
+  testing_auditor_api_cmd_exec_auditor.c \
+  testing_auditor_api_cmd_exec_auditor_dbinit.c \
+  testing_auditor_api_cmd_exec_wire_auditor.c
+libtalerauditortesting_la_LIBADD = \
+  libtalerauditor.la \
+  libtalerexchange.la \
+  libtalertesting.la \
+  $(top_builddir)/src/wire/libtalerwire.la \
+  $(top_builddir)/src/json/libtalerjson.la \
+  $(top_builddir)/src/util/libtalerutil.la \
+  -lgnunetcurl \
+  -lgnunetjson \
+  -lgnunetutil \
+  -ljansson \
+  $(XLIB)
+
+
 if HAVE_LIBCURL
 libtalerexchange_la_LIBADD += -lcurl
 else
@@ -103,7 +156,8 @@ endif
 check_PROGRAMS = \
   test_exchange_api_keys_cherry_picking_new \
   test_exchange_api_overlapping_keys_bug \
-  test_exchange_api_new
+  test_exchange_api_new \
+  test_auditor_api
 
 if HAVE_TWISTER
   check_PROGRAMS += \
@@ -113,10 +167,10 @@ test_exchange_api_twisted_SOURCES = \
   test_exchange_api_twisted.c
 test_exchange_api_twisted_LDADD = \
   $(LIBGCRYPT_LIBS) \
-  $(top_builddir)/src/exchange-lib/libtalertesting.la \
+  libtalertesting.la \
+  libtalerexchange.la \
   $(top_builddir)/src/bank-lib/libtalerfakebank.la \
   $(top_builddir)/src/bank-lib/libtalerbank.la \
-  $(top_builddir)/src/exchange-lib/libtalerexchange.la \
   $(top_builddir)/src/json/libtalerjson.la \
   $(top_builddir)/src/util/libtalerutil.la \
   -ltalertwistertesting \
@@ -172,10 +226,30 @@ test_exchange_api_keys_cherry_picking_new_LDADD = \
   -lgnunetutil \
   -ljansson
 
+test_auditor_api_SOURCES = \
+  test_auditor_api.c
+test_auditor_api_LDADD = \
+  libtalerauditortesting.la \
+  libtalerauditor.la \
+  libtalertesting.la \
+  libtalerexchange.la \
+  $(LIBGCRYPT_LIBS) \
+  $(top_builddir)/src/bank-lib/libtalerfakebank.la \
+  $(top_builddir)/src/bank-lib/libtalerbank.la \
+  $(top_builddir)/src/json/libtalerjson.la \
+  $(top_builddir)/src/util/libtalerutil.la \
+  -lgnunetcurl \
+  -lgnunetutil \
+  -ljansson
+
+
+
 EXTRA_DIST = \
   test_exchange_api_home/.local/share/taler/exchange/offline-keys/master.priv \
   test_exchange_api_home/.config/taler/test.json \
   test_exchange_api_home/.config/taler/sepa.json \
   test_exchange_api.conf \
   test_exchange_api_keys_cherry_picking.conf \
-  test_exchange_api_keys_cherry_picking_extended.conf
+  test_exchange_api_keys_cherry_picking_extended.conf \
+  test_auditor_api.conf \
+  test_auditor_api_expire_reserve_now.conf
diff --git a/src/exchange-lib/afl-generate.sh b/src/lib/afl-generate.sh
index b0afcab35..b0afcab35 100644
--- a/src/exchange-lib/afl-generate.sh
+++ b/src/lib/afl-generate.sh
diff --git a/src/auditor-lib/curl_defaults.c b/src/lib/auditor_api_curl_defaults.c
index 7dadc950e..d5b924008 100644
--- a/src/auditor-lib/curl_defaults.c
+++ b/src/lib/auditor_api_curl_defaults.c
@@ -20,7 +20,7 @@
  * @author Florian Dold
  */
 
-#include "curl_defaults.h"
+#include "auditor_api_curl_defaults.h"
 
 
 /**
diff --git a/src/auditor-lib/curl_defaults.h b/src/lib/auditor_api_curl_defaults.h
index 3be5816bf..3be5816bf 100644
--- a/src/auditor-lib/curl_defaults.h
+++ b/src/lib/auditor_api_curl_defaults.h
diff --git a/src/auditor-lib/auditor_api_deposit_confirmation.c b/src/lib/auditor_api_deposit_confirmation.c
index 736f326dd..99c855fb4 100644
--- a/src/auditor-lib/auditor_api_deposit_confirmation.c
+++ b/src/lib/auditor_api_deposit_confirmation.c
@@ -29,7 +29,7 @@
 #include "taler_auditor_service.h"
 #include "auditor_api_handle.h"
 #include "taler_signatures.h"
-#include "curl_defaults.h"
+#include "auditor_api_curl_defaults.h"
 
 
 /**
diff --git a/src/auditor-lib/auditor_api_exchanges.c b/src/lib/auditor_api_exchanges.c
index 2ddd2e5bf..770eedda3 100644
--- a/src/auditor-lib/auditor_api_exchanges.c
+++ b/src/lib/auditor_api_exchanges.c
@@ -29,7 +29,7 @@
 #include "taler_auditor_service.h"
 #include "auditor_api_handle.h"
 #include "taler_signatures.h"
-#include "curl_defaults.h"
+#include "auditor_api_curl_defaults.h"
 
 /**
  * How many exchanges do we allow a single auditor to
diff --git a/src/auditor-lib/auditor_api_handle.c b/src/lib/auditor_api_handle.c
index 26eca74e6..aca591dc7 100644
--- a/src/auditor-lib/auditor_api_handle.c
+++ b/src/lib/auditor_api_handle.c
@@ -27,7 +27,7 @@
 #include "taler_auditor_service.h"
 #include "taler_signatures.h"
 #include "auditor_api_handle.h"
-#include "curl_defaults.h"
+#include "auditor_api_curl_defaults.h"
 #include "backoff.h"
 
 /**
@@ -299,7 +299,7 @@ version_completed_cb (void *cls,
     free_version_request (vr);
     auditor->vr = NULL;
     GNUNET_assert (NULL == auditor->retry_task);
-    auditor->retry_delay = AUDITOR_LIB_BACKOFF (auditor->retry_delay);
+    auditor->retry_delay = EXCHANGE_LIB_BACKOFF (auditor->retry_delay);
     auditor->retry_task = GNUNET_SCHEDULER_add_delayed (auditor->retry_delay,
                                                         &request_version,
                                                         auditor);
diff --git a/src/auditor-lib/auditor_api_handle.h b/src/lib/auditor_api_handle.h
index c3c73f5c3..c3c73f5c3 100644
--- a/src/auditor-lib/auditor_api_handle.h
+++ b/src/lib/auditor_api_handle.h
diff --git a/src/exchange-lib/backoff.h b/src/lib/backoff.h
index 2af41e7c7..2af41e7c7 100644
--- a/src/exchange-lib/backoff.h
+++ b/src/lib/backoff.h
diff --git a/src/exchange-lib/baseline/admin_add_incoming.req b/src/lib/baseline/admin_add_incoming.req
index 677678b5d..677678b5d 100644
--- a/src/exchange-lib/baseline/admin_add_incoming.req
+++ b/src/lib/baseline/admin_add_incoming.req
diff --git a/src/exchange-lib/baseline/deposit.req b/src/lib/baseline/deposit.req
index a400796f1..a400796f1 100644
--- a/src/exchange-lib/baseline/deposit.req
+++ b/src/lib/baseline/deposit.req
diff --git a/src/exchange-lib/baseline/keys.req b/src/lib/baseline/keys.req
index a9503a864..a9503a864 100644
--- a/src/exchange-lib/baseline/keys.req
+++ b/src/lib/baseline/keys.req
diff --git a/src/exchange-lib/baseline/refresh_link.req b/src/lib/baseline/refresh_link.req
index acf3dff51..acf3dff51 100644
--- a/src/exchange-lib/baseline/refresh_link.req
+++ b/src/lib/baseline/refresh_link.req
diff --git a/src/exchange-lib/baseline/refresh_melt.req b/src/lib/baseline/refresh_melt.req
index 98b5b6389..98b5b6389 100644
--- a/src/exchange-lib/baseline/refresh_melt.req
+++ b/src/lib/baseline/refresh_melt.req
diff --git a/src/exchange-lib/baseline/refresh_reveal.req b/src/lib/baseline/refresh_reveal.req
index 3fb143960..3fb143960 100644
--- a/src/exchange-lib/baseline/refresh_reveal.req
+++ b/src/lib/baseline/refresh_reveal.req
diff --git a/src/exchange-lib/baseline/reserve_status.req b/src/lib/baseline/reserve_status.req
index 4f988f669..4f988f669 100644
--- a/src/exchange-lib/baseline/reserve_status.req
+++ b/src/lib/baseline/reserve_status.req
diff --git a/src/exchange-lib/baseline/reserve_withdraw.req b/src/lib/baseline/reserve_withdraw.req
index 484950250..484950250 100644
--- a/src/exchange-lib/baseline/reserve_withdraw.req
+++ b/src/lib/baseline/reserve_withdraw.req
diff --git a/src/exchange-lib/baseline/wire.req b/src/lib/baseline/wire.req
index a4f1d0749..a4f1d0749 100644
--- a/src/exchange-lib/baseline/wire.req
+++ b/src/lib/baseline/wire.req
diff --git a/src/exchange-lib/baseline/wire_sepa.req b/src/lib/baseline/wire_sepa.req
index 80d3d4619..80d3d4619 100644
--- a/src/exchange-lib/baseline/wire_sepa.req
+++ b/src/lib/baseline/wire_sepa.req
diff --git a/src/exchange-lib/baseline/wire_test.req b/src/lib/baseline/wire_test.req
index 684352c96..684352c96 100644
--- a/src/exchange-lib/baseline/wire_test.req
+++ b/src/lib/baseline/wire_test.req
diff --git a/src/exchange-lib/exchange_api_common.c b/src/lib/exchange_api_common.c
index 6b0aa6ff6..6b0aa6ff6 100644
--- a/src/exchange-lib/exchange_api_common.c
+++ b/src/lib/exchange_api_common.c
diff --git a/src/exchange-lib/curl_defaults.c b/src/lib/exchange_api_curl_defaults.c
index cd0f1aeba..45aa36b9f 100644
--- a/src/exchange-lib/curl_defaults.c
+++ b/src/lib/exchange_api_curl_defaults.c
@@ -15,12 +15,12 @@
   <http://www.gnu.org/licenses/>
 */
 /**
- * @file exchange-lib/curl_defaults.c
+ * @file lib/exchange_api_curl_defaults.c
  * @brief curl easy handle defaults
  * @author Florian Dold
  */
 
-#include "curl_defaults.h"
+#include "exchange_api_curl_defaults.h"
 
 
 /**
diff --git a/src/exchange-lib/curl_defaults.h b/src/lib/exchange_api_curl_defaults.h
index 07bab8fb2..7ebf4e966 100644
--- a/src/exchange-lib/curl_defaults.h
+++ b/src/lib/exchange_api_curl_defaults.h
@@ -16,7 +16,7 @@
 */
 
 /**
- * @file exchange-lib/curl_defaults.h
+ * @file lib/exchange_api_curl_defaults.h
  * @brief curl easy handle defaults
  * @author Florian Dold
  */
diff --git a/src/exchange-lib/exchange_api_deposit.c b/src/lib/exchange_api_deposit.c
index 23066c7dc..55b3ca6b3 100644
--- a/src/exchange-lib/exchange_api_deposit.c
+++ b/src/lib/exchange_api_deposit.c
@@ -31,7 +31,7 @@
 #include "taler_exchange_service.h"
 #include "exchange_api_handle.h"
 #include "taler_signatures.h"
-#include "curl_defaults.h"
+#include "exchange_api_curl_defaults.h"
 
 
 /**
@@ -84,7 +84,7 @@ struct TALER_EXCHANGE_DepositHandle
    * Total value of the coin being transacted with.
    */
   struct TALER_Amount coin_value;
-  
+
 };
 
 
@@ -160,7 +160,7 @@ verify_deposit_signature_ok (const struct TALER_EXCHANGE_DepositHandle *dh,
     struct TALER_AUDITOR_DepositConfirmationHandle *dch;
     const struct TALER_EXCHANGE_SigningPublicKey *spk;
     struct TALER_Amount amount_without_fee;
-    
+
     spk = TALER_EXCHANGE_get_signing_key_details (key_state,
 						  exchange_pub);
     GNUNET_assert (NULL != spk);
@@ -185,7 +185,7 @@ verify_deposit_signature_ok (const struct TALER_EXCHANGE_DepositHandle *dh,
 					      NULL /* FIXME: context! */);
   }
 
-  
+
   return GNUNET_OK;
 }
 
diff --git a/src/exchange-lib/exchange_api_handle.c b/src/lib/exchange_api_handle.c
index afaabd85b..9743b1f09 100644
--- a/src/exchange-lib/exchange_api_handle.c
+++ b/src/lib/exchange_api_handle.c
@@ -31,7 +31,7 @@
 #include "taler_auditor_service.h"
 #include "taler_signatures.h"
 #include "exchange_api_handle.h"
-#include "curl_defaults.h"
+#include "exchange_api_curl_defaults.h"
 #include "backoff.h"
 
 /**
@@ -100,7 +100,7 @@ struct AuditorInteractionEntry
    * DLL entry.
    */
   struct AuditorInteractionEntry *next;
-  
+
   /**
    * DLL entry.
    */
@@ -142,7 +142,7 @@ struct AuditorListEntry
    * Head of DLL of interactions with this auditor.
    */
   struct AuditorInteractionEntry *ai_head;
-  
+
   /**
    * Tail of DLL of interactions with this auditor.
    */
@@ -158,7 +158,7 @@ struct AuditorListEntry
    * version compatibility is given.
    */
   int is_up;
-  
+
 };
 
 
@@ -214,7 +214,7 @@ struct TALER_EXCHANGE_Handle
    * Tail of DLL of auditors of this exchange.
    */
   struct AuditorListEntry *auditors_tail;
-  
+
   /**
    * Key data of the exchange, only valid if
    * @e handshake_complete is past stage #MHS_CERT.
@@ -234,8 +234,8 @@ struct TALER_EXCHANGE_Handle
   /**
    * Stage of the exchange's initialization routines.
    */
-  enum ExchangeHandleState state;  
-  
+  enum ExchangeHandleState state;
+
 };
 
 
@@ -559,7 +559,7 @@ parse_json_auditor (struct TALER_EXCHANGE_AuditorInformation *auditor,
     }
     if (NULL == dk)
     {
-      GNUNET_break_op (0); 
+      GNUNET_break_op (0);
       continue;
     }
     if (check_sigs)
@@ -770,7 +770,7 @@ decode_keys_json (const json_t *resp_obj,
 
       /* Update "last_denom_issue_date" */
       TALER_LOG_DEBUG ("Crawling DK 'valid_from': %s\n",
-                       GNUNET_STRINGS_absolute_time_to_string (dk.valid_from));  
+                       GNUNET_STRINGS_absolute_time_to_string (dk.valid_from));
       key_data->last_denom_issue_date
         = GNUNET_TIME_absolute_max (key_data->last_denom_issue_date,
                                     dk.valid_from);
@@ -1655,7 +1655,7 @@ TALER_EXCHANGE_get_signing_key_details (const struct TALER_EXCHANGE_Keys *keys,
   for (unsigned int i=0;i<keys->num_sign_keys;i++)
   {
     struct TALER_EXCHANGE_SigningPublicKey *spk = &keys->sign_keys[i];
-    
+
     if (0 == memcmp (pub,
 		     &spk->key,
 		     sizeof (struct TALER_ExchangePublicKeyP)))
diff --git a/src/exchange-lib/exchange_api_handle.h b/src/lib/exchange_api_handle.h
index f06fa4eef..f06fa4eef 100644
--- a/src/exchange-lib/exchange_api_handle.h
+++ b/src/lib/exchange_api_handle.h
diff --git a/src/exchange-lib/exchange_api_payback.c b/src/lib/exchange_api_payback.c
index 9f8005558..6c1772aff 100644
--- a/src/exchange-lib/exchange_api_payback.c
+++ b/src/lib/exchange_api_payback.c
@@ -29,7 +29,7 @@
 #include "taler_exchange_service.h"
 #include "exchange_api_handle.h"
 #include "taler_signatures.h"
-#include "curl_defaults.h"
+#include "exchange_api_curl_defaults.h"
 
 
 /**
diff --git a/src/exchange-lib/exchange_api_refresh.c b/src/lib/exchange_api_refresh.c
index 50c55835b..b766b7957 100644
--- a/src/exchange-lib/exchange_api_refresh.c
+++ b/src/lib/exchange_api_refresh.c
@@ -29,7 +29,7 @@
 #include "taler_exchange_service.h"
 #include "exchange_api_handle.h"
 #include "taler_signatures.h"
-#include "curl_defaults.h"
+#include "exchange_api_curl_defaults.h"
 
 
 /* ********************* /refresh/ common ***************************** */
diff --git a/src/exchange-lib/exchange_api_refresh_link.c b/src/lib/exchange_api_refresh_link.c
index 796608db5..ea82c9baa 100644
--- a/src/exchange-lib/exchange_api_refresh_link.c
+++ b/src/lib/exchange_api_refresh_link.c
@@ -27,7 +27,7 @@
 #include "taler_json_lib.h"
 #include "exchange_api_handle.h"
 #include "taler_signatures.h"
-#include "curl_defaults.h"
+#include "exchange_api_curl_defaults.h"
 
 
 /**
diff --git a/src/exchange-lib/exchange_api_refund.c b/src/lib/exchange_api_refund.c
index 447e9ce08..75ebdc4e3 100644
--- a/src/exchange-lib/exchange_api_refund.c
+++ b/src/lib/exchange_api_refund.c
@@ -29,7 +29,7 @@
 #include "taler_exchange_service.h"
 #include "exchange_api_handle.h"
 #include "taler_signatures.h"
-#include "curl_defaults.h"
+#include "exchange_api_curl_defaults.h"
 
 
 /**
@@ -284,7 +284,7 @@ TALER_EXCHANGE_refund (struct TALER_EXCHANGE_Handle *exchange,
 				 cb_cls);
 }
 
-  
+
 /**
  * Submit a refund request to the exchange and get the exchange's
  * response.  This API is used by a merchant.  Note that
diff --git a/src/exchange-lib/exchange_api_reserve.c b/src/lib/exchange_api_reserve.c
index aa153f210..d4d0cb9a1 100644
--- a/src/exchange-lib/exchange_api_reserve.c
+++ b/src/lib/exchange_api_reserve.c
@@ -29,7 +29,7 @@
 #include "taler_json_lib.h"
 #include "exchange_api_handle.h"
 #include "taler_signatures.h"
-#include "curl_defaults.h"
+#include "exchange_api_curl_defaults.h"
 
 
 /* ********************** /reserve/status ********************** */
diff --git a/src/exchange-lib/exchange_api_track_transaction.c b/src/lib/exchange_api_track_transaction.c
index d61344e59..0942ce84a 100644
--- a/src/exchange-lib/exchange_api_track_transaction.c
+++ b/src/lib/exchange_api_track_transaction.c
@@ -29,7 +29,7 @@
 #include "taler_exchange_service.h"
 #include "exchange_api_handle.h"
 #include "taler_signatures.h"
-#include "curl_defaults.h"
+#include "exchange_api_curl_defaults.h"
 
 
 /**
diff --git a/src/exchange-lib/exchange_api_track_transfer.c b/src/lib/exchange_api_track_transfer.c
index cf87fe77a..88043b7ba 100644
--- a/src/exchange-lib/exchange_api_track_transfer.c
+++ b/src/lib/exchange_api_track_transfer.c
@@ -28,7 +28,7 @@
 #include "taler_json_lib.h"
 #include "exchange_api_handle.h"
 #include "taler_signatures.h"
-#include "curl_defaults.h"
+#include "exchange_api_curl_defaults.h"
 
 
 /**
diff --git a/src/exchange-lib/exchange_api_wire.c b/src/lib/exchange_api_wire.c
index 0d4644dbf..85d1835cf 100644
--- a/src/exchange-lib/exchange_api_wire.c
+++ b/src/lib/exchange_api_wire.c
@@ -30,7 +30,7 @@
 #include "taler_signatures.h"
 #include "taler_wire_plugin.h"
 #include "exchange_api_handle.h"
-#include "curl_defaults.h"
+#include "exchange_api_curl_defaults.h"
 
 
 /**
diff --git a/src/auditor-lib/test_auditor_api.c b/src/lib/test_auditor_api.c
index cddd21197..cddd21197 100644
--- a/src/auditor-lib/test_auditor_api.c
+++ b/src/lib/test_auditor_api.c
diff --git a/src/auditor-lib/test_auditor_api.conf b/src/lib/test_auditor_api.conf
index 532f9c932..532f9c932 100644
--- a/src/auditor-lib/test_auditor_api.conf
+++ b/src/lib/test_auditor_api.conf
diff --git a/src/auditor-lib/test_auditor_api_expire_reserve_now.conf b/src/lib/test_auditor_api_expire_reserve_now.conf
index 05bca956b..05bca956b 100644
--- a/src/auditor-lib/test_auditor_api_expire_reserve_now.conf
+++ b/src/lib/test_auditor_api_expire_reserve_now.conf
diff --git a/src/exchange-lib/test_exchange_api.conf b/src/lib/test_exchange_api.conf
index a44bab3ae..a44bab3ae 100644
--- a/src/exchange-lib/test_exchange_api.conf
+++ b/src/lib/test_exchange_api.conf
diff --git a/src/exchange-lib/test_exchange_api_expire_reserve_now.conf b/src/lib/test_exchange_api_expire_reserve_now.conf
index 05bca956b..05bca956b 100644
--- a/src/exchange-lib/test_exchange_api_expire_reserve_now.conf
+++ b/src/lib/test_exchange_api_expire_reserve_now.conf
diff --git a/src/auditor-lib/test_exchange_api_home/.config/taler/account-1.json b/src/lib/test_exchange_api_home/.config/taler/account-1.json
index 48093f2aa..48093f2aa 100644
--- a/src/auditor-lib/test_exchange_api_home/.config/taler/account-1.json
+++ b/src/lib/test_exchange_api_home/.config/taler/account-1.json
diff --git a/src/auditor-lib/test_exchange_api_home/.config/taler/account-2.json b/src/lib/test_exchange_api_home/.config/taler/account-2.json
index 159e03171..159e03171 100644
--- a/src/auditor-lib/test_exchange_api_home/.config/taler/account-2.json
+++ b/src/lib/test_exchange_api_home/.config/taler/account-2.json
diff --git a/src/auditor-lib/test_exchange_api_home/.config/taler/sepa.json b/src/lib/test_exchange_api_home/.config/taler/sepa.json
index b435ce86b..b435ce86b 100644
--- a/src/auditor-lib/test_exchange_api_home/.config/taler/sepa.json
+++ b/src/lib/test_exchange_api_home/.config/taler/sepa.json
diff --git a/src/auditor-lib/test_exchange_api_home/.config/taler/test.json b/src/lib/test_exchange_api_home/.config/taler/test.json
index eca394241..eca394241 100644
--- a/src/auditor-lib/test_exchange_api_home/.config/taler/test.json
+++ b/src/lib/test_exchange_api_home/.config/taler/test.json
diff --git a/src/auditor-lib/test_exchange_api_home/.config/taler/x-taler-bank.json b/src/lib/test_exchange_api_home/.config/taler/x-taler-bank.json
index a15df27ca..a15df27ca 100644
--- a/src/auditor-lib/test_exchange_api_home/.config/taler/x-taler-bank.json
+++ b/src/lib/test_exchange_api_home/.config/taler/x-taler-bank.json
diff --git a/src/auditor-lib/test_exchange_api_home/.local/share/taler/exchange/offline-keys/master.priv b/src/lib/test_exchange_api_home/.local/share/taler/exchange/offline-keys/master.priv
index 394926938..394926938 100644
--- a/src/auditor-lib/test_exchange_api_home/.local/share/taler/exchange/offline-keys/master.priv
+++ b/src/lib/test_exchange_api_home/.local/share/taler/exchange/offline-keys/master.priv
diff --git a/src/exchange-lib/test_exchange_api_keys_cherry_picking.conf b/src/lib/test_exchange_api_keys_cherry_picking.conf
index 8d5585e3a..8d5585e3a 100644
--- a/src/exchange-lib/test_exchange_api_keys_cherry_picking.conf
+++ b/src/lib/test_exchange_api_keys_cherry_picking.conf
diff --git a/src/exchange-lib/test_exchange_api_keys_cherry_picking_extended.conf b/src/lib/test_exchange_api_keys_cherry_picking_extended.conf
index 29290c99c..29290c99c 100644
--- a/src/exchange-lib/test_exchange_api_keys_cherry_picking_extended.conf
+++ b/src/lib/test_exchange_api_keys_cherry_picking_extended.conf
diff --git a/src/exchange-lib/test_exchange_api_keys_cherry_picking_extended_2.conf b/src/lib/test_exchange_api_keys_cherry_picking_extended_2.conf
index cfa8b1347..cfa8b1347 100644
--- a/src/exchange-lib/test_exchange_api_keys_cherry_picking_extended_2.conf
+++ b/src/lib/test_exchange_api_keys_cherry_picking_extended_2.conf
diff --git a/src/exchange-lib/test_exchange_api_keys_cherry_picking_new.c b/src/lib/test_exchange_api_keys_cherry_picking_new.c
index 45222a66c..45222a66c 100644
--- a/src/exchange-lib/test_exchange_api_keys_cherry_picking_new.c
+++ b/src/lib/test_exchange_api_keys_cherry_picking_new.c
diff --git a/src/exchange-lib/test_exchange_api_new.c b/src/lib/test_exchange_api_new.c
index bcbdb5ea4..bcbdb5ea4 100644
--- a/src/exchange-lib/test_exchange_api_new.c
+++ b/src/lib/test_exchange_api_new.c
diff --git a/src/exchange-lib/test_exchange_api_overlapping_keys_bug.c b/src/lib/test_exchange_api_overlapping_keys_bug.c
index d1fd7123b..d1fd7123b 100755
--- a/src/exchange-lib/test_exchange_api_overlapping_keys_bug.c
+++ b/src/lib/test_exchange_api_overlapping_keys_bug.c
diff --git a/src/exchange-lib/test_exchange_api_twisted.c b/src/lib/test_exchange_api_twisted.c
index 1c5300586..1c5300586 100644
--- a/src/exchange-lib/test_exchange_api_twisted.c
+++ b/src/lib/test_exchange_api_twisted.c
diff --git a/src/exchange-lib/test_exchange_api_twisted.conf b/src/lib/test_exchange_api_twisted.conf
index ba59b5a60..ba59b5a60 100644
--- a/src/exchange-lib/test_exchange_api_twisted.conf
+++ b/src/lib/test_exchange_api_twisted.conf
diff --git a/src/exchange-lib/testing_api_cmd_bank_check.c b/src/lib/testing_api_cmd_bank_check.c
index 265cba176..265cba176 100644
--- a/src/exchange-lib/testing_api_cmd_bank_check.c
+++ b/src/lib/testing_api_cmd_bank_check.c
diff --git a/src/exchange-lib/testing_api_cmd_batch.c b/src/lib/testing_api_cmd_batch.c
index a56c959a0..a56c959a0 100644
--- a/src/exchange-lib/testing_api_cmd_batch.c
+++ b/src/lib/testing_api_cmd_batch.c
diff --git a/src/exchange-lib/testing_api_cmd_check_keys.c b/src/lib/testing_api_cmd_check_keys.c
index d329f31a4..d329f31a4 100644
--- a/src/exchange-lib/testing_api_cmd_check_keys.c
+++ b/src/lib/testing_api_cmd_check_keys.c
diff --git a/src/exchange-lib/testing_api_cmd_deposit.c b/src/lib/testing_api_cmd_deposit.c
index 6fa2310d3..6fa2310d3 100644
--- a/src/exchange-lib/testing_api_cmd_deposit.c
+++ b/src/lib/testing_api_cmd_deposit.c
diff --git a/src/exchange-lib/testing_api_cmd_exec_aggregator.c b/src/lib/testing_api_cmd_exec_aggregator.c
index c51d44989..c51d44989 100644
--- a/src/exchange-lib/testing_api_cmd_exec_aggregator.c
+++ b/src/lib/testing_api_cmd_exec_aggregator.c
diff --git a/src/exchange-lib/testing_api_cmd_exec_auditor-sign.c b/src/lib/testing_api_cmd_exec_auditor-sign.c
index 90a1654ce..90a1654ce 100644
--- a/src/exchange-lib/testing_api_cmd_exec_auditor-sign.c
+++ b/src/lib/testing_api_cmd_exec_auditor-sign.c
diff --git a/src/exchange-lib/testing_api_cmd_exec_keyup.c b/src/lib/testing_api_cmd_exec_keyup.c
index 576aab3c7..576aab3c7 100644
--- a/src/exchange-lib/testing_api_cmd_exec_keyup.c
+++ b/src/lib/testing_api_cmd_exec_keyup.c
diff --git a/src/exchange-lib/testing_api_cmd_exec_wirewatch.c b/src/lib/testing_api_cmd_exec_wirewatch.c
index a81bf5c2b..a81bf5c2b 100644
--- a/src/exchange-lib/testing_api_cmd_exec_wirewatch.c
+++ b/src/lib/testing_api_cmd_exec_wirewatch.c
diff --git a/src/exchange-lib/testing_api_cmd_fakebank_transfer.c b/src/lib/testing_api_cmd_fakebank_transfer.c
index 43f72573b..43f72573b 100644
--- a/src/exchange-lib/testing_api_cmd_fakebank_transfer.c
+++ b/src/lib/testing_api_cmd_fakebank_transfer.c
diff --git a/src/exchange-lib/testing_api_cmd_payback.c b/src/lib/testing_api_cmd_payback.c
index a4a3aeff1..a4a3aeff1 100644
--- a/src/exchange-lib/testing_api_cmd_payback.c
+++ b/src/lib/testing_api_cmd_payback.c
diff --git a/src/exchange-lib/testing_api_cmd_refresh.c b/src/lib/testing_api_cmd_refresh.c
index 55900cf27..55900cf27 100644
--- a/src/exchange-lib/testing_api_cmd_refresh.c
+++ b/src/lib/testing_api_cmd_refresh.c
diff --git a/src/exchange-lib/testing_api_cmd_refund.c b/src/lib/testing_api_cmd_refund.c
index f6640d0fc..f6640d0fc 100644
--- a/src/exchange-lib/testing_api_cmd_refund.c
+++ b/src/lib/testing_api_cmd_refund.c
diff --git a/src/exchange-lib/testing_api_cmd_serialize_keys.c b/src/lib/testing_api_cmd_serialize_keys.c
index 38d32eadd..38d32eadd 100644
--- a/src/exchange-lib/testing_api_cmd_serialize_keys.c
+++ b/src/lib/testing_api_cmd_serialize_keys.c
diff --git a/src/exchange-lib/testing_api_cmd_signal.c b/src/lib/testing_api_cmd_signal.c
index f4fd8bb76..f4fd8bb76 100644
--- a/src/exchange-lib/testing_api_cmd_signal.c
+++ b/src/lib/testing_api_cmd_signal.c
diff --git a/src/exchange-lib/testing_api_cmd_sleep.c b/src/lib/testing_api_cmd_sleep.c
index 165d0aae4..165d0aae4 100644
--- a/src/exchange-lib/testing_api_cmd_sleep.c
+++ b/src/lib/testing_api_cmd_sleep.c
diff --git a/src/exchange-lib/testing_api_cmd_status.c b/src/lib/testing_api_cmd_status.c
index 8e9290f6d..8e9290f6d 100644
--- a/src/exchange-lib/testing_api_cmd_status.c
+++ b/src/lib/testing_api_cmd_status.c
diff --git a/src/exchange-lib/testing_api_cmd_track.c b/src/lib/testing_api_cmd_track.c
index 4898a097c..4898a097c 100644
--- a/src/exchange-lib/testing_api_cmd_track.c
+++ b/src/lib/testing_api_cmd_track.c
diff --git a/src/exchange-lib/testing_api_cmd_wire.c b/src/lib/testing_api_cmd_wire.c
index 113545499..113545499 100644
--- a/src/exchange-lib/testing_api_cmd_wire.c
+++ b/src/lib/testing_api_cmd_wire.c
diff --git a/src/exchange-lib/testing_api_cmd_withdraw.c b/src/lib/testing_api_cmd_withdraw.c
index 7224f65e4..7224f65e4 100644
--- a/src/exchange-lib/testing_api_cmd_withdraw.c
+++ b/src/lib/testing_api_cmd_withdraw.c
diff --git a/src/exchange-lib/testing_api_helpers.c b/src/lib/testing_api_helpers.c
index e56a57b92..e56a57b92 100644
--- a/src/exchange-lib/testing_api_helpers.c
+++ b/src/lib/testing_api_helpers.c
diff --git a/src/exchange-lib/testing_api_loop.c b/src/lib/testing_api_loop.c
index 3e7e36432..3e7e36432 100644
--- a/src/exchange-lib/testing_api_loop.c
+++ b/src/lib/testing_api_loop.c
diff --git a/src/exchange-lib/testing_api_trait_amount.c b/src/lib/testing_api_trait_amount.c
index 8f2b79d45..8f2b79d45 100644
--- a/src/exchange-lib/testing_api_trait_amount.c
+++ b/src/lib/testing_api_trait_amount.c
diff --git a/src/exchange-lib/testing_api_trait_blinding_key.c b/src/lib/testing_api_trait_blinding_key.c
index 6e52d1148..6e52d1148 100644
--- a/src/exchange-lib/testing_api_trait_blinding_key.c
+++ b/src/lib/testing_api_trait_blinding_key.c
diff --git a/src/exchange-lib/testing_api_trait_cmd.c b/src/lib/testing_api_trait_cmd.c
index 61e976568..61e976568 100644
--- a/src/exchange-lib/testing_api_trait_cmd.c
+++ b/src/lib/testing_api_trait_cmd.c
diff --git a/src/exchange-lib/testing_api_trait_coin_priv.c b/src/lib/testing_api_trait_coin_priv.c
index b06e4a207..b06e4a207 100644
--- a/src/exchange-lib/testing_api_trait_coin_priv.c
+++ b/src/lib/testing_api_trait_coin_priv.c
diff --git a/src/exchange-lib/testing_api_trait_denom_pub.c b/src/lib/testing_api_trait_denom_pub.c
index 448a262c8..448a262c8 100644
--- a/src/exchange-lib/testing_api_trait_denom_pub.c
+++ b/src/lib/testing_api_trait_denom_pub.c
diff --git a/src/exchange-lib/testing_api_trait_denom_sig.c b/src/lib/testing_api_trait_denom_sig.c
index 03062c835..03062c835 100644
--- a/src/exchange-lib/testing_api_trait_denom_sig.c
+++ b/src/lib/testing_api_trait_denom_sig.c
diff --git a/src/exchange-lib/testing_api_trait_exchange_pub.c b/src/lib/testing_api_trait_exchange_pub.c
index e8cdfbb35..e8cdfbb35 100644
--- a/src/exchange-lib/testing_api_trait_exchange_pub.c
+++ b/src/lib/testing_api_trait_exchange_pub.c
diff --git a/src/exchange-lib/testing_api_trait_exchange_sig.c b/src/lib/testing_api_trait_exchange_sig.c
index 97ce2d969..97ce2d969 100644
--- a/src/exchange-lib/testing_api_trait_exchange_sig.c
+++ b/src/lib/testing_api_trait_exchange_sig.c
diff --git a/src/exchange-lib/testing_api_trait_fresh_coin.c b/src/lib/testing_api_trait_fresh_coin.c
index 1f6cdac2c..1f6cdac2c 100644
--- a/src/exchange-lib/testing_api_trait_fresh_coin.c
+++ b/src/lib/testing_api_trait_fresh_coin.c
diff --git a/src/exchange-lib/testing_api_trait_json.c b/src/lib/testing_api_trait_json.c
index 5f6647fbb..5f6647fbb 100644
--- a/src/exchange-lib/testing_api_trait_json.c
+++ b/src/lib/testing_api_trait_json.c
diff --git a/src/exchange-lib/testing_api_trait_key_peer.c b/src/lib/testing_api_trait_key_peer.c
index d10623d28..d10623d28 100644
--- a/src/exchange-lib/testing_api_trait_key_peer.c
+++ b/src/lib/testing_api_trait_key_peer.c
diff --git a/src/exchange-lib/testing_api_trait_number.c b/src/lib/testing_api_trait_number.c
index ee2e76dbb..ee2e76dbb 100644
--- a/src/exchange-lib/testing_api_trait_number.c
+++ b/src/lib/testing_api_trait_number.c
diff --git a/src/exchange-lib/testing_api_trait_process.c b/src/lib/testing_api_trait_process.c
index 449b6536f..449b6536f 100644
--- a/src/exchange-lib/testing_api_trait_process.c
+++ b/src/lib/testing_api_trait_process.c
diff --git a/src/exchange-lib/testing_api_trait_reserve_priv.c b/src/lib/testing_api_trait_reserve_priv.c
index 4a619d07f..4a619d07f 100644
--- a/src/exchange-lib/testing_api_trait_reserve_priv.c
+++ b/src/lib/testing_api_trait_reserve_priv.c
diff --git a/src/exchange-lib/testing_api_trait_string.c b/src/lib/testing_api_trait_string.c
index 8b8f511a7..8b8f511a7 100644
--- a/src/exchange-lib/testing_api_trait_string.c
+++ b/src/lib/testing_api_trait_string.c
diff --git a/src/exchange-lib/testing_api_trait_wtid.c b/src/lib/testing_api_trait_wtid.c
index 672329713..672329713 100644
--- a/src/exchange-lib/testing_api_trait_wtid.c
+++ b/src/lib/testing_api_trait_wtid.c
diff --git a/src/exchange-lib/testing_api_traits.c b/src/lib/testing_api_traits.c
index aa6c79c83..aa6c79c83 100644
--- a/src/exchange-lib/testing_api_traits.c
+++ b/src/lib/testing_api_traits.c
diff --git a/src/auditor-lib/testing_auditor_api_cmd_deposit_confirmation.c b/src/lib/testing_auditor_api_cmd_deposit_confirmation.c
index 6a6e98571..ad02a6ef5 100644
--- a/src/auditor-lib/testing_auditor_api_cmd_deposit_confirmation.c
+++ b/src/lib/testing_auditor_api_cmd_deposit_confirmation.c
@@ -156,7 +156,7 @@ deposit_confirmation_cb (void *cls,
 	if (TALER_EC_DB_COMMIT_FAILED_ON_RETRY == ec)
 	  dcs->backoff = GNUNET_TIME_UNIT_ZERO;
 	else
-	  dcs->backoff = AUDITOR_LIB_BACKOFF (dcs->backoff);
+	  dcs->backoff = EXCHANGE_LIB_BACKOFF (dcs->backoff);
 	dcs->retry_task = GNUNET_SCHEDULER_add_delayed (dcs->backoff,
 							&do_retry,
 							dcs);
diff --git a/src/auditor-lib/testing_auditor_api_cmd_exchanges.c b/src/lib/testing_auditor_api_cmd_exchanges.c
index 71b82a39a..ed4ca5e0e 100644
--- a/src/auditor-lib/testing_auditor_api_cmd_exchanges.c
+++ b/src/lib/testing_auditor_api_cmd_exchanges.c
@@ -45,7 +45,7 @@ struct ExchangesState
    * Auditor connection.
    */
   struct TALER_AUDITOR_Handle *auditor;
-  
+
   /**
    * Interpreter state.
    */
@@ -139,7 +139,7 @@ exchanges_cb (void *cls,
 	if (TALER_EC_DB_COMMIT_FAILED_ON_RETRY == ec)
 	  es->backoff = GNUNET_TIME_UNIT_ZERO;
 	else
-	  es->backoff = AUDITOR_LIB_BACKOFF (es->backoff);
+	  es->backoff = EXCHANGE_LIB_BACKOFF (es->backoff);
 	es->retry_task = GNUNET_SCHEDULER_add_delayed (es->backoff,
 							&do_retry,
 							es);
@@ -173,7 +173,7 @@ exchanges_run (void *cls,
 	       struct TALER_TESTING_Interpreter *is)
 {
   struct ExchangesState *es = cls;
-  
+
   es->is = is;
   es->leh = TALER_AUDITOR_list_exchanges
     (es->auditor,
@@ -269,7 +269,7 @@ TALER_TESTING_cmd_exchanges
   cmd.run = &exchanges_run;
   cmd.cleanup = &exchanges_cleanup;
   cmd.traits = &exchanges_traits;
-  
+
   return cmd;
 }
 
diff --git a/src/auditor-lib/testing_auditor_api_cmd_exec_auditor.c b/src/lib/testing_auditor_api_cmd_exec_auditor.c
index afe9d38fc..afe9d38fc 100644
--- a/src/auditor-lib/testing_auditor_api_cmd_exec_auditor.c
+++ b/src/lib/testing_auditor_api_cmd_exec_auditor.c
diff --git a/src/auditor-lib/testing_auditor_api_cmd_exec_auditor_dbinit.c b/src/lib/testing_auditor_api_cmd_exec_auditor_dbinit.c
index 09771660c..09771660c 100644
--- a/src/auditor-lib/testing_auditor_api_cmd_exec_auditor_dbinit.c
+++ b/src/lib/testing_auditor_api_cmd_exec_auditor_dbinit.c
diff --git a/src/auditor-lib/testing_auditor_api_cmd_exec_wire_auditor.c b/src/lib/testing_auditor_api_cmd_exec_wire_auditor.c
index 8371f9690..8371f9690 100644
--- a/src/auditor-lib/testing_auditor_api_cmd_exec_wire_auditor.c
+++ b/src/lib/testing_auditor_api_cmd_exec_wire_auditor.c
diff --git a/src/auditor-lib/testing_auditor_api_helpers.c b/src/lib/testing_auditor_api_helpers.c
index 7e7103150..7e7103150 100644
--- a/src/auditor-lib/testing_auditor_api_helpers.c
+++ b/src/lib/testing_auditor_api_helpers.c