cosmetics with redundant #includes

4 files changed, 4 insertions, 24 deletions

diff --git a/src/backend/Makefile.am b/src/backend/Makefile.am
index d9f988a8..a99fab99 100644
--- a/src/backend/Makefile.am
+++ b/src/backend/Makefile.am
@@ -14,17 +14,10 @@ taler_merchant_httpd_SOURCES = \
   taler-merchant-httpd_contract.c taler-merchant-httpd_contract.h \
   taler-merchant-httpd_pay.c taler-merchant-httpd_pay.h
 
-
 taler_merchant_httpd_LDADD = \
-  $(LIBGCRYPT_LIBS) \
+  $(top_srcdir)/src/backenddb/libtalermerchantdb.la \
+  -ltalermint \
   -ltalerutil \
   -lmicrohttpd \
   -ljansson \
-  -lcurl \
-  -lgnunetutil \
-  $(top_srcdir)/src/backenddb/libtalermerchantdb.la \
-  -ltalermint \
-  -ltalerpq \
-  -lgnunetpostgres \
-  -lpq \
-  -lpthread
+  -lgnunetutil
diff --git a/src/backend/taler-merchant-httpd.c b/src/backend/taler-merchant-httpd.c
index df6bba35..ffa81a7d 100644
--- a/src/backend/taler-merchant-httpd.c
+++ b/src/backend/taler-merchant-httpd.c
@@ -13,7 +13,6 @@
   You should have received a copy of the GNU General Public License along with
   TALER; see the file COPYING.  If not, If not, see <http://www.gnu.org/licenses/>
 */
-
 /**
  * @file merchant/backend/taler-merchant-httpd.c
  * @brief HTTP serving layer intended to perform crypto-work and
@@ -25,7 +24,6 @@
 #include <microhttpd.h>
 #include <jansson.h>
 #include <gnunet/gnunet_util_lib.h>
-#include <curl/curl.h>
 #include <taler/taler_util.h>
 #include <taler/taler_mint_service.h>
 #include "taler-merchant-httpd_parsing.h"
diff --git a/src/backend/taler-merchant-httpd_mhd.c b/src/backend/taler-merchant-httpd_mhd.c
index 7b47bc9d..6fd18d9c 100644
--- a/src/backend/taler-merchant-httpd_mhd.c
+++ b/src/backend/taler-merchant-httpd_mhd.c
@@ -1,6 +1,6 @@
 /*
   This file is part of TALER
-  Copyright (C) 2014 GNUnet e.V.
+  Copyright (C) 2014, 2015 GNUnet e.V.
 
   TALER is free software; you can redistribute it and/or modify it under the
   terms of the GNU Affero General Public License as published by the Free Software
@@ -13,7 +13,6 @@
   You should have received a copy of the GNU Affero General Public License along with
   TALER; see the file COPYING.  If not, If not, see <http://www.gnu.org/licenses/>
 */
-
 /**
  * @file taler-merchant-httpd_mhd.c
  * @brief helpers for MHD interaction; these are TALER_MINT_handler_ functions
@@ -24,12 +23,7 @@
  * @author Christian Grothoff
  */
 #include "platform.h"
-#include <gnunet/gnunet_util_lib.h>
 #include <jansson.h>
-#include <microhttpd.h>
-#include <pthread.h>
-#include "taler-merchant-httpd_responses.h"
-#include "taler-merchant-httpd.h"
 #include "taler-merchant-httpd_mhd.h"
 #include "taler-merchant-httpd_responses.h"
 
diff --git a/src/backend/taler-merchant-httpd_pay.c b/src/backend/taler-merchant-httpd_pay.c
index 167fde86..9397a663 100644
--- a/src/backend/taler-merchant-httpd_pay.c
+++ b/src/backend/taler-merchant-httpd_pay.c
@@ -19,19 +19,14 @@
  * @author Marcello Stanisci
  */
 #include "platform.h"
-#include <microhttpd.h>
 #include <jansson.h>
 #include <gnunet/gnunet_util_lib.h>
-#include <curl/curl.h>
 #include <taler/taler_signatures.h>
-#include <taler/taler_amount_lib.h>
 #include <taler/taler_json_lib.h>
 #include <taler/taler_mint_service.h>
 #include "taler-merchant-httpd.h"
-#include "taler-merchant-httpd.h"
 #include "taler-merchant-httpd_parsing.h"
 #include "taler-merchant-httpd_responses.h"
-#include "taler-merchant-httpd_mhd.h"
 #include "taler-merchant-httpd_mints.h"
 #include "taler_merchantdb_lib.h"