diff --git a/src/include/taler_crypto_lib.h b/src/include/taler_crypto_lib.h
index 6c1ef8e8e..6509935ab 100644
--- a/src/include/taler_crypto_lib.h
+++ b/src/include/taler_crypto_lib.h
@@ -22,7 +22,14 @@
 #ifndef TALER_CRYPTO_LIB_H
 #define TALER_CRYPTO_LIB_H
 
+#if HAVE_GNUNET_GNUNET_UTIL_LIB_H
 #include <gnunet/gnunet_util_lib.h>
+#endif
+#if HAVE_GNUNET_GNUNET_UTIL_TALER_WALLET_LIB_H
+#include <gnunet/gnunet_util_taler_wallet_lib.h>
+#endif
+#include "taler_util_wallet.h"
+
 #include <gcrypt.h>
 
 
diff --git a/src/util/Makefile.am b/src/util/Makefile.am
index 0c44570ed..eaf3a4827 100644
--- a/src/util/Makefile.am
+++ b/src/util/Makefile.am
@@ -16,8 +16,7 @@ endif
 
 libtalerutil_wallet_la_SOURCES = \
   amount.c \
-  crypto.c \
-  util.c
+  crypto.c
 
 libtalerutil_wallet_la_LIBADD = \
   -lgnunetutil_taler_wallet \
diff --git a/src/util/amount.c b/src/util/amount.c
index bc8ea24ba..424959bcc 100644
--- a/src/util/amount.c
+++ b/src/util/amount.c
@@ -22,7 +22,12 @@
  * @author Christian Grothoff
  */
 #include "platform.h"
+#if HAVE_GNUNET_GNUNET_UTIL_LIB_H
 #include "taler_util.h"
+#endif
+#if HAVE_GNUNET_GNUNET_UTIL_TALER_WALLET_LIB_H
+#include "taler_util_wallet.h"
+#endif
 #include <gcrypt.h>
 
 
diff --git a/src/util/crypto.c b/src/util/crypto.c
index 590ed428b..b803b960a 100644
--- a/src/util/crypto.c
+++ b/src/util/crypto.c
@@ -22,13 +22,12 @@
  * @author Christian Grothoff
  */
 #include "platform.h"
-#include "taler_util.h"
 
 #if HAVE_GNUNET_GNUNET_UTIL_TALER_WALLET_LIB_H
-#include <gnunet/gnunet_util_taler_wallet_lib.h>
+#include "taler_util_wallet.h"
 #endif
 #if HAVE_GNUNET_GNUNET_UTIL_LIB_H
-#include <gnunet/gnunet_util_lib.h>
+#include "taler_util.h"
 #endif
 #include <gcrypt.h>
 
diff --git a/src/util/util.c b/src/util/util.c
index 1d8b09c4d..f45598b0c 100644
--- a/src/util/util.c
+++ b/src/util/util.c
@@ -24,12 +24,6 @@
 
 #include "platform.h"
 #include "taler_util.h"
-#if HAVE_GNUNET_GNUNET_UTIL_TALER_WALLET_LIB_H
-#include <gnunet/gnunet_util_taler_wallet_lib.h>
-#endif
-#if HAVE_GNUNET_GNUNET_UTIL_LIB_H
-#include <gnunet/gnunet_util_lib.h>
-#endif
 #include <gcrypt.h>