headeraches

diff --git a/Makefile.in b/Makefile.in
index d10975aced1a82bf071bc02fb72a7ee4218ba188..a51cc257eb00b63b120e8722ca8c24b046bec3ed 100644 (file)
--- a/Makefile.in
+++ b/Makefile.in
@@ -48,6 +48,7 @@ LIBDNS_HEADERS        =       ldns/error.h            \
                        ldns/rr_functions.h     \
                        ldns/ldns.h             \
                        ldns/dns.h              \
+                       ldns/config.h           \
                        ldns/util.h
 PROG_SOURCES   =       mx.c chaos.c
 PROG_TARGETS   =       $(PROG_SOURCES:.c=)
@@ -153,7 +154,7 @@ realclean: clean docclean testclean libclean
        rm -f config.status
        rm -f config.log
        rm -f Makefile
-       rm -f config.h
+       rm -f ldns/config.h
        rm -f config.h.in
        rm -f configure
        rm -f config.sub

diff --git a/chaos.c b/chaos.c
index f06cf9c74375b36b7e6cebad0451c306bd2e1ce2..9a5bafcb2dd1dfc6276bbe0fe70c9ad610d4ed8f 100644 (file)
--- a/chaos.c
+++ b/chaos.c
@@ -6,8 +6,6 @@
  * Licensed under the GPL version 2
  */
 
-#include <stdio.h>
-#include <config.h>
 #include <ldns/ldns.h>
 
 int

diff --git a/configure.ac b/configure.ac
index 43c01b9015ae2edf18cbf77f5185a3754097886d..256a0128b87a54d442f539b435092ad9e027c6bd 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -215,5 +215,5 @@ time_t timegm (struct tm *tm);
 
 AC_CONFIG_FILES([Makefile 
                  ])
-AC_CONFIG_HEADER([config.h])
+AC_CONFIG_HEADER([ldns/config.h])
 AC_OUTPUT

diff --git a/dname.c b/dname.c
index dceb14648b1e95b2c4a1a0b8e21b381338ff7d45..1e0b1307f4f65ebcb363e075eea8f559ad4acc60 100644 (file)
--- a/dname.c
+++ b/dname.c
@@ -11,14 +11,8 @@
  * See the file LICENSE for the license
  */
 
-#include <config.h>
-
-#include <ldns/rdata.h>
-#include <ldns/error.h>
-#include <ldns/str2host.h>
 #include <ldns/dns.h>
 
-#include "ldns/util.h"
 #include <netinet/in.h>
 #include <sys/socket.h>
 #include <netdb.h>

diff --git a/dnssec.c b/dnssec.c
index 65367d669e70e9350607e716cdc467127171146c..216ff6c8790ab8ff8abb6e3368ffc21c2478a743 100644 (file)
--- a/dnssec.c
+++ b/dnssec.c
@@ -10,8 +10,7 @@
  * See the file LICENSE for the license
  */
 
-#include <config.h>
-#include <ldns/ldns.h>
+#include <ldns/dns.h>
 
 #include <strings.h>
 

diff --git a/higher.c b/higher.c
index 4984c9023b1860bc9b2d7b357b6d1053035e2a3c..dd68ea7d898d70945abe8231ee864f91c4fade38 100644 (file)
--- a/higher.c
+++ b/higher.c
@@ -11,15 +11,10 @@
  * See the file LICENSE for the license
  */
 
-#include <config.h>
-#include <openssl/ssl.h>
-#include <openssl/sha.h>
-#include <ldns/higher.h>
-#include <ldns/parse.h>
-#include <ldns/resolver.h>
 #include <ldns/dns.h>
 
-#include "ldns/util.h"
+#include <openssl/ssl.h>
+#include <openssl/sha.h>
 
 ldns_rr_list *
 ldns_get_rr_list_addr_by_name(ldns_resolver *res, ldns_rdf *name, ldns_rr_class c, 

diff --git a/host2str.c b/host2str.c
index 2f4c811f1d29b5aa669f30fc6be8b8eed0ce2737..4f864307d921e03cde2817ddcbd739e78d6e5dae 100644 (file)
--- a/host2str.c
+++ b/host2str.c
@@ -10,7 +10,7 @@
  *
  * See the file LICENSE for the license
  */
-#include <config.h>
+#include <ldns/dns.h>
 
 #include <limits.h>
 
@@ -19,13 +19,6 @@
 #include <netdb.h>
 #include <time.h>
 
-#include <ldns/host2str.h>
-#include <ldns/packet.h>
-#include <ldns/wire2host.h>
-#include <ldns/dns.h>
-
-#include <ldns/util.h>
-
 /* lookup tables for standard DNS stuff  */
 
 /* Taken from RFC 2538, section 2.1.  */

diff --git a/keys.c b/keys.c
index c4b19e7046e28713a9ec54b3aa4c7c2f5ec09046..4aac413d80da9421fbf049650571aa3cc3a90949 100644 (file)
--- a/keys.c
+++ b/keys.c
@@ -6,12 +6,10 @@
  * handling
  */
 
-#include <config.h>
+#include <ldns/dns.h>
+
 #include <openssl/ssl.h>
 
-#include <ldns/util.h>
-#include <ldns/dnssec.h>
-#include <ldns/keys.h>
 
 ldns_lookup_table ldns_signing_algorithms[] = {
         { LDNS_SIGN_RSAMD5, "RSAMD5" },

diff --git a/ldns/dns.h b/ldns/dns.h
index 5b5ae2e2651c5d295d858affd32c08f950691089..e25cc82d2acc22003695425055b993f8bf84a628 100644 (file)
--- a/ldns/dns.h
+++ b/ldns/dns.h
@@ -11,6 +11,7 @@
 #ifndef _DNS_H_
 #define _DNS_H_
 
+#include <ldns/config.h>
 #include <ldns/util.h>
 #include <ldns/buffer.h>
 #include <ldns/common.h>

diff --git a/net.c b/net.c
index 8a9d4b3f45c4eca62b926bb9f382016060dd7243..401c5787b2a22949ceab98637772b5374aa90f00 100644 (file)
--- a/net.c
+++ b/net.c
@@ -11,9 +11,7 @@
  * See the file LICENSE for the license
  */
 
-#include <config.h>
-
-#include <ldns/ldns.h>
+#include <ldns/dns.h>
 
 #include <netinet/in.h>
 #include <sys/socket.h>
@@ -22,8 +20,6 @@
 #include <sys/time.h>
 #include <errno.h>
 
-#include "ldns/util.h"
-
 ldns_status
 ldns_send(ldns_pkt **result, ldns_resolver *r, ldns_pkt *query_pkt)
 {

diff --git a/parse.c b/parse.c
index e6115ac769011a981d3168379aeb98194d24083c..ddc7f5e6cd5463eb078c75b3722c6b9b3e831ed5 100644 (file)
--- a/parse.c
+++ b/parse.c
@@ -7,19 +7,12 @@
  * (c) NLnet Labs, 2005
  * See the file LICENSE for the license
  */
+#include <ldns/dns.h>
 
 
-#include <config.h>
-
 #include <limits.h>
 #include <strings.h>
 
-#include <ldns/parse.h>
-
-#include <ldns/rr.h>
-#include <ldns/dns.h>
-#include "ldns/util.h"
-
 ssize_t
 ldns_fget_keyword_data(FILE *f, const char *keyword, const char *k_del, char *data, 
                const char *d_del)

diff --git a/rdata.c b/rdata.c
index 421bd0ee90ec678a514ecef827f065aee786f45c..70fb825e7aaa63ec48884cb5cab95c44f2a3b3da 100644 (file)
--- a/rdata.c
+++ b/rdata.c
@@ -10,12 +10,10 @@
  * See the file LICENSE for the license
  */
 
-#include <config.h>
-
+#include <ldns/dns.h>
 #include <ldns/rdata.h>
 #include <ldns/error.h>
 #include <ldns/str2host.h>
-#include <ldns/dns.h>
 
 #include "ldns/util.h"
 #include <netinet/in.h>

diff --git a/resolver.c b/resolver.c
index 58ffa681c0169859c9eac64959a3d160147145ed..f07182b853260b5b7ef273b45d72dcd6f0020d43 100644 (file)
--- a/resolver.c
+++ b/resolver.c
@@ -10,15 +10,10 @@
  * See the file LICENSE for the license
  */
 
-#include <config.h>
-#include <stdio.h>
-
-#include <ldns/ldns.h>
+#include <ldns/dns.h>
 
 #include <strings.h>
 
-#include "ldns/util.h"
-
 /* Access function for reading 
  * and setting the different Resolver 
  * options

diff --git a/rr.c b/rr.c
index a92f2eceb952fce1a4aea2c3251954f92d42cc49..412377d29a9078b9c8a8b69ff8384d42d6500051 100644 (file)
--- a/rr.c
+++ b/rr.c
@@ -10,17 +10,9 @@
  * (c) NLnet Labs, 2004
  * See the file LICENSE for the license
  */
-
-#include <config.h>
-
-#include <limits.h>
-#include <strings.h>
-
-#include <ldns/rr.h>
 #include <ldns/dns.h>
-#include <ldns/buffer.h>
 
-#include "ldns/util.h"
+#include <strings.h>
 
 ldns_rr *
 ldns_rr_new(void)

diff --git a/rr_functions.c b/rr_functions.c
index f198837fd8894daefb79db7de64c5525bb8d92c6..25438d5ed85e5f90ee5cc86df68392f601ab8d28 100644 (file)
--- a/rr_functions.c
+++ b/rr_functions.c
@@ -12,17 +12,11 @@
  * first the read variant, then the write
  */
 
-#include <config.h>
+#include <ldns/dns.h>
 
 #include <limits.h>
 #include <strings.h>
 
-#include <ldns/rr.h>
-#include <ldns/dns.h>
-#include <ldns/rr_functions.h>
-
-#include "ldns/util.h"
-
 /**
  * return a specific rdf
  * \param[in] type type of RR

diff --git a/run-test0.c b/run-test0.c
index 21cb9cfbe78af7d8b57f531680350fc708808990..bcb4c40865ac74e54d83c29ae12857cb69846145 100644 (file)
--- a/run-test0.c
+++ b/run-test0.c
@@ -3,13 +3,8 @@
  *
  */
 
-#include <config.h>
-
-
 #include <ldns/ldns.h>
 
-#include "ldns/util.h"
-
 /*
        0xc2, 0xb4, 0x81, 0x80, 0x00, 0x01, 0x00, 0x01,
        0x00, 0x02, 0x00, 0x02, 0x03, 0x77, 0x77, 0x77,

diff --git a/run-test11.c b/run-test11.c
index 45e1b649a4b6e14806278d8c8998fe7eabce581d..d04b80f934bfabc7ad13eab9ca9fa368d3ac462b 100644 (file)
--- a/run-test11.c
+++ b/run-test11.c
@@ -6,9 +6,7 @@
  * Print the result
  */
 
-#include <config.h>
-#include <ldns/ldns.h>
-#include <ldns/dname.h>
+#include <ldns/dns.h>
 
 void
 print_usage(char *file)

diff --git a/run-test18.c b/run-test18.c
index 3fe05c43cc2795488a8e935458dad4ce19195f4e..a995aae3c8b4c8c90ecaefa0e6d7f5826347a84a 100644 (file)
--- a/run-test18.c
+++ b/run-test18.c
@@ -3,9 +3,8 @@
  * for a particulary domain
  */
 
+#include <ldns/dns.h>
 #include <stdio.h>
-#include <config.h>
-#include <ldns/ldns.h>
 
 int
 usage(FILE *fp, char *prog) {

diff --git a/run-test19.c b/run-test19.c
index c51de3096dee81dd8be37923b8bc422bdfe6ba08..84959e603fe70f65ab083e27498d3f447ebe660c 100644 (file)
--- a/run-test19.c
+++ b/run-test19.c
@@ -3,9 +3,8 @@
  * for a particulary domain
  */
 
+#include <ldns/dns.h>
 #include <stdio.h>
-#include <config.h>
-#include <ldns/ldns.h>
 
 int
 usage(FILE *fp, char *prog) {

diff --git a/run-test7.c b/run-test7.c
index 767862bce3a98d65167350ccbcb056166976e163..4302e0bd8e022125c258cd8b3186ea30cb51932d 100644 (file)
--- a/run-test7.c
+++ b/run-test7.c
@@ -6,7 +6,6 @@
  * Print the result
  */
 
-#include <config.h>
 #include <ldns/dns.h>
 
 void

diff --git a/str2host.c b/str2host.c
index 212b674385037ce93582ed6011998f3ec533ee84..0d862d4896e687a281d97941356eaf9e228dbd43 100644 (file)
--- a/str2host.c
+++ b/str2host.c
@@ -10,13 +10,7 @@
  *
  * See the file LICENSE for the license
  */
-#include <config.h>
-
-#include <ldns/str2host.h>
 #include <ldns/dns.h>
-#include <ldns/rdata.h>
-
-#include "ldns/util.h"
 
 #include <sys/types.h>
 #include <sys/socket.h>