[Minor] Fix various style issues

46 files changed, 20 insertions, 125 deletions

diff --git a/src/libmime/archives.c b/src/libmime/archives.c
index d714335fd..2123e1131 100644
--- a/src/libmime/archives.c
+++ b/src/libmime/archives.c
@@ -18,7 +18,6 @@
 #include "message.h"
 #include "task.h"
 #include "archives.h"
-#include "fstring.h"
 
 static void
 rspamd_archive_dtor (gpointer p)
diff --git a/src/libmime/email_addr.c b/src/libmime/email_addr.c
index d534be53f..c857794c8 100644
--- a/src/libmime/email_addr.c
+++ b/src/libmime/email_addr.c
@@ -19,7 +19,6 @@
 #include "message.h"
 #include "printf.h"
 #include "smtp_parsers.h"
-#include "mime_headers.h"
 
 static void
 rspamd_email_addr_dtor (struct rspamd_email_address *addr)
diff --git a/src/libmime/filter.c b/src/libmime/filter.c
index c2eeecc32..c95dfc585 100644
--- a/src/libmime/filter.c
+++ b/src/libmime/filter.c
@@ -19,7 +19,6 @@
 #include "rspamd.h"
 #include "message.h"
 #include "lua/lua_common.h"
-#include "cryptobox.h"
 #include <math.h>
 #include "contrib/uthash/utlist.h"
 
diff --git a/src/libmime/message.c b/src/libmime/message.c
index c429892aa..d445362b2 100644
--- a/src/libmime/message.c
+++ b/src/libmime/message.c
@@ -17,15 +17,10 @@
 #include "util.h"
 #include "rspamd.h"
 #include "message.h"
-#include "cfg_file.h"
-#include "libutil/regexp.h"
 #include "html.h"
 #include "images.h"
 #include "archives.h"
-#include "email_addr.h"
-#include "utlist.h"
 #include "tokenizers/tokenizers.h"
-#include "cryptobox.h"
 #include "smtp_parsers.h"
 #include "mime_parser.h"
 #include "mime_encoding.h"
@@ -34,8 +29,6 @@
 #include "libstemmer.h"
 #endif
 
-#include <iconv.h>
-
 #define GTUBE_SYMBOL "GTUBE"
 
 #define SET_PART_RAW(part) ((part)->flags &= ~RSPAMD_MIME_TEXT_PART_FLAG_UTF)
diff --git a/src/libmime/mime_expressions.c b/src/libmime/mime_expressions.c
index 71b8d4bdc..0c036a89c 100644
--- a/src/libmime/mime_expressions.c
+++ b/src/libmime/mime_expressions.c
@@ -20,7 +20,6 @@
 #include "message.h"
 #include "mime_expressions.h"
 #include "html.h"
-#include "email_addr.h"
 #include "lua/lua_common.h"
 #include "utlist.h"
 
@@ -1172,7 +1171,7 @@ rspamd_recipients_distance (struct rspamd_task *task, GArray * args,
 		}
 	}
 
-	if ((double)(hits * num / 2.) / (double)total >= threshold) {
+	if ((hits * num / 2.) / (double)total >= threshold) {
 		return TRUE;
 	}
 
diff --git a/src/libmime/mime_headers.c b/src/libmime/mime_headers.c
index 75ec1b96d..2ea4c0dcb 100644
--- a/src/libmime/mime_headers.c
+++ b/src/libmime/mime_headers.c
@@ -17,10 +17,6 @@
 #include "mime_headers.h"
 #include "smtp_parsers.h"
 #include "mime_encoding.h"
-#include "email_addr.h"
-#include "task.h"
-#include "cryptobox.h"
-#include "contrib/libottery/ottery.h"
 
 static void
 rspamd_mime_header_check_special (struct rspamd_task *task,
diff --git a/src/libmime/mime_parser.c b/src/libmime/mime_parser.c
index 98eef6d98..f36b4848b 100644
--- a/src/libmime/mime_parser.c
+++ b/src/libmime/mime_parser.c
@@ -19,9 +19,7 @@
 #include "mime_parser.h"
 #include "mime_headers.h"
 #include "message.h"
-#include "content_type.h"
 #include "multipattern.h"
-#include "cryptobox.h"
 #include "contrib/libottery/ottery.h"
 
 struct rspamd_mime_parser_lib_ctx {
@@ -1009,7 +1007,7 @@ rspamd_mime_parse_message (struct rspamd_task *task,
 
 		if (hdr_pos > 0 && hdr_pos < str.len) {
 
-			task->raw_headers_content.begin = (gchar *) (str.str);
+			task->raw_headers_content.begin = str.str;
 			task->raw_headers_content.len = hdr_pos;
 			task->raw_headers_content.body_start = str.str + body_pos;
 
@@ -1029,7 +1027,7 @@ rspamd_mime_parse_message (struct rspamd_task *task,
 			hdr_pos = rspamd_mime_parser_headers_heuristic (&str, &body_pos);
 
 			if (hdr_pos > 0 && hdr_pos <= str.len) {
-				task->raw_headers_content.begin = (gchar *) (str.str);
+				task->raw_headers_content.begin = str.str;
 				task->raw_headers_content.len = hdr_pos;
 				task->raw_headers_content.body_start = str.str + body_pos;
 
@@ -1063,7 +1061,7 @@ rspamd_mime_parse_message (struct rspamd_task *task,
 				rspamd_strcase_equal, NULL, rspamd_ptr_array_free_hard);
 
 		if (hdr_pos > 0 && hdr_pos < str.len) {
-			npart->raw_headers_str = (gchar *) (str.str);
+			npart->raw_headers_str = str.str;
 			npart->raw_headers_len = hdr_pos;
 			npart->raw_data.begin = str.str + body_pos;
 
diff --git a/src/libserver/monitored.c b/src/libserver/monitored.c
index e411f3541..a7b3fb37d 100644
--- a/src/libserver/monitored.c
+++ b/src/libserver/monitored.c
@@ -17,10 +17,8 @@
 #include "rdns.h"
 #include "mem_pool.h"
 #include "cfg_file.h"
-#include "monitored.h"
 #include "cryptobox.h"
 #include "logger.h"
-#include "radix.h"
 
 static const gdouble default_monitoring_interval = 60.0;
 static const guint default_max_errors = 3;
diff --git a/src/libserver/protocol.c b/src/libserver/protocol.c
index d9e4f9b7b..b209cdecd 100644
--- a/src/libserver/protocol.c
+++ b/src/libserver/protocol.c
@@ -15,18 +15,11 @@
  */
 #include "config.h"
 #include "rspamd.h"
-#include "util.h"
-#include "cfg_file.h"
-#include "cfg_rcl.h"
 #include "message.h"
 #include "utlist.h"
-#include "http.h"
 #include "http_private.h"
-#include "email_addr.h"
 #include "worker_private.h"
-#include "cryptobox.h"
 #include "contrib/zstd/zstd.h"
-#include "contrib/uthash/utlist.h"
 #include "lua/lua_common.h"
 #include "unix-std.h"
 #include <math.h>
diff --git a/src/libserver/redis_pool.c b/src/libserver/redis_pool.c
index 0b7c30844..1ce5f5e07 100644
--- a/src/libserver/redis_pool.c
+++ b/src/libserver/redis_pool.c
@@ -22,7 +22,6 @@
 #include "contrib/hiredis/async.h"
 #include "contrib/hiredis/adapters/libevent.h"
 #include "cryptobox.h"
-#include "ref.h"
 #include "logger.h"
 
 struct rspamd_redis_pool_elt;
diff --git a/src/libserver/roll_history.c b/src/libserver/roll_history.c
index a535a7bf9..ea79b590b 100644
--- a/src/libserver/roll_history.c
+++ b/src/libserver/roll_history.c
@@ -15,8 +15,6 @@
  */
 #include "config.h"
 #include "rspamd.h"
-#include "roll_history.h"
-#include "ucl.h"
 #include "lua/lua_common.h"
 #include "unix-std.h"
 
diff --git a/src/libserver/spf.c b/src/libserver/spf.c
index 39c7c232b..f106e534d 100644
--- a/src/libserver/spf.c
+++ b/src/libserver/spf.c
@@ -18,9 +18,7 @@
 #include "spf.h"
 #include "rspamd.h"
 #include "message.h"
-#include "filter.h"
 #include "utlist.h"
-#include "email_addr.h"
 
 #define SPF_VER1_STR "v=spf1"
 #define SPF_VER2_STR "spf2."
diff --git a/src/libserver/url.c b/src/libserver/url.c
index eb470c7db..347550ba6 100644
--- a/src/libserver/url.c
+++ b/src/libserver/url.c
@@ -42,12 +42,9 @@
 #include "config.h"
 #include "url.h"
 #include "util.h"
-#include "fstring.h"
 #include "rspamd.h"
 #include "message.h"
-#include "http.h"
 #include "multipattern.h"
-#include "http_parser.h"
 #include "contrib/uthash/utlist.h"
 
 typedef struct url_match_s {
diff --git a/src/libserver/worker_util.c b/src/libserver/worker_util.c
index f9d777e31..9419b9286 100644
--- a/src/libserver/worker_util.c
+++ b/src/libserver/worker_util.c
@@ -15,7 +15,6 @@
  */
 #include "config.h"
 #include "rspamd.h"
-#include "message.h"
 #include "lua/lua_common.h"
 #include "worker_util.h"
 #include "unix-std.h"
diff --git a/src/libstat/classifiers/bayes.c b/src/libstat/classifiers/bayes.c
index fb1ffdde2..730581ced 100644
--- a/src/libstat/classifiers/bayes.c
+++ b/src/libstat/classifiers/bayes.c
@@ -18,8 +18,6 @@
  */
 #include "classifiers.h"
 #include "rspamd.h"
-#include "filter.h"
-#include "cfg_file.h"
 #include "stat_internal.h"
 #include "math.h"
 
diff --git a/src/libstat/tokenizers/osb.c b/src/libstat/tokenizers/osb.c
index 6c8ac354b..317cdc66c 100644
--- a/src/libstat/tokenizers/osb.c
+++ b/src/libstat/tokenizers/osb.c
@@ -19,7 +19,6 @@
 
 #include "tokenizers.h"
 #include "stat_internal.h"
-#include "cryptobox.h"
 
 /* Size for features pipe */
 #define DEFAULT_FEATURE_WINDOW_SIZE 5
diff --git a/src/libutil/addr.c b/src/libutil/addr.c
index c70946c09..fb4c537c4 100644
--- a/src/libutil/addr.c
+++ b/src/libutil/addr.c
@@ -18,7 +18,6 @@
 #include "util.h"
 #include "logger.h"
 #include "cryptobox.h"
-#include "radix.h"
 #include "unix-std.h"
 /* pwd and grp */
 #ifdef HAVE_PWD_H
diff --git a/src/libutil/logger.c b/src/libutil/logger.c
index 920c5231b..faab981d9 100644
--- a/src/libutil/logger.c
+++ b/src/libutil/logger.c
@@ -15,12 +15,9 @@
  */
 #include "config.h"
 #include "logger.h"
-#include "util.h"
 #include "rspamd.h"
 #include "map.h"
-#include "cryptobox.h"
 #include "ottery.h"
-#include "keypair.h"
 #include "unix-std.h"
 
 #ifdef HAVE_SYSLOG_H
diff --git a/src/libutil/map.c b/src/libutil/map.c
index 11ef2c441..97a982797 100644
--- a/src/libutil/map.c
+++ b/src/libutil/map.c
@@ -22,10 +22,6 @@
 #include "http.h"
 #include "http_private.h"
 #include "rspamd.h"
-#include "cryptobox.h"
-#include "unix-std.h"
-#include "http_parser.h"
-#include "libutil/regexp.h"
 #include "contrib/zstd/zstd.h"
 
 #ifdef WITH_HYPERSCAN
diff --git a/src/libutil/mem_pool.c b/src/libutil/mem_pool.c
index 1ee0558a1..187d3ca66 100644
--- a/src/libutil/mem_pool.c
+++ b/src/libutil/mem_pool.c
@@ -17,7 +17,6 @@
 #include "mem_pool.h"
 #include "fstring.h"
 #include "logger.h"
-#include "utlist.h"
 #include "ottery.h"
 #include "unix-std.h"
 
diff --git a/src/libutil/multipattern.c b/src/libutil/multipattern.c
index 5f7e48daa..13a167cd1 100644
--- a/src/libutil/multipattern.c
+++ b/src/libutil/multipattern.c
@@ -17,13 +17,11 @@
 #include "config.h"
 #include "libutil/multipattern.h"
 #include "libutil/str_util.h"
-#include "libutil/util.h"
-#include "libutil/printf.h"
 #include "libcryptobox/cryptobox.h"
-#include "unix-std.h"
-#include "libutil/logger.h"
 
 #ifdef WITH_HYPERSCAN
+#include "logger.h"
+#include "unix-std.h"
 #include "hs.h"
 #endif
 #include "acism.h"
diff --git a/src/libutil/printf.c b/src/libutil/printf.c
index 6935c03b0..b86011b23 100644
--- a/src/libutil/printf.c
+++ b/src/libutil/printf.c
@@ -39,9 +39,7 @@
  */
 
 #include "printf.h"
-#include "fstring.h"
 #include "str_util.h"
-#include <math.h>
 
 /**
  * From FreeBSD libutil code
diff --git a/src/lua/lua_cfg_file.c b/src/lua/lua_cfg_file.c
index acf7e32b1..2e46f91fc 100644
--- a/src/lua/lua_cfg_file.c
+++ b/src/lua/lua_cfg_file.c
@@ -16,9 +16,8 @@
 #include "lua_common.h"
 #include "expression.h"
 #include "composites.h"
-#include "unix-std.h"
+
 #ifdef HAVE_SYS_UTSNAME_H
-#include <sys/utsname.h>
 #endif
 
 /*
diff --git a/src/lua/lua_classifier.c b/src/lua/lua_classifier.c
index 871433124..cab488e84 100644
--- a/src/lua/lua_classifier.c
+++ b/src/lua/lua_classifier.c
@@ -14,7 +14,6 @@
  * limitations under the License.
  */
 #include "lua_common.h"
-#include "cfg_file.h"
 
 /* Classifier methods */
 LUA_FUNCTION_DEF (classifier, get_statfiles);
diff --git a/src/lua/lua_config.c b/src/lua/lua_config.c
index e6e66b900..3179c29fc 100644
--- a/src/lua/lua_config.c
+++ b/src/lua/lua_config.c
@@ -18,7 +18,6 @@
 #include "libutil/expression.h"
 #include "libserver/composites.h"
 #include "lua/lua_map.h"
-#include "monitored.h"
 #include "utlist.h"
 #include <math.h>
 
@@ -682,8 +681,7 @@ lua_check_monitored (lua_State * L, gint pos)
 static gint
 lua_config_get_api_version (lua_State *L)
 {
-	lua_pushinteger (L, RSPAMD_LUA_API_VERSION);
-	return 1;
+	return luaL_error (L, "obsolete function");
 }
 
 static gint
diff --git a/src/lua/lua_cryptobox.c b/src/lua/lua_cryptobox.c
index 5e8cec08c..0e28e52bb 100644
--- a/src/lua/lua_cryptobox.c
+++ b/src/lua/lua_cryptobox.c
@@ -27,11 +27,7 @@
  */
 
 #include "lua_common.h"
-#include "cryptobox.h"
-#include "keypair.h"
 #include "unix-std.h"
-#include <openssl/evp.h>
-#include <openssl/hmac.h>
 
 struct rspamd_lua_cryptobox_hash {
 	rspamd_cryptobox_hash_state_t *h;
diff --git a/src/lua/lua_dns.c b/src/lua/lua_dns.c
index 22acbe4d3..6dab3c285 100644
--- a/src/lua/lua_dns.c
+++ b/src/lua/lua_dns.c
@@ -14,7 +14,6 @@
  * limitations under the License.
  */
 #include "lua_common.h"
-#include "dns.h"
 #include "utlist.h"
 
 
diff --git a/src/lua/lua_fann.c b/src/lua/lua_fann.c
index 884a40293..7315de7ad 100644
--- a/src/lua/lua_fann.c
+++ b/src/lua/lua_fann.c
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 #include "lua_common.h"
-#include "util.h"
+
 #ifdef WITH_FANN
 #include <fann.h>
 #endif
diff --git a/src/lua/lua_http.c b/src/lua/lua_http.c
index 31b0b3be3..1cc10f48e 100644
--- a/src/lua/lua_http.c
+++ b/src/lua/lua_http.c
@@ -14,11 +14,7 @@
  * limitations under the License.
  */
 #include "lua_common.h"
-#include "dns.h"
-#include "http.h"
 #include "http_private.h"
-#include "utlist.h"
-#include "libcryptobox/keypair.h"
 #include "unix-std.h"
 
 /***
@@ -181,7 +177,7 @@ lua_http_finish_handler (struct rspamd_http_connection *conn,
 	/* Error */
 	lua_pushnil (cbd->L);
 	/* Reply code */
-	lua_pushinteger (cbd->L, msg->code);
+	lua_pushnumber (cbd->L, msg->code);
 	/* Body */
 	body = rspamd_http_message_get_body (msg, &body_len);
 
diff --git a/src/lua/lua_map.c b/src/lua/lua_map.c
index c0ce00609..40b2ecedc 100644
--- a/src/lua/lua_map.c
+++ b/src/lua/lua_map.c
@@ -17,8 +17,6 @@
 #include "lua_common.h"
 #include "libutil/map.h"
 #include "libutil/map_private.h"
-#include "libutil/radix.h"
-#include "lua/lua_map.h"
 
 /***
  * This module is used to manage rspamd maps and map like objects
diff --git a/src/lua/lua_mempool.c b/src/lua/lua_mempool.c
index 8fe8b5cc3..569fe0eb6 100644
--- a/src/lua/lua_mempool.c
+++ b/src/lua/lua_mempool.c
@@ -14,7 +14,6 @@
  * limitations under the License.
  */
 #include "lua_common.h"
-#include "mem_pool.h"
 
 /***
  * @module rspamd_mempool
@@ -236,7 +235,7 @@ lua_mempool_suggest_size (lua_State *L)
 	struct memory_pool_s *mempool = rspamd_lua_check_mempool (L, 1);
 
 	if (mempool) {
-		lua_pushinteger (L, rspamd_mempool_suggest_size ());
+		lua_pushnumber (L, rspamd_mempool_suggest_size ());
 		return 0;
 	}
 	else {
diff --git a/src/lua/lua_mimepart.c b/src/lua/lua_mimepart.c
index 8a9fb85e1..21640aab5 100644
--- a/src/lua/lua_mimepart.c
+++ b/src/lua/lua_mimepart.c
@@ -675,7 +675,7 @@ lua_mimepart_get_length (lua_State * L)
 		return 1;
 	}
 
-	lua_pushinteger (L, part->parsed_data.len);
+	lua_pushnumber (L, part->parsed_data.len);
 
 	return 1;
 }
diff --git a/src/lua/lua_redis.c b/src/lua/lua_redis.c
index 4a0a1cfd9..c75ca4cfb 100644
--- a/src/lua/lua_redis.c
+++ b/src/lua/lua_redis.c
@@ -14,7 +14,6 @@
  * limitations under the License.
  */
 #include "lua_common.h"
-#include "dns.h"
 #include "utlist.h"
 
 #include "contrib/hiredis/hiredis.h"
diff --git a/src/lua/lua_regexp.c b/src/lua/lua_regexp.c
index 1640f8023..a35ec96b5 100644
--- a/src/lua/lua_regexp.c
+++ b/src/lua/lua_regexp.c
@@ -14,7 +14,6 @@
  * limitations under the License.
  */
 #include "lua_common.h"
-#include "regexp.h"
 
 /***
  * @module rspamd_regexp
diff --git a/src/lua/lua_rsa.c b/src/lua/lua_rsa.c
index 659eaecd2..91cdf497d 100644
--- a/src/lua/lua_rsa.c
+++ b/src/lua/lua_rsa.c
@@ -21,12 +21,10 @@
 
 #include "lua_common.h"
 #include "unix-std.h"
-
-#ifdef HAVE_OPENSSL
 #include <openssl/err.h>
+#include <openssl/pem.h>
 #include <openssl/sha.h>
 #include <openssl/rsa.h>
-#include <openssl/pem.h>
 
 LUA_FUNCTION_DEF (rsa_pubkey,	 load);
 LUA_FUNCTION_DEF (rsa_pubkey,	 create);
@@ -693,12 +691,3 @@ luaopen_rsa (lua_State * L)
 
 	lua_settop (L, 0);
 }
-
-#else
-void
-luaopen_rsa (lua_State * L)
-{
-	msg_info ("this rspamd version is not linked against openssl, therefore no "
-		"RSA support is available");
-}
-#endif
diff --git a/src/lua/lua_sqlite3.c b/src/lua/lua_sqlite3.c
index e15673702..97b112ac4 100644
--- a/src/lua/lua_sqlite3.c
+++ b/src/lua/lua_sqlite3.c
@@ -14,7 +14,6 @@
  * limitations under the License.
  */
 #include "lua_common.h"
-#include "util.h"
 #include "sqlite_utils.h"
 
 /***
diff --git a/src/lua/lua_task.c b/src/lua/lua_task.c
index f4d7f9dd6..711708335 100644
--- a/src/lua/lua_task.c
+++ b/src/lua/lua_task.c
@@ -15,19 +15,11 @@
  */
 #include "lua_common.h"
 #include "message.h"
-#include "protocol.h"
-#include "filter.h"
-#include "dns.h"
-#include "util.h"
 #include "images.h"
 #include "archives.h"
-#include "cfg_file.h"
-#include "email_addr.h"
 #include "utlist.h"
-#include "cryptobox.h"
 #include "unix-std.h"
 #include "libmime/smtp_parsers.h"
-#include "contrib/uthash/utlist.h"
 #include <math.h>
 
 /***
@@ -2582,7 +2574,7 @@ lua_task_get_helo (lua_State *L)
 
 	if (task) {
 		if (task->helo != NULL) {
-			lua_pushstring (L, (gchar *)task->helo);
+			lua_pushstring (L, task->helo);
 			return 1;
 		}
 		else {
@@ -3998,7 +3990,7 @@ lua_image_get_size (lua_State *L)
 	struct rspamd_image *img = lua_check_image (L);
 
 	if (img != NULL) {
-		lua_pushinteger (L, img->data->len);
+		lua_pushnumber (L, img->data->len);
 	}
 	else {
 		return luaL_error (L, "invalid arguments");
@@ -4124,7 +4116,7 @@ lua_archive_get_size (lua_State *L)
 	struct rspamd_archive *arch = lua_check_archive (L);
 
 	if (arch != NULL) {
-		lua_pushinteger (L, arch->size);
+		lua_pushnumber (L, arch->size);
 	}
 	else {
 		return luaL_error (L, "invalid arguments");
diff --git a/src/lua/lua_tcp.c b/src/lua/lua_tcp.c
index 21a357400..ed8330e81 100644
--- a/src/lua/lua_tcp.c
+++ b/src/lua/lua_tcp.c
@@ -14,9 +14,7 @@
  * limitations under the License.
  */
 #include "lua_common.h"
-#include "dns.h"
 #include "utlist.h"
-#include "ref.h"
 #include "unix-std.h"
 
 /***
@@ -875,7 +873,7 @@ lua_tcp_arg_toiovec (lua_State *L, gint pos, struct lua_tcp_cbdata *cbd,
 		vec->iov_base = g_malloc (len);
 		dtor = g_slice_alloc0 (sizeof (*dtor));
 		dtor->dtor = g_free;
-		dtor->data = (void *)vec->iov_base;
+		dtor->data = vec->iov_base;
 		LL_PREPEND (cbd->dtors, dtor);
 		memcpy (vec->iov_base, str, len);
 		vec->iov_len = len;
diff --git a/src/lua/lua_upstream.c b/src/lua/lua_upstream.c
index fe4697758..84d112ef1 100644
--- a/src/lua/lua_upstream.c
+++ b/src/lua/lua_upstream.c
@@ -15,8 +15,6 @@
  */
 #include "config.h"
 #include "lua_common.h"
-#include "upstream.h"
-#include "cfg_file.h"
 
 
 /***
diff --git a/src/lua/lua_url.c b/src/lua/lua_url.c
index abbbef512..9b69267a4 100644
--- a/src/lua/lua_url.c
+++ b/src/lua/lua_url.c
@@ -112,7 +112,7 @@ lua_url_get_length (lua_State *L)
 	struct rspamd_lua_url *url = lua_check_url (L, 1);
 
 	if (url != NULL) {
-		lua_pushinteger (L, url->url->urllen);
+		lua_pushnumber (L, url->url->urllen);
 	}
 	else {
 		lua_pushnil (L);
@@ -697,7 +697,7 @@ lua_url_table_inserter (struct rspamd_url *url, gsize start_offset,
 	lua_url = lua_newuserdata (L, sizeof (struct rspamd_lua_url));
 	rspamd_lua_setclass (L, "rspamd{url}", -1);
 	lua_url->url = url;
-	lua_pushinteger (L, n + 1);
+	lua_pushnumber (L, n + 1);
 	lua_pushlstring (L, url->string, url->urllen);
 	lua_settable (L, -3);
 }
diff --git a/src/lua/lua_util.c b/src/lua/lua_util.c
index 3ca34b4cc..af24558e4 100644
--- a/src/lua/lua_util.c
+++ b/src/lua/lua_util.c
@@ -14,12 +14,8 @@
  * limitations under the License.
  */
 #include "lua_common.h"
-#include "task.h"
-#include "rspamd.h"
 #include "html.h"
-#include "cfg_rcl.h"
 #include "tokenizers/tokenizers.h"
-#include "libserver/url.h"
 #include "unix-std.h"
 #include "contrib/zstd/zstd.h"
 #include "libmime/email_addr.h"
diff --git a/src/lua/lua_xmlrpc.c b/src/lua/lua_xmlrpc.c
index 8ae7370e9..27d944712 100644
--- a/src/lua/lua_xmlrpc.c
+++ b/src/lua/lua_xmlrpc.c
@@ -391,7 +391,7 @@ xmlrpc_text (GMarkupParseContext *context,
 		case 12:
 			/* Push integer value */
 			num = strtoul (text, NULL, 10);
-			lua_pushinteger (ud->L, num);
+			lua_pushnumber (ud->L, num);
 			break;
 		case 13:
 			/* Push integer value */
diff --git a/src/plugins/fuzzy_check.c b/src/plugins/fuzzy_check.c
index 69c308234..317bb7dd4 100644
--- a/src/plugins/fuzzy_check.c
+++ b/src/plugins/fuzzy_check.c
@@ -37,9 +37,7 @@
 #include "libserver/worker_util.h"
 #include "fuzzy_wire.h"
 #include "utlist.h"
-#include "cryptobox.h"
 #include "ottery.h"
-#include "keypair.h"
 #include "lua/lua_common.h"
 #include "unix-std.h"
 #include "libutil/http_private.h"
diff --git a/src/plugins/spf.c b/src/plugins/spf.c
index aa63c8018..883fabde4 100644
--- a/src/plugins/spf.c
+++ b/src/plugins/spf.c
@@ -32,7 +32,6 @@
 #include "libutil/hash.h"
 #include "libutil/map.h"
 #include "rspamd.h"
-#include "addr.h"
 
 #define DEFAULT_SYMBOL_FAIL "R_SPF_FAIL"
 #define DEFAULT_SYMBOL_SOFTFAIL "R_SPF_SOFTFAIL"
diff --git a/src/rspamadm/keypair.c b/src/rspamadm/keypair.c
index c339a7d88..4f54d0b55 100644
--- a/src/rspamadm/keypair.c
+++ b/src/rspamadm/keypair.c
@@ -18,9 +18,6 @@
 #include "cryptobox.h"
 #include "printf.h"
 #include "http.h"
-#include "ucl.h"
-#include "libcryptobox/keypair.h"
-#include "libutil/str_util.h"
 
 static gboolean hex_encode = FALSE;
 static gboolean raw = FALSE;
diff --git a/src/rspamadm/lua_repl.c b/src/rspamadm/lua_repl.c
index 2f6ee5676..58c803e3e 100644
--- a/src/rspamadm/lua_repl.c
+++ b/src/rspamadm/lua_repl.c
@@ -16,13 +16,11 @@
 
 #include "config.h"
 #include "rspamadm.h"
-#include "cryptobox.h"
 #include "libutil/http.h"
 #include "libutil/http_private.h"
 #include "printf.h"
 #include "lua/lua_common.h"
 #include "message.h"
-#include "task.h"
 #include "unix-std.h"
 #include "linenoise.h"
 #include "worker_util.h"