From: Stephan Bosch <stephan.bosch@dovecot.fi>
Date: Sat, 3 Nov 2018 11:45:19 +0000 (+0100)
Subject: lmtp: Make lmtp-common.h the primary include.
X-Git-Tag: 2.3.9~999
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=93a96d3f9211bc36b03592b1a472632157ddb58a;p=thirdparty%2Fdovecot%2Fcore.git

lmtp: Make lmtp-common.h the primary include.

This better matches other services.
---

diff --git a/src/lmtp/client.c b/src/lmtp/client.c
index 76d67f27c2..1d12b22255 100644
--- a/src/lmtp/client.c
+++ b/src/lmtp/client.c
@@ -1,7 +1,6 @@
 /* Copyright (c) 2009-2018 Dovecot authors, see the included COPYING file */
 
-#include "lib.h"
-#include "array.h"
+#include "lmtp-common.h"
 #include "base64.h"
 #include "str.h"
 #include "llist.h"
@@ -11,9 +10,6 @@
 #include "hostpid.h"
 #include "process-title.h"
 #include "var-expand.h"
-#include "settings-parser.h"
-#include "smtp-server.h"
-#include "master-service.h"
 #include "master-service-ssl.h"
 #include "master-service-settings.h"
 #include "iostream-ssl.h"
@@ -21,13 +17,10 @@
 #include "mail-storage.h"
 #include "mail-storage-service.h"
 #include "raw-storage.h"
-#include "lmtp-common.h"
 #include "lda-settings.h"
-#include "lmtp-settings.h"
 #include "lmtp-local.h"
 #include "lmtp-proxy.h"
 #include "commands.h"
-#include "client.h"
 
 #include <unistd.h>
 
diff --git a/src/lmtp/commands.c b/src/lmtp/commands.c
index cbcafdcef1..dad5b8adec 100644
--- a/src/lmtp/commands.c
+++ b/src/lmtp/commands.c
@@ -1,7 +1,6 @@
 /* Copyright (c) 2009-2018 Dovecot authors, see the included COPYING file */
 
-#include "lib.h"
-#include "array.h"
+#include "lmtp-common.h"
 #include "str.h"
 #include "istream.h"
 #include "istream-concat.h"
@@ -11,15 +10,11 @@
 #include "settings-parser.h"
 #include "lda-settings.h"
 #include "mail-user.h"
-#include "lmtp-settings.h"
 #include "smtp-address.h"
-#include "smtp-server.h"
 #include "lmtp-proxy.h"
 #include "lmtp-local.h"
 #include "mail-deliver.h"
 #include "mail-error.h"
-#include "lmtp-common.h"
-#include "client.h"
 #include "commands.h"
 
 /*
diff --git a/src/lmtp/lmtp-common.h b/src/lmtp/lmtp-common.h
index 90a7ed3dfe..73edf131d5 100644
--- a/src/lmtp/lmtp-common.h
+++ b/src/lmtp/lmtp-common.h
@@ -1,6 +1,16 @@
 #ifndef LMTP_COMMON_H
 #define LMTP_COMMON_H
 
+#include "lib.h"
+#include "array.h"
+#include "ioloop.h"
+#include "settings-parser.h"
+#include "master-service.h"
+#include "smtp-reply.h"
+#include "smtp-server.h"
+#include "client.h"
+#include "lmtp-settings.h"
+
 extern char *dns_client_socket_path, *base_dir;
 extern struct mail_storage_service_ctx *storage_service;
 extern struct anvil_client *anvil;
diff --git a/src/lmtp/lmtp-local.c b/src/lmtp/lmtp-local.c
index abcae8184b..828cf4ed08 100644
--- a/src/lmtp/lmtp-local.c
+++ b/src/lmtp/lmtp-local.c
@@ -1,14 +1,12 @@
 /* Copyright (c) 2009-2018 Dovecot authors, see the included COPYING file */
 
-#include "lib.h"
+#include "lmtp-common.h"
 #include "str.h"
 #include "istream.h"
 #include "strescape.h"
-#include "array.h"
 #include "time-util.h"
 #include "hostpid.h"
 #include "var-expand.h"
-#include "ioloop.h"
 #include "restrict-access.h"
 #include "anvil-client.h"
 #include "settings-parser.h"
@@ -18,17 +16,12 @@
 #include "mail-deliver.h"
 #include "mail-autoexpunge.h"
 #include "index/raw/raw-storage.h"
-#include "master-service.h"
 #include "smtp-common.h"
 #include "smtp-params.h"
 #include "smtp-address.h"
 #include "smtp-submit-settings.h"
-#include "smtp-server.h"
 #include "lda-settings.h"
 #include "lmtp-settings.h"
-#include "client.h"
-#include "lmtp-common.h"
-#include "lmtp-settings.h"
 #include "lmtp-recipient.h"
 #include "lmtp-local.h"
 
diff --git a/src/lmtp/lmtp-proxy.c b/src/lmtp/lmtp-proxy.c
index 3c4d87f47f..4479606862 100644
--- a/src/lmtp/lmtp-proxy.c
+++ b/src/lmtp/lmtp-proxy.c
@@ -1,8 +1,6 @@
 /* Copyright (c) 2009-2018 Dovecot authors, see the included COPYING file */
 
-#include "lib.h"
-#include "array.h"
-#include "ioloop.h"
+#include "lmtp-common.h"
 #include "istream.h"
 #include "istream-sized.h"
 #include "ostream.h"
@@ -12,19 +10,13 @@
 #include "smtp-common.h"
 #include "smtp-params.h"
 #include "smtp-address.h"
-#include "smtp-server.h"
 #include "smtp-client.h"
 #include "smtp-client-connection.h"
 #include "smtp-client-transaction.h"
 #include "auth-master.h"
-#include "settings-parser.h"
-#include "master-service.h"
 #include "master-service-ssl-settings.h"
 #include "mail-storage-service.h"
 #include "lda-settings.h"
-#include "client.h"
-#include "lmtp-common.h"
-#include "lmtp-settings.h"
 #include "lmtp-recipient.h"
 #include "lmtp-proxy.h"
 
diff --git a/src/lmtp/main.c b/src/lmtp/main.c
index 50666707c8..e25e8bc7c0 100644
--- a/src/lmtp/main.c
+++ b/src/lmtp/main.c
@@ -1,7 +1,6 @@
 /* Copyright (c) 2002-2018 Dovecot authors, see the included COPYING file */
 
-#include "lib.h"
-#include "array.h"
+#include "lmtp-common.h"
 #include "ioloop.h"
 #include "hostpid.h"
 #include "path-util.h"
@@ -14,9 +13,7 @@
 #include "mail-storage-service.h"
 #include "smtp-submit-settings.h"
 #include "lda-settings.h"
-#include "lmtp-settings.h"
 #include "client.h"
-#include "lmtp-common.h"
 
 #include <unistd.h>