diff --git a/src/lib-sieve/Makefile.am b/src/lib-sieve/Makefile.am
index 7fb2a4fa204a82fec823bf20188980852ac8e386..aba132bae375da55c5cb21e815aac342ede16d23 100644
--- a/src/lib-sieve/Makefile.am
+++ b/src/lib-sieve/Makefile.am
@@ -97,7 +97,7 @@ libdovecot_sieve_la_LIBADD = \
 	$(LIBDOVECOT)
 
 libdovecot_sieve_la_SOURCES = \
-	sieve-settings.c \
+	sieve-settings.old.c \
 	sieve-message.c \
 	sieve-smtp.c \
 	sieve-lexer.c \
@@ -144,7 +144,7 @@ headers = \
 	sieve-types.h \
 	sieve-common.h \
 	sieve-limits.h \
-	sieve-settings.h \
+	sieve-settings.old.h \
 	sieve-message.h \
 	sieve-smtp.h \
 	sieve-lexer.h \
diff --git a/src/lib-sieve/plugins/duplicate/ext-duplicate-common.c b/src/lib-sieve/plugins/duplicate/ext-duplicate-common.c
index 41262233b5a4502e146fc0a1ca29b3c695d0670d..c8fe7c3bb6d4730d40b014d7761d08f7dedceb52 100644
--- a/src/lib-sieve/plugins/duplicate/ext-duplicate-common.c
+++ b/src/lib-sieve/plugins/duplicate/ext-duplicate-common.c
@@ -9,7 +9,7 @@
 #include "array.h"
 
 #include "sieve-common.h"
-#include "sieve-settings.h"
+#include "sieve-settings.old.h"
 #include "sieve-error.h"
 #include "sieve-extensions.h"
 #include "sieve-message.h"
diff --git a/src/lib-sieve/plugins/editheader/ext-editheader-common.c b/src/lib-sieve/plugins/editheader/ext-editheader-common.c
index 58a9cb5173efc4fe0c626ba17bd9790c6273f40c..66f83e059879b214832ba95b2d69f4120ed5f962 100644
--- a/src/lib-sieve/plugins/editheader/ext-editheader-common.c
+++ b/src/lib-sieve/plugins/editheader/ext-editheader-common.c
@@ -9,7 +9,7 @@
 
 #include "sieve-common.h"
 #include "sieve-error.h"
-#include "sieve-settings.h"
+#include "sieve-settings.old.h"
 #include "sieve-extensions.h"
 
 #include "ext-editheader-limits.h"
diff --git a/src/lib-sieve/plugins/enotify/mailto/ntfy-mailto.c b/src/lib-sieve/plugins/enotify/mailto/ntfy-mailto.c
index 09440fe4561b134dd1aca1fc64c6538806b4caee..29ff02d00ac519bab9629b2b8db80bb809d33f27 100644
--- a/src/lib-sieve/plugins/enotify/mailto/ntfy-mailto.c
+++ b/src/lib-sieve/plugins/enotify/mailto/ntfy-mailto.c
@@ -33,7 +33,7 @@
 #include "sieve-address-source.h"
 #include "sieve-message.h"
 #include "sieve-smtp.h"
-#include "sieve-settings.h"
+#include "sieve-settings.old.h"
 
 #include "sieve-ext-enotify.h"
 
diff --git a/src/lib-sieve/plugins/include/ext-include-common.c b/src/lib-sieve/plugins/include/ext-include-common.c
index 79e684f3cc13baa1a5d84fd7a98da3f9f1fd56cf..911a1a72c245be11886bff47e827e2a359120347 100644
--- a/src/lib-sieve/plugins/include/ext-include-common.c
+++ b/src/lib-sieve/plugins/include/ext-include-common.c
@@ -7,7 +7,7 @@
 #include "home-expand.h"
 
 #include "sieve-common.h"
-#include "sieve-settings.h"
+#include "sieve-settings.old.h"
 #include "sieve-error.h"
 #include "sieve-script.h"
 #include "sieve-storage.h"
diff --git a/src/lib-sieve/plugins/spamvirustest/ext-spamvirustest-common.c b/src/lib-sieve/plugins/spamvirustest/ext-spamvirustest-common.c
index e6c43fa15d57dd4d9a61af329d9f321ef6974bbb..a8a47daa5ef41b057d07df4a2fa4582276f4bc32 100644
--- a/src/lib-sieve/plugins/spamvirustest/ext-spamvirustest-common.c
+++ b/src/lib-sieve/plugins/spamvirustest/ext-spamvirustest-common.c
@@ -6,7 +6,7 @@
 #include "mail-storage.h"
 
 #include "sieve-common.h"
-#include "sieve-settings.h"
+#include "sieve-settings.old.h"
 #include "sieve-error.h"
 #include "sieve-extensions.h"
 #include "sieve-message.h"
diff --git a/src/lib-sieve/plugins/subaddress/ext-subaddress.c b/src/lib-sieve/plugins/subaddress/ext-subaddress.c
index 85e6e9a946e4db9278e2a04db5257917c32bc11c..9b86b8e25ae3fdae962aa9259cef3f2dd90fe745 100644
--- a/src/lib-sieve/plugins/subaddress/ext-subaddress.c
+++ b/src/lib-sieve/plugins/subaddress/ext-subaddress.c
@@ -13,7 +13,7 @@
 
 #include "sieve-common.h"
 
-#include "sieve-settings.h"
+#include "sieve-settings.old.h"
 #include "sieve-code.h"
 #include "sieve-address.h"
 #include "sieve-extensions.h"
diff --git a/src/lib-sieve/plugins/vacation/ext-vacation-common.c b/src/lib-sieve/plugins/vacation/ext-vacation-common.c
index cb648ec3854142760e1f6a86a259857f740ae4cc..d4ac338a535a62d16d0bd9a2ddf23840f8813e13 100644
--- a/src/lib-sieve/plugins/vacation/ext-vacation-common.c
+++ b/src/lib-sieve/plugins/vacation/ext-vacation-common.c
@@ -5,7 +5,7 @@
 
 #include "sieve-common.h"
 #include "sieve-error.h"
-#include "sieve-settings.h"
+#include "sieve-settings.old.h"
 #include "sieve-extensions.h"
 
 #include "ext-vacation-common.h"
diff --git a/src/lib-sieve/plugins/variables/ext-variables-common.c b/src/lib-sieve/plugins/variables/ext-variables-common.c
index dab91448a15436eecb0ba1d9772b37d42b8e577c..aca892089477f21df544c3ac3c3b2d6b1071eb54 100644
--- a/src/lib-sieve/plugins/variables/ext-variables-common.c
+++ b/src/lib-sieve/plugins/variables/ext-variables-common.c
@@ -7,7 +7,7 @@
 #include "array.h"
 
 #include "sieve-common.h"
-#include "sieve-settings.h"
+#include "sieve-settings.old.h"
 
 #include "sieve-ast.h"
 #include "sieve-binary.h"
diff --git a/src/lib-sieve/plugins/vnd.dovecot/environment/ext-vnd-environment-items.c b/src/lib-sieve/plugins/vnd.dovecot/environment/ext-vnd-environment-items.c
index 43361b438391ce65f6f0da7b45f03294e0fc241c..51f4a8eae82fa1abc15f7a321200ef158f981c4d 100644
--- a/src/lib-sieve/plugins/vnd.dovecot/environment/ext-vnd-environment-items.c
+++ b/src/lib-sieve/plugins/vnd.dovecot/environment/ext-vnd-environment-items.c
@@ -4,7 +4,7 @@
 #include "lib.h"
 #include "array.h"
 
-#include "sieve-settings.h"
+#include "sieve-settings.old.h"
 #include "sieve-extensions.h"
 #include "sieve-commands.h"
 #include "sieve-comparators.h"
diff --git a/src/lib-sieve/sieve-actions.c b/src/lib-sieve/sieve-actions.c
index 65a619298e8f509e51c9242359aaf81beaa6c744..2b653869b3e6abd90388e989df1e21994949a85f 100644
--- a/src/lib-sieve/sieve-actions.c
+++ b/src/lib-sieve/sieve-actions.c
@@ -19,7 +19,7 @@
 #include "rfc2822.h"
 
 #include "sieve-code.h"
-#include "sieve-settings.h"
+#include "sieve-settings.old.h"
 #include "sieve-extensions.h"
 #include "sieve-binary.h"
 #include "sieve-interpreter.h"
diff --git a/src/lib-sieve/sieve-address-source.c b/src/lib-sieve/sieve-address-source.c
index fa5d142b22951570e0333261cf8247e0f7b5e2f8..4560e5636caee068f36545451467c0e7d59ee8f9 100644
--- a/src/lib-sieve/sieve-address-source.c
+++ b/src/lib-sieve/sieve-address-source.c
@@ -5,7 +5,7 @@
 
 #include "sieve-common.h"
 #include "sieve-error.h"
-#include "sieve-settings.h"
+#include "sieve-settings.old.h"
 #include "sieve-address.h"
 #include "sieve-message.h"
 
diff --git a/src/lib-sieve/sieve-extensions.c b/src/lib-sieve/sieve-extensions.c
index 19e175557728de362124b339f6a11148110e0753..90c91780b09e407993763c9f4655074f93569dc0 100644
--- a/src/lib-sieve/sieve-extensions.c
+++ b/src/lib-sieve/sieve-extensions.c
@@ -9,7 +9,7 @@
 
 #include "sieve-common.h"
 #include "sieve-error.h"
-#include "sieve-settings.h"
+#include "sieve-settings.old.h"
 #include "sieve-extensions.h"
 
 /*
diff --git a/src/lib-sieve/sieve-plugins.c b/src/lib-sieve/sieve-plugins.c
index bd8c426b54f6b100df724806a6253ebd9563b2e0..2fadf27acf1deb9ee66b2de61ea51866af9311d4 100644
--- a/src/lib-sieve/sieve-plugins.c
+++ b/src/lib-sieve/sieve-plugins.c
@@ -5,7 +5,7 @@
 #include "str.h"
 #include "module-dir.h"
 
-#include "sieve-settings.h"
+#include "sieve-settings.old.h"
 #include "sieve-extensions.h"
 
 #include "sieve-common.h"
diff --git a/src/lib-sieve/sieve-script.c b/src/lib-sieve/sieve-script.c
index 718ee67b9a1b974665597ddb9f5475d20fc8bf2c..f60042f62e746a2e7bf9248765fb550854b7d365 100644
--- a/src/lib-sieve/sieve-script.c
+++ b/src/lib-sieve/sieve-script.c
@@ -13,7 +13,7 @@
 
 #include "sieve-common.h"
 #include "sieve-limits.h"
-#include "sieve-settings.h"
+#include "sieve-settings.old.h"
 #include "sieve-error.h"
 #include "sieve-dump.h"
 #include "sieve-binary.h"
diff --git a/src/lib-sieve/sieve-settings.c b/src/lib-sieve/sieve-settings.old.c
similarity index 99%
rename from src/lib-sieve/sieve-settings.c
rename to src/lib-sieve/sieve-settings.old.c
index 82a6ce09f72fa92dbf153687b8b6ed2a770cb690..7068c2691f2ef9a00a0b829b094f7109ccc34362 100644
--- a/src/lib-sieve/sieve-settings.c
+++ b/src/lib-sieve/sieve-settings.old.c
@@ -8,7 +8,7 @@
 #include "sieve-error.h"
 #include "sieve-address.h"
 #include "sieve-address-source.h"
-#include "sieve-settings.h"
+#include "sieve-settings.old.h"
 
 #include <ctype.h>
 
diff --git a/src/lib-sieve/sieve-settings.h b/src/lib-sieve/sieve-settings.old.h
similarity index 96%
rename from src/lib-sieve/sieve-settings.h
rename to src/lib-sieve/sieve-settings.old.h
index f2dfca20bb69993ee4b31ba03f2e6ede8e08ef87..371e9676a2df4650ba26b7df702154813c699884 100644
--- a/src/lib-sieve/sieve-settings.h
+++ b/src/lib-sieve/sieve-settings.old.h
@@ -1,5 +1,5 @@
-#ifndef SIEVE_SETTINGS_H
-#define SIEVE_SETTINGS_H
+#ifndef SIEVE_SETTINGS_OLD_H
+#define SIEVE_SETTINGS_OLD_H
 
 #include "sieve-common.h"
 
diff --git a/src/lib-sieve/sieve-storage-sync.c b/src/lib-sieve/sieve-storage-sync.c
index 2788030266226ba050f76ca9ca9e1255f57edf25..e9369b95992d688599a6647585b870f8ee28f8d7 100644
--- a/src/lib-sieve/sieve-storage-sync.c
+++ b/src/lib-sieve/sieve-storage-sync.c
@@ -11,7 +11,7 @@
 #include "mail-storage-private.h"
 
 #include "sieve-common.h"
-#include "sieve-settings.h"
+#include "sieve-settings.old.h"
 #include "sieve-error-private.h"
 
 #include "sieve-script-private.h"
diff --git a/src/lib-sieve/sieve-storage.c b/src/lib-sieve/sieve-storage.c
index d239f24f78ea84463f7d5036d562fbf9ec20a99a..462313ae6c3b62b27ad3c214505434c5234ee3a5 100644
--- a/src/lib-sieve/sieve-storage.c
+++ b/src/lib-sieve/sieve-storage.c
@@ -10,7 +10,7 @@
 #include "ioloop.h"
 
 #include "sieve-common.h"
-#include "sieve-settings.h"
+#include "sieve-settings.old.h"
 #include "sieve-error-private.h"
 
 #include "sieve-script-private.h"
diff --git a/src/lib-sieve/sieve.c b/src/lib-sieve/sieve.c
index ca315785a8930a10e055e678cbe29ce96157ebf5..7da596929a8e43cbff712720c22015107a2bfc25 100644
--- a/src/lib-sieve/sieve.c
+++ b/src/lib-sieve/sieve.c
@@ -13,7 +13,7 @@
 #include "message-address.h"
 #include "mail-user.h"
 
-#include "sieve-settings.h"
+#include "sieve-settings.old.h"
 #include "sieve-extensions.h"
 #include "sieve-plugins.h"
 
diff --git a/src/lib-sieve/storage/file/sieve-file-storage.c b/src/lib-sieve/storage/file/sieve-file-storage.c
index 0702209ff1d4bb54996bd573e5421c4e58520c66..cb48f1e9ad614c914c8890f87f533a56bd107630 100644
--- a/src/lib-sieve/storage/file/sieve-file-storage.c
+++ b/src/lib-sieve/storage/file/sieve-file-storage.c
@@ -12,9 +12,8 @@
 
 #include "sieve.h"
 #include "sieve-common.h"
-#include "sieve-settings.h"
+#include "sieve-settings.old.h"
 #include "sieve-error-private.h"
-#include "sieve-settings.h"
 
 #include "sieve-file-storage.h"
 
diff --git a/src/plugins/sieve-extprograms/sieve-extprograms-common.c b/src/plugins/sieve-extprograms/sieve-extprograms-common.c
index ea954c72ce5221bffeda3534c43696815b181282..401fb2ef019c2cecb3b23eb519b4a41a3d57b2d1 100644
--- a/src/plugins/sieve-extprograms/sieve-extprograms-common.c
+++ b/src/plugins/sieve-extprograms/sieve-extprograms-common.c
@@ -20,7 +20,7 @@
 #include "program-client.h"
 
 #include "sieve-common.h"
-#include "sieve-settings.h"
+#include "sieve-settings.old.h"
 #include "sieve-error.h"
 #include "sieve-extensions.h"
 #include "sieve-ast.h"
diff --git a/src/testsuite/cmd-test-config.c b/src/testsuite/cmd-test-config.c
index ec5e73c54869b670d1f6296d74d40963886ca0d2..a6eabdf3108355aa9a0bc8b94fc6ba4e30485302 100644
--- a/src/testsuite/cmd-test-config.c
+++ b/src/testsuite/cmd-test-config.c
@@ -2,7 +2,7 @@
  */
 
 #include "sieve-common.h"
-#include "sieve-settings.h"
+#include "sieve-settings.old.h"
 #include "sieve-extensions.h"
 #include "sieve-commands.h"
 #include "sieve-validator.h"