From 4fbc8730101e3e49c09bba7acdac3a46ebd59632 Mon Sep 17 00:00:00 2001
From: =?utf8?q?Philipp=20T=C3=B6lke?= <toelke@in.tum.de>
Date: Tue, 3 Aug 2010 18:59:20 +0000
Subject: [PATCH] fixed the #includes

---
 src/vpn/gnunet-daemon-vpn.c        |  1 -
 src/vpn/gnunet-helper-hijack-dns.c | 14 ++------------
 src/vpn/gnunet-helper-vpn.c        | 20 ++------------------
 3 files changed, 4 insertions(+), 31 deletions(-)

diff --git a/src/vpn/gnunet-daemon-vpn.c b/src/vpn/gnunet-daemon-vpn.c
index 983335a10..aefdad6ca 100644
--- a/src/vpn/gnunet-daemon-vpn.c
+++ b/src/vpn/gnunet-daemon-vpn.c
@@ -33,7 +33,6 @@
 #include "gnunet_common.h"
 #include "gnunet_protocols.h"
 #include "gnunet_server_lib.h"
-/* #include "gnunet_template_service.h" */
 
 /**
  * Final status code.
diff --git a/src/vpn/gnunet-helper-hijack-dns.c b/src/vpn/gnunet-helper-hijack-dns.c
index 7add2cc3e..671223851 100644
--- a/src/vpn/gnunet-helper-hijack-dns.c
+++ b/src/vpn/gnunet-helper-hijack-dns.c
@@ -23,19 +23,9 @@
  * @brief
  * @author Philipp Tölke
  */
-#define _GNU_SOURCE
+#include <platform.h>
 
-#include <arpa/inet.h>
-
-#include <string.h>
-#include <sys/types.h>
-#include <sys/wait.h>
-#include <sys/stat.h>
-
-#include <stdlib.h>
-#include <stdio.h>
-#include <unistd.h>
-#include <gnunet_common.h>
+#include "gnunet_common.h"
 
 int fork_and_exec(char* file, char* cmd[]) {
 	pid_t pid = fork();
diff --git a/src/vpn/gnunet-helper-vpn.c b/src/vpn/gnunet-helper-vpn.c
index 6a6aaf9dc..00ac1b0ec 100644
--- a/src/vpn/gnunet-helper-vpn.c
+++ b/src/vpn/gnunet-helper-vpn.c
@@ -23,23 +23,7 @@
  * @brief
  * @author Philipp Tölke
  */
-#define _GNU_SOURCE
-#include <arpa/inet.h>
-#include <linux/if.h>
-#include <unistd.h>
-#include <stdlib.h>
-#include <fcntl.h>
-
-#include <sys/types.h>
-#include <sys/socket.h>
-#include <sys/ioctl.h>
-
-#include <string.h>
-
-#include <signal.h>
-
-#include <stdio.h>
-#include <unistd.h>
+#include <platform.h>
 
 #include "gnunet-vpn-tun.h"
 #include "gnunet_common.h"
@@ -53,7 +37,7 @@
 
 struct in6_ifreq {
     struct in6_addr ifr6_addr;
-    __u32 ifr6_prefixlen;
+    uint32_t ifr6_prefixlen;
     unsigned int ifr6_ifindex;
 };
 
-- 
2.25.1