director: Code cleanup - Reorder includes

This is required to enable typedef of
user_free_hook

diff --git a/src/director/director-connection.c b/src/director/director-connection.c
index 65cc851f23707a0141842d00235e46da8c2acc8f..ea1818b97efc90a76a6fa39555b8e794a4a68126 100644 (file)
--- a/src/director/director-connection.c
+++ b/src/director/director-connection.c
@@ -42,7 +42,6 @@
 #include "director.h"
 #include "director-host.h"
 #include "director-request.h"
-#include "user-directory.h"
 #include "director-connection.h"
 
 #include <unistd.h>

diff --git a/src/director/director-request.c b/src/director/director-request.c
index 24d5c24f719c3c5e83582a38fd1c3e732a011219..bf1eb88e91ffc2dae51174ff9522f9514c9c2986 100644 (file)
--- a/src/director/director-request.c
+++ b/src/director/director-request.c
@@ -5,7 +5,6 @@
 #include "array.h"
 #include "str.h"
 #include "mail-host.h"
-#include "user-directory.h"
 #include "director.h"
 #include "director-request.h"
 

diff --git a/src/director/mail-host.h b/src/director/mail-host.h
index c1bcee1a611fa2fe96104dc1bb351449ad73f3b9..c0e441228576d07ccfb3b455aba580eefa9dcd19 100644 (file)
--- a/src/director/mail-host.h
+++ b/src/director/mail-host.h
@@ -2,6 +2,7 @@
 #define MAIL_HOST_H
 
 #include "net.h"
+#include "user-directory.h"
 
 struct mail_host_list;
 

diff --git a/src/director/notify-connection.c b/src/director/notify-connection.c
index eedf1ca0ac13aadd41d996023b99bd77f7be1621..493940c53a333eeed83a60acfbba157a8c9a275d 100644 (file)
--- a/src/director/notify-connection.c
+++ b/src/director/notify-connection.c
@@ -5,7 +5,7 @@
 #include "istream.h"
 #include "master-service.h"
 #include "director.h"
-#include "user-directory.h"
+#include "mail-host.h"
 #include "notify-connection.h"
 
 #include <unistd.h>

diff --git a/src/director/test-user-directory.c b/src/director/test-user-directory.c
index 4f00d19d7229d83a9d1369f4bd9b2c814a50e739..f05ad67fcd78dfa94210b2f255db03644cc98721 100644 (file)
--- a/src/director/test-user-directory.c
+++ b/src/director/test-user-directory.c
@@ -4,7 +4,6 @@
 #include "ioloop.h"
 #include "mail-user-hash.h"
 #include "mail-host.h"
-#include "user-directory.h"
 #include "test-common.h"
 
 

diff --git a/src/director/user-directory.c b/src/director/user-directory.c
index 8856650588e559b119ad63e162382a1586616c76..538c29cbf8ea65f6676c73b2ded4e82cfe18b386 100644 (file)
--- a/src/director/user-directory.c
+++ b/src/director/user-directory.c
@@ -6,7 +6,6 @@
 #include "hash.h"
 #include "llist.h"
 #include "mail-host.h"
-#include "user-directory.h"
 
 /* n% of timeout_secs */
 #define USER_NEAR_EXPIRING_PERCENTAGE 10