try to solve include madness

6 files changed, 6 insertions, 8 deletions

diff --git a/src/include/gnunet_dnsparser_lib.h b/src/include/gnunet_dnsparser_lib.h
index fa4915be7..ba1392510 100644
--- 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 8f1b90425..ad44be846 100644
--- 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 a2e75eb5f..8de627141 100644
--- 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 5e8eef1ad..091d3ba58 100644
--- 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 e8aacd3d7..cce68f2ee 100644
--- 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 969ff7beb..8b5b20f3c 100644
--- 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.