10 files changed, 12 insertions, 12 deletions
diff --git a/src/util/Makefile.am b/src/util/Makefile.am
index b4315ddea..cad54b8b9 100644
--- a/src/util/Makefile.am
+++ b/src/util/Makefile.am
@@ -49,7 +49,7 @@ taler_exchange_config_LDADD = \
   $(XLIB)
 
 taler_exchange_secmod_rsa_SOURCES = \
-  taler-exchange-secmod-rsa.c taler-exchange-secmod-rsa.h
+  taler-exchange-secmod-rsa.c
 taler_exchange_secmod_rsa_LDADD = \
   libtalerutil.la \
   -lgnunetutil \
@@ -58,7 +58,7 @@ taler_exchange_secmod_rsa_LDADD = \
   $(XLIB)
 
 taler_exchange_secmod_cs_SOURCES = \
-  taler-exchange-secmod-cs.c taler-exchange-secmod-cs.h
+  taler-exchange-secmod-cs.c
 taler_exchange_secmod_cs_LDADD = \
   libtalerutil.la \
   -lgnunetutil \
@@ -67,7 +67,7 @@ taler_exchange_secmod_cs_LDADD = \
   $(XLIB)
 
 taler_exchange_secmod_eddsa_SOURCES = \
-  taler-exchange-secmod-eddsa.c taler-exchange-secmod-eddsa.h
+  taler-exchange-secmod-eddsa.c
 taler_exchange_secmod_eddsa_LDADD = \
   libtalerutil.la \
   -lgnunetutil \
@@ -103,9 +103,9 @@ libtalerutil_la_SOURCES = \
   offline_signatures.c \
   payto.c \
   secmod_common.c secmod_common.h \
-  secmod_cs.c \
-  secmod_eddsa.c \
-  secmod_rsa.c \
+  secmod_cs.c secmod_cs.h \
+  secmod_eddsa.c secmod_eddsa.h \
+  secmod_rsa.c secmod_rsa.h \
   secmod_signatures.c \
   taler_error_codes.c \
   tokens.c \
diff --git a/src/util/crypto_helper_cs.c b/src/util/crypto_helper_cs.c
index d423ae640..72e079811 100644
--- a/src/util/crypto_helper_cs.c
+++ b/src/util/crypto_helper_cs.c
@@ -21,7 +21,7 @@
 #include "platform.h"
 #include "taler_util.h"
 #include "taler_signatures.h"
-#include "taler-exchange-secmod-cs.h"
+#include "secmod_cs.h"
 #include <poll.h>
 #include "crypto_helper_common.h"
 
diff --git a/src/util/crypto_helper_esign.c b/src/util/crypto_helper_esign.c
index 4c46cec56..fa884b112 100644
--- a/src/util/crypto_helper_esign.c
+++ b/src/util/crypto_helper_esign.c
@@ -21,7 +21,7 @@
 #include "platform.h"
 #include "taler_util.h"
 #include "taler_signatures.h"
-#include "taler-exchange-secmod-eddsa.h"
+#include "secmod_eddsa.h"
 #include <poll.h>
 #include "crypto_helper_common.h"
 
diff --git a/src/util/crypto_helper_rsa.c b/src/util/crypto_helper_rsa.c
index df14c9100..b99d468ad 100644
--- a/src/util/crypto_helper_rsa.c
+++ b/src/util/crypto_helper_rsa.c
@@ -22,7 +22,7 @@
 #include "taler_util.h"
 #include "taler_signatures.h"
 #include "crypto_helper_common.h"
-#include "taler-exchange-secmod-rsa.h"
+#include "secmod_rsa.h"
 #include <poll.h>
 
 
diff --git a/src/util/secmod_cs.c b/src/util/secmod_cs.c
index 54a5789e6..7a7d29846 100644
--- a/src/util/secmod_cs.c
+++ b/src/util/secmod_cs.c
@@ -33,7 +33,7 @@
  */
 #include "platform.h"
 #include "taler_util.h"
-#include "taler-exchange-secmod-cs.h"
+#include "secmod_cs.h"
 #include <gcrypt.h>
 #include <pthread.h>
 #include <sys/eventfd.h>
diff --git a/src/util/taler-exchange-secmod-cs.h b/src/util/secmod_cs.h
index 0321335da..0321335da 100644
--- a/src/util/taler-exchange-secmod-cs.h
+++ b/src/util/secmod_cs.h
diff --git a/src/util/secmod_eddsa.c b/src/util/secmod_eddsa.c
index 9661534a8..4e01e3c9a 100644
--- a/src/util/secmod_eddsa.c
+++ b/src/util/secmod_eddsa.c
@@ -34,7 +34,7 @@
  */
 #include "platform.h"
 #include "taler_util.h"
-#include "taler-exchange-secmod-eddsa.h"
+#include "secmod_eddsa.h"
 #include <gcrypt.h>
 #include <pthread.h>
 #include "taler_error_codes.h"
diff --git a/src/util/taler-exchange-secmod-eddsa.h b/src/util/secmod_eddsa.h
index c05d90a6c..c05d90a6c 100644
--- a/src/util/taler-exchange-secmod-eddsa.h
+++ b/src/util/secmod_eddsa.h
diff --git a/src/util/secmod_rsa.c b/src/util/secmod_rsa.c
index 4217cbb33..db8ae9512 100644
--- a/src/util/secmod_rsa.c
+++ b/src/util/secmod_rsa.c
@@ -33,7 +33,7 @@
  */
 #include "platform.h"
 #include "taler_util.h"
-#include "taler-exchange-secmod-rsa.h"
+#include "secmod_rsa.h"
 #include <gcrypt.h>
 #include <pthread.h>
 #include "taler_error_codes.h"
diff --git a/src/util/taler-exchange-secmod-rsa.h b/src/util/secmod_rsa.h
index ffbceb48e..ffbceb48e 100644
--- a/src/util/taler-exchange-secmod-rsa.h
+++ b/src/util/secmod_rsa.h