try to solve include madness

diff --git a/src/include/gnunet_dnsparser_lib.h b/src/include/gnunet_dnsparser_lib.h
index fa4915be7316ca3867703c683f392a7692f1661a..ba1392510ede2b8f478c2a101b72dfaefe46a025 100644 (file)
--- a/src/include/gnunet_dnsparser_lib.h
+++ b/src/include/gnunet_dnsparser_lib.h
@@ -31,7 +31,6 @@
 #define GNUNET_DNSPARSER_LIB_H
 
 #include "gnunet_util_lib.h"
-#include "gnunet_tun_lib.h"
 
 /**
  * Maximum length of a label in DNS.

diff --git a/src/include/gnunet_dnsstub_lib.h b/src/include/gnunet_dnsstub_lib.h
index 8f1b90425aebfa8ab5c631d0695e0cb53771c0ff..ad44be846e3992e70bfea2471d7669147482fe50 100644 (file)
--- a/src/include/gnunet_dnsstub_lib.h
+++ b/src/include/gnunet_dnsstub_lib.h
@@ -29,8 +29,7 @@
 #ifndef GNUNET_DNSSTUB_LIB_H
 #define GNUNET_DNSSTUB_LIB_H
 
-#include "gnunet_common.h"
-#include "gnunet_tun_lib.h"
+#include "gnunet_util_lib.h"
 
 /**
  * Opaque handle to the stub resolver.

diff --git a/src/include/gnunet_tun_lib.h b/src/include/gnunet_tun_lib.h
index a2e75eb5ff6bd1e048b6b8842e382a8cf291eda3..8de62714191540ba5ab2e9145b3e627320d36b31 100644 (file)
--- a/src/include/gnunet_tun_lib.h
+++ b/src/include/gnunet_tun_lib.h
@@ -30,7 +30,8 @@
 #ifndef GNUNET_TUN_LIB_H
 #define GNUNET_TUN_LIB_H
 
-#include "gnunet_util_lib.h"
+#include "gnunet_common.h"
+#include "gnunet_crypto_lib.h"
 
 
 /* see http://www.iana.org/assignments/ethernet-numbers */

diff --git a/src/include/gnunet_util_lib.h b/src/include/gnunet_util_lib.h
index 5e8eef1ad94270119241209266802e8a2698bb5e..091d3ba58d52ec1d750086f206fb9fe2e94da9f5 100644 (file)
--- a/src/include/gnunet_util_lib.h
+++ b/src/include/gnunet_util_lib.h
@@ -78,6 +78,9 @@ extern "C"
 #include "gnunet_service_lib.h"
 #include "gnunet_signal_lib.h"
 #include "gnunet_strings_lib.h"
+#include "gnunet_tun_lib.h"
+#include "gnunet_dnsstub_lib.h"
+#include "gnunet_dnsparser_lib.h"
 
 #if 0                           /* keep Emacsens' auto-indent happy */
 {

diff --git a/src/util/dnsparser.c b/src/util/dnsparser.c
index e8aacd3d74406b4c30175e312e81578b1af3c573..cce68f2ee8bbfd1957f768730ec6c39b13e0ba32 100644 (file)
--- a/src/util/dnsparser.c
+++ b/src/util/dnsparser.c
@@ -28,8 +28,6 @@
 #include <idn-free.h>
 #endif
 #include "gnunet_util_lib.h"
-#include "gnunet_dnsparser_lib.h"
-#include "gnunet_tun_lib.h"
 
 
 /**

diff --git a/src/util/dnsstub.c b/src/util/dnsstub.c
index 969ff7beba5360aaac7169546d7d566bd276b52d..8b5b20f3c8b23f8f0d96f0c402bf7c9967e28f3a 100644 (file)
--- a/src/util/dnsstub.c
+++ b/src/util/dnsstub.c
@@ -22,8 +22,6 @@
  */
 #include "platform.h"
 #include "gnunet_util_lib.h"
-#include "gnunet_tun_lib.h"
-#include "gnunet_dnsstub_lib.h"
 
 /**
  * Timeout for retrying DNS queries.