From: Guus Sliepen <guus@tinc-vpn.org>
Date: Sat, 16 Apr 2016 23:13:56 +0000 (+0200)
Subject: Move some stray #includes.
X-Git-Tag: release-1.1pre12~18
X-Git-Url: https://tinc-vpn.org/git/browse?p=tinc;a=commitdiff_plain;h=03878f12150cbdb1aeb43e207404a0929a35ff13

Move some stray #includes.
---

diff --git a/src/conf.h b/src/conf.h
index 4f39b20a..2478c585 100644
--- a/src/conf.h
+++ b/src/conf.h
@@ -21,8 +21,9 @@
 #ifndef __TINC_CONF_H__
 #define __TINC_CONF_H__
 
-#include "splay_tree.h"
 #include "list.h"
+#include "splay_tree.h"
+#include "subnet.h"
 
 typedef struct config_t {
 	char *variable;
@@ -31,7 +32,6 @@ typedef struct config_t {
 	int line;
 } config_t;
 
-#include "subnet.h"
 
 extern splay_tree_t *config_tree;
 
diff --git a/src/subnet.h b/src/subnet.h
index 9fd95b64..6184e6b7 100644
--- a/src/subnet.h
+++ b/src/subnet.h
@@ -22,6 +22,7 @@
 #define __TINC_SUBNET_H__
 
 #include "net.h"
+#include "node.h"
 
 typedef enum subnet_type_t {
 	SUBNET_MAC = 0,
@@ -44,8 +45,6 @@ typedef struct subnet_ipv6_t {
 	int prefixlength;
 } subnet_ipv6_t;
 
-#include "node.h"
-
 typedef struct subnet_t {
 	struct node_t *owner;   /* the owner of this subnet */