Move some stray #includes.

diff --git a/src/conf.h b/src/conf.h
index 4f39b20ac9133dcfd3fc03dd3598ee17012c4e4d..2478c585423f383955b9c50336b231c966d6a1a2 100644 (file)
--- 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 9fd95b6493b7c172e8ae736544b7fa2a886b7fc2..6184e6b77794639913731f14ec6a4b15b9e4952f 100644 (file)
--- 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 */