From: Aki Tuomi <aki.tuomi@dovecot.fi>
Date: Tue, 1 Nov 2016 12:40:49 +0000 (+0200)
Subject: director: Code cleanup - Reorder includes
X-Git-Tag: 2.3.0.rc1~2667
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=33d70dcbb6bf10fd47aa62f29ca8e5f92d116ae4;p=thirdparty%2Fdovecot%2Fcore.git

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 65cc851f23..ea1818b97e 100644
--- 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 24d5c24f71..bf1eb88e91 100644
--- 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 c1bcee1a61..c0e4412285 100644
--- 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 eedf1ca0ac..493940c53a 100644
--- 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 4f00d19d72..f05ad67fcd 100644
--- 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 8856650588..538c29cbf8 100644
--- 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