global: Remove var-expand.h from some places

diff --git a/src/auth/auth-request.c b/src/auth/auth-request.c
index 33d64b368777c98e9453465d6223b0a0f556f38b..93cd31c3e1c784445e6eb470811523b7c57d80d3 100644 (file)
--- a/src/auth/auth-request.c
+++ b/src/auth/auth-request.c
@@ -11,7 +11,6 @@
 #include "safe-memset.h"
 #include "str-sanitize.h"
 #include "strescape.h"
-#include "var-expand.h"
 #include "dns-lookup.h"
 #include "hostpid.h"
 #include "settings.h"

diff --git a/src/auth/userdb-static.c b/src/auth/userdb-static.c
index e6163137184836a193c2dd4557ac77dfb7348932..d95089eac862315b0b5a79cd2430fa2c4b7ae75c 100644 (file)
--- a/src/auth/userdb-static.c
+++ b/src/auth/userdb-static.c
@@ -4,7 +4,6 @@
 
 #include "array.h"
 #include "str.h"
-#include "var-expand.h"
 #include "userdb.h"
 #include "userdb-template.h"
 #include "settings.h"

diff --git a/src/doveadm/doveadm-settings.c b/src/doveadm/doveadm-settings.c
index 90569750315db315362506d0ffd753390f4c9219..773883a78ee26c4103686f59689d502bf7f137bd 100644 (file)
--- a/src/doveadm/doveadm-settings.c
+++ b/src/doveadm/doveadm-settings.c
@@ -2,7 +2,6 @@
 
 #include "lib.h"
 #include "array.h"
-#include "var-expand.h"
 #include "settings.h"
 #include "service-settings.h"
 #include "mail-storage-settings.h"

diff --git a/src/imap-urlauth/imap-urlauth-client.c b/src/imap-urlauth/imap-urlauth-client.c
index b5144a396410180891f647ff64fee94b812daae9..42719bdfe6c2a06667a0bd2086f953ce3bcc4869 100644 (file)
--- a/src/imap-urlauth/imap-urlauth-client.c
+++ b/src/imap-urlauth/imap-urlauth-client.c
@@ -12,7 +12,6 @@
 #include "hostpid.h"
 #include "execv-const.h"
 #include "env-util.h"
-#include "var-expand.h"
 #include "settings.h"
 #include "restrict-access.h"
 #include "master-service.h"

diff --git a/src/imap-urlauth/imap-urlauth-worker.c b/src/imap-urlauth/imap-urlauth-worker.c
index 012e33accf2cd809438d5a88be94808804337c43..79b14d83d3e9c3d73ca660fa19878ea78318980d 100644 (file)
--- a/src/imap-urlauth/imap-urlauth-worker.c
+++ b/src/imap-urlauth/imap-urlauth-worker.c
@@ -13,7 +13,6 @@
 #include "strescape.h"
 #include "llist.h"
 #include "hostpid.h"
-#include "var-expand.h"
 #include "process-title.h"
 #include "randgen.h"
 #include "restrict-access.h"

diff --git a/src/imap-urlauth/imap-urlauth.c b/src/imap-urlauth/imap-urlauth.c
index 8bd98464f4a6c8b268de1e59391b4190c187973a..4d8b9e2e37b1ef21d8f70ee288c24aa51495fa63 100644 (file)
--- a/src/imap-urlauth/imap-urlauth.c
+++ b/src/imap-urlauth/imap-urlauth.c
@@ -60,7 +60,6 @@ The imap-urlauth service thus consists of three separate stages:
 #include "master-service-settings.h"
 #include "login-server.h"
 #include "master-interface.h"
-#include "var-expand.h"
 
 #include <stdio.h>
 #include <unistd.h>

diff --git a/src/lib-imap-urlauth/imap-urlauth.c b/src/lib-imap-urlauth/imap-urlauth.c
index 5a45e20304f1f5ab76167e11ed0a291b4eb66a94..3cdcc21bb6b0029538d3d588a444d7570fcbf1fc 100644 (file)
--- a/src/lib-imap-urlauth/imap-urlauth.c
+++ b/src/lib-imap-urlauth/imap-urlauth.c
@@ -2,7 +2,6 @@
 
 #include "lib.h"
 #include "hostpid.h"
-#include "var-expand.h"
 #include "hmac.h"
 #include "sha1.h"
 #include "randgen.h"

diff --git a/src/lib-oauth2/oauth2-jwt.c b/src/lib-oauth2/oauth2-jwt.c
index b45b57e3be12ba598e0bf308317eafea558769e1..61922832925087d6791d59022824bd644e1a9b92 100644 (file)
--- a/src/lib-oauth2/oauth2-jwt.c
+++ b/src/lib-oauth2/oauth2-jwt.c
@@ -14,7 +14,6 @@
 #include "base64.h"
 #include "str-sanitize.h"
 #include "dcrypt.h"
-#include "var-expand.h"
 #include "oauth2.h"
 #include "oauth2-private.h"
 #include "dict.h"

diff --git a/src/lib-storage/mail-lua.c b/src/lib-storage/mail-lua.c
index a559f98ab82a3c41969c860cb34a4a94b72005a5..ff7ae45ed24ab8dfdfc53d994b7da82debb2bb79 100644 (file)
--- a/src/lib-storage/mail-lua.c
+++ b/src/lib-storage/mail-lua.c
@@ -4,7 +4,6 @@
 #include "str.h"
 #include "istream.h"
 #include "array.h"
-#include "var-expand.h"
 #include "dlua-script.h"
 #include "dlua-script-private.h"
 #include "mail-storage.h"

diff --git a/src/lib-storage/mail-storage-lua.c b/src/lib-storage/mail-storage-lua.c
index 583a9a335efe819c00ff5eeeecd87d0dc47f0b01..b1ec6563fe228eed7b639b8fed96f4ff459163f1 100644 (file)
--- a/src/lib-storage/mail-storage-lua.c
+++ b/src/lib-storage/mail-storage-lua.c
@@ -4,7 +4,6 @@
 #include "str.h"
 #include "istream.h"
 #include "array.h"
-#include "var-expand.h"
 #include "dlua-script.h"
 #include "dlua-script-private.h"
 #include "mail-storage.h"

diff --git a/src/lmtp/lmtp-client.c b/src/lmtp/lmtp-client.c
index ffc9969ee8c36626489b7f9f3e31d94486056f38..9d56a9cc8d45c46ae75671caea2aa9b1f5a034d0 100644 (file)
--- a/src/lmtp/lmtp-client.c
+++ b/src/lmtp/lmtp-client.c
@@ -9,7 +9,6 @@
 #include "ostream.h"
 #include "hostpid.h"
 #include "process-title.h"
-#include "var-expand.h"
 #include "module-dir.h"
 #include "settings.h"
 #include "master-service-ssl.h"

diff --git a/src/lmtp/lmtp-local.c b/src/lmtp/lmtp-local.c
index e7d0cfbb1ed86eceaf8228b3557f4e847480bf60..b079434cb1fb2e1c5238f371b5678e702bb3ad90 100644 (file)
--- a/src/lmtp/lmtp-local.c
+++ b/src/lmtp/lmtp-local.c
@@ -7,7 +7,6 @@
 #include "strescape.h"
 #include "time-util.h"
 #include "hostpid.h"
-#include "var-expand.h"
 #include "restrict-access.h"
 #include "anvil-client.h"
 #include "settings.h"

diff --git a/src/lmtp/lmtp-settings.c b/src/lmtp/lmtp-settings.c
index b3754a78535260cb420508779ef20c217ee8cc51..098cbfde46dfe1b4ba579e2424b310985ad1b387 100644 (file)
--- a/src/lmtp/lmtp-settings.c
+++ b/src/lmtp/lmtp-settings.c
@@ -2,7 +2,6 @@
 
 #include "lib.h"
 #include "buffer.h"
-#include "var-expand.h"
 #include "settings-parser.h"
 #include "service-settings.h"
 #include "master-service.h"

diff --git a/src/plugins/mail-crypt/mail-crypt-acl-plugin.c b/src/plugins/mail-crypt/mail-crypt-acl-plugin.c
index b5b9c9eff2ca9d69c7a82441c9538ca580a4a77f..53403d1b1c2f07ca587c186205e2325c38a762ff 100644 (file)
--- a/src/plugins/mail-crypt/mail-crypt-acl-plugin.c
+++ b/src/plugins/mail-crypt/mail-crypt-acl-plugin.c
@@ -5,7 +5,6 @@
 #include "str.h"
 #include "sha2.h"
 #include "module-dir.h"
-#include "var-expand.h"
 #include "hex-binary.h"
 #include "settings.h"
 #include "mail-namespace.h"

diff --git a/src/plugins/mail-crypt/mail-crypt-key.c b/src/plugins/mail-crypt/mail-crypt-key.c
index 74fa56b10a0ca4b80175e5622a6917def47f6f67..dca8a246458090f1b045a86c3d5465024cae6b01 100644 (file)
--- a/src/plugins/mail-crypt/mail-crypt-key.c
+++ b/src/plugins/mail-crypt/mail-crypt-key.c
@@ -4,7 +4,6 @@
 #include "str.h"
 #include "dict.h"
 #include "array.h"
-#include "var-expand.h"
 #include "settings.h"
 #include "mail-storage.h"
 #include "mailbox-attribute.h"

diff --git a/src/pop3/main.c b/src/pop3/main.c
index 7c3ac5a2d0166696f27909cb90affb50e346e80e..d65619cd8798f1bc3a760537ed4a346f7e16bcdb 100644 (file)
--- a/src/pop3/main.c
+++ b/src/pop3/main.c
@@ -17,7 +17,6 @@
 #include "login-server.h"
 #include "master-interface.h"
 #include "master-admin-client.h"
-#include "var-expand.h"
 #include "mail-error.h"
 #include "mail-user.h"
 #include "mail-namespace.h"

diff --git a/src/submission/main.c b/src/submission/main.c
index 601606d525c0e9aea8a9f0c3975e22a81215eda9..42776a87df9de3db2d31d3561fb6b78edd53fa55 100644 (file)
--- a/src/submission/main.c
+++ b/src/submission/main.c
@@ -19,7 +19,6 @@
 #include "master-service-settings.h"
 #include "master-interface.h"
 #include "master-admin-client.h"
-#include "var-expand.h"
 #include "mail-error.h"
 #include "mail-user.h"
 #include "mailbox-attribute.h"