diff --git a/src/lib-sieve/plugins/regex/ext-regex.c b/src/lib-sieve/plugins/regex/ext-regex.c
index 0eac65508856e7bb9c66f24f625e9beffbc3c359..0117b15c90fc4c2f1fce515ceb9c6705590280fc 100644
--- a/src/lib-sieve/plugins/regex/ext-regex.c
+++ b/src/lib-sieve/plugins/regex/ext-regex.c
@@ -34,7 +34,6 @@
 #include "ext-regex-common.h"
 
 #include <sys/types.h>
-#include <ctype.h>
 #include <regex.h>
 
 /* Forward declarations */
diff --git a/src/lib-sieve/plugins/regex/mcht-regex.c b/src/lib-sieve/plugins/regex/mcht-regex.c
index 620d8bfae4fcf1679bec2433817a373994592045..8091a9f49252e335842f77acb2ea757c1495c04f 100644
--- a/src/lib-sieve/plugins/regex/mcht-regex.c
+++ b/src/lib-sieve/plugins/regex/mcht-regex.c
@@ -17,8 +17,8 @@
 #include "ext-regex-common.h"
 
 #include <sys/types.h>
-#include <ctype.h>
 #include <regex.h>
+#include <ctype.h>
 
 /*
  * Configuration
diff --git a/src/lib-sieve/plugins/variables/cmd-set.c b/src/lib-sieve/plugins/variables/cmd-set.c
index 8c034e236063306885a31f427c600013d1f749b6..a94d0ed030d78760799b7f56fef0ad80094f2bb3 100644
--- a/src/lib-sieve/plugins/variables/cmd-set.c
+++ b/src/lib-sieve/plugins/variables/cmd-set.c
@@ -18,8 +18,6 @@
 #include "ext-variables-common.h"
 #include "ext-variables-modifiers.h"
 
-#include <ctype.h>
-
 /* Forward declarations */
 
 static bool cmd_set_operation_dump
diff --git a/src/lib-sieve/plugins/variables/ext-variables-common.c b/src/lib-sieve/plugins/variables/ext-variables-common.c
index 6b1eda888f140cafefa1e27d53f04592a4192da3..fe3db98fae6da48713c4dad3e04691308907364b 100644
--- a/src/lib-sieve/plugins/variables/ext-variables-common.c
+++ b/src/lib-sieve/plugins/variables/ext-variables-common.c
@@ -21,8 +21,6 @@
 #include "ext-variables-name.h"
 #include "ext-variables-modifiers.h"
 
-#include <ctype.h>
-
 /* Forward declarations */
 
 extern const struct ext_variables_set_modifier lower_modifier;
diff --git a/src/lib-sieve/plugins/variables/ext-variables-modifiers.c b/src/lib-sieve/plugins/variables/ext-variables-modifiers.c
index f6ec1ae3d8dc83b5f62ba3722cea5f118d806987..05201732c3ba37ccfa2bf20d33698ac20fe1ee74 100644
--- a/src/lib-sieve/plugins/variables/ext-variables-modifiers.c
+++ b/src/lib-sieve/plugins/variables/ext-variables-modifiers.c
@@ -154,7 +154,7 @@ bool mod_upperfirst_modify(string_t *in, string_t **result)
 	str_append_str(*result, in);
 		
 	content = str_c_modifiable(*result);
-	content[0] = toupper(content[0]);
+	content[0] = i_toupper(content[0]);
 
 	return TRUE;
 }
diff --git a/src/lib-sieve/plugins/variables/ext-variables-name.c b/src/lib-sieve/plugins/variables/ext-variables-name.c
index ac9f00920f217546e80d0c12e4ec146c570953c8..2dbbbe1c5867f4ac266713ed1eb58050a6edd06a 100644
--- a/src/lib-sieve/plugins/variables/ext-variables-name.c
+++ b/src/lib-sieve/plugins/variables/ext-variables-name.c
@@ -8,7 +8,7 @@
 #include "ext-variables-name.h"
 
 #include <ctype.h>
-  
+
 int ext_variable_name_parse
 (ARRAY_TYPE(ext_variable_name) *vname, const char **str, const char *strend)
 {
diff --git a/src/lib-sieve/plugins/variables/ext-variables-name.h b/src/lib-sieve/plugins/variables/ext-variables-name.h
index efc00a54a4f299da200802c05c00f19fddc22f2b..7102b56cb973696bbe1a5f35a7a422222d58cf36 100644
--- a/src/lib-sieve/plugins/variables/ext-variables-name.h
+++ b/src/lib-sieve/plugins/variables/ext-variables-name.h
@@ -32,8 +32,6 @@
 #include "sieve-common.h"
 
 #include "ext-variables-common.h"
-
-#include <ctype.h>
  
 struct ext_variable_name {
 	string_t *identifier;
diff --git a/src/lib-sieve/plugins/variables/ext-variables.c b/src/lib-sieve/plugins/variables/ext-variables.c
index a003669c243a5c5195e9b7588ce2233a43b89b31..b831c7936e5a671509c55e99227c3ea52a450cef 100644
--- a/src/lib-sieve/plugins/variables/ext-variables.c
+++ b/src/lib-sieve/plugins/variables/ext-variables.c
@@ -30,8 +30,6 @@
 #include "ext-variables-operands.h"
 #include "ext-variables-modifiers.h"
 
-#include <ctype.h>
-
 /* Forward declarations */
 
 static bool ext_variables_load(int ext_id);
diff --git a/src/lib-sieve/sieve-actions.c b/src/lib-sieve/sieve-actions.c
index 8b671957aa07f1c4bbb66fee284f35abe428967c..594278fc1cf8327c9e9b2cc3245f7dd41f03bdae 100644
--- a/src/lib-sieve/sieve-actions.c
+++ b/src/lib-sieve/sieve-actions.c
@@ -12,8 +12,6 @@
 #include "sieve-result.h"
 #include "sieve-actions.h"
 
-#include <ctype.h>
-
 /*
  * Message transmission (FIXME: place this somewhere more appropriate)
  */