Fix some problematic includes.

16 files changed, 68 insertions, 96 deletions

diff --git a/src/controller.c b/src/controller.c
index eb9bb5d1e..1a82e6839 100644
--- a/src/controller.c
+++ b/src/controller.c
@@ -23,19 +23,12 @@
 
 
 #include "config.h"
-#include "util.h"
-#include "main.h"
-#include "http.h"
-#include "message.h"
-#include "protocol.h"
-#include "upstream.h"
-#include "cfg_file.h"
-#include "map.h"
-#include "dns.h"
 #include "tokenizers/tokenizers.h"
 #include "classifiers/classifiers.h"
-#include "dynamic_cfg.h"
-#include "rrd.h"
+#include "libserver/dynamic_cfg.h"
+#include "libutil/rrd.h"
+#include "libutil/map.h"
+#include "main.h"
 
 #ifdef WITH_GPERF_TOOLS
 #   include <glib/gprintf.h>
diff --git a/src/libmime/smtp_proto.h b/src/libmime/smtp_proto.h
index 7c5787926..a5c865889 100644
--- a/src/libmime/smtp_proto.h
+++ b/src/libmime/smtp_proto.h
@@ -2,7 +2,6 @@
 #define RSPAMD_SMTP_PROTO_H
 
 #include "config.h"
-#include "smtp.h"
 
 /* SMTP errors */
 #define SMTP_ERROR_BAD_COMMAND "500 Syntax error, command unrecognized" CRLF
diff --git a/src/libmime/smtp_utils.h b/src/libmime/smtp_utils.h
index c09729180..bb17d142e 100644
--- a/src/libmime/smtp_utils.h
+++ b/src/libmime/smtp_utils.h
@@ -2,8 +2,6 @@
 #define SMTP_UTILS_H_
 
 #include "config.h"
-#include "main.h"
-#include "smtp.h"
 
 /**
  * @file smtp_utils.h
diff --git a/src/lua/lua_common.h b/src/lua/lua_common.h
index f67d271d6..afcfcdcdb 100644
--- a/src/lua/lua_common.h
+++ b/src/lua/lua_common.h
@@ -4,14 +4,14 @@
 #include "config.h"
 #ifdef WITH_LUA
 
-#include "main.h"
-#include "cfg_file.h"
-#include "ucl.h"
-#include "lua_ucl.h"
 #include <lua.h>
 #include <lauxlib.h>
 #include <lualib.h>
 
+#include "main.h"
+#include "ucl.h"
+#include "lua_ucl.h"
+
 #ifndef lua_open
 #define lua_open()  luaL_newstate ()
 #endif
diff --git a/src/main.c b/src/main.c
index b4537eeeb..84b611822 100644
--- a/src/main.c
+++ b/src/main.c
@@ -24,14 +24,12 @@
 
 #include "config.h"
 #include "main.h"
-#include "cfg_file.h"
-#include "util.h"
 #include "lmtp.h"
 #include "smtp.h"
-#include "map.h"
+#include "libutil/map.h"
 #include "fuzzy_storage.h"
 #include "kvstorage_server.h"
-#include "symbols_cache.h"
+#include "libserver/symbols_cache.h"
 #include "lua/lua_common.h"
 #include "ottery.h"
 #include "xxhash.h"
diff --git a/src/main.h b/src/main.h
index 537cf575c..57f4ee3a4 100644
--- a/src/main.h
+++ b/src/main.h
@@ -7,20 +7,22 @@
 #define RSPAMD_MAIN_H
 
 #include "config.h"
-#include "fstring.h"
-#include "mem_pool.h"
-#include "statfile.h"
-#include "url.h"
-#include "protocol.h"
-#include "filter.h"
-#include "buffer.h"
-#include "events.h"
-#include "util.h"
-#include "logger.h"
-#include "roll_history.h"
-#include "http.h"
-#include "task.h"
-#include "worker_util.h"
+#include "libutil/fstring.h"
+#include "libutil/mem_pool.h"
+#include "libutil/util.h"
+#include "libutil/logger.h"
+#include "libutil/http.h"
+#include "libutil/upstream.h"
+#include "libserver/statfile.h"
+#include "libserver/url.h"
+#include "libserver/protocol.h"
+#include "libserver/buffer.h"
+#include "libserver/events.h"
+#include "libserver/roll_history.h"
+#include "libserver/task.h"
+#include "libserver/worker_util.h"
+#include "libmime/filter.h"
+
 
 /* Default values */
 #define FIXED_CONFIG_FILE RSPAMD_CONFDIR "/rspamd.conf"
diff --git a/src/plugins/chartable.c b/src/plugins/chartable.c
index bb0113a8b..90a76e50a 100644
--- a/src/plugins/chartable.c
+++ b/src/plugins/chartable.c
@@ -32,10 +32,9 @@
  */
 
 #include "config.h"
+#include "libmime/message.h"
+#include "libmime/expressions.h"
 #include "main.h"
-#include "message.h"
-#include "cfg_file.h"
-#include "expressions.h"
 
 #define DEFAULT_SYMBOL "R_CHARSET_MIXED"
 #define DEFAULT_THRESHOLD 0.1
diff --git a/src/plugins/dkim_check.c b/src/plugins/dkim_check.c
index 2a5ac2203..075d23c88 100644
--- a/src/plugins/dkim_check.c
+++ b/src/plugins/dkim_check.c
@@ -38,14 +38,12 @@
  */
 
 #include "config.h"
+#include "libmime/message.h"
+#include "libmime/expressions.h"
+#include "libserver/dkim.h"
+#include "libutil/hash.h"
+#include "libutil/map.h"
 #include "main.h"
-#include "message.h"
-#include "cfg_file.h"
-#include "expressions.h"
-#include "util.h"
-#include "map.h"
-#include "dkim.h"
-#include "hash.h"
 
 #define DEFAULT_SYMBOL_REJECT "R_DKIM_REJECT"
 #define DEFAULT_SYMBOL_TEMPFAIL "R_DKIM_TEMPFAIL"
diff --git a/src/plugins/fuzzy_check.c b/src/plugins/fuzzy_check.c
index 0eddab3b3..3bac2f7b2 100644
--- a/src/plugins/fuzzy_check.c
+++ b/src/plugins/fuzzy_check.c
@@ -40,15 +40,13 @@
  */
 
 #include "config.h"
-#include "main.h"
-#include "message.h"
-#include "cfg_file.h"
-#include "expressions.h"
-#include "util.h"
-#include "map.h"
-#include "images.h"
+#include "libmime/message.h"
+#include "libmime/expressions.h"
+#include "libutil/map.h"
+#include "libmime/images.h"
 #include "fuzzy_storage.h"
 #include "utlist.h"
+#include "main.h"
 
 #define DEFAULT_SYMBOL "R_FUZZY_HASH"
 #define DEFAULT_UPSTREAM_ERROR_TIME 10
diff --git a/src/plugins/regexp.c b/src/plugins/regexp.c
index 76a8b8af5..6b5cda269 100644
--- a/src/plugins/regexp.c
+++ b/src/plugins/regexp.c
@@ -28,13 +28,11 @@
 
 
 #include "config.h"
-#include "main.h"
-#include "message.h"
-#include "cfg_file.h"
-#include "map.h"
-#include "util.h"
-#include "expressions.h"
+#include "libmime/message.h"
+#include "libmime/expressions.h"
+#include "libutil/map.h"
 #include "lua/lua_common.h"
+#include "main.h"
 
 #define DEFAULT_STATFILE_PREFIX "./"
 
diff --git a/src/plugins/spf.c b/src/plugins/spf.c
index 11303b33a..34eb69a25 100644
--- a/src/plugins/spf.c
+++ b/src/plugins/spf.c
@@ -33,14 +33,12 @@
  */
 
 #include "config.h"
+#include "libmime/message.h"
+#include "libmime/expressions.h"
+#include "libserver/spf.h"
+#include "libutil/hash.h"
+#include "libutil/map.h"
 #include "main.h"
-#include "message.h"
-#include "cfg_file.h"
-#include "expressions.h"
-#include "util.h"
-#include "map.h"
-#include "spf.h"
-#include "hash.h"
 
 #define DEFAULT_SYMBOL_FAIL "R_SPF_FAIL"
 #define DEFAULT_SYMBOL_SOFTFAIL "R_SPF_SOFTFAIL"
diff --git a/src/plugins/surbl.c b/src/plugins/surbl.c
index ee54cace8..9f961ab49 100644
--- a/src/plugins/surbl.c
+++ b/src/plugins/surbl.c
@@ -42,18 +42,15 @@
  */
 
 #include "config.h"
+#include "libmime/message.h"
+#include "libmime/expressions.h"
+#include "libutil/hash.h"
+#include "libutil/map.h"
 #include "main.h"
-#include "message.h"
-#include "cfg_file.h"
-#include "expressions.h"
-#include "util.h"
-#include "map.h"
-#include "dns.h"
-#include "hash.h"
-#include "utlist.h"
-
 #include "surbl.h"
 
+#include "utlist.h"
+
 static struct surbl_ctx *surbl_module_ctx = NULL;
 
 static void surbl_test_url (struct rspamd_task *task, void *user_data);
diff --git a/src/plugins/surbl.h b/src/plugins/surbl.h
index 1c97c2a4d..bde284cf2 100644
--- a/src/plugins/surbl.h
+++ b/src/plugins/surbl.h
@@ -2,9 +2,8 @@
 #define RSPAMD_MODULE_SURBL
 
 #include "config.h"
+#include "libutil/trie.h"
 #include "main.h"
-#include "cfg_file.h"
-#include "trie.h"
 
 #define DEFAULT_REDIRECTOR_PORT 8080
 #define DEFAULT_SURBL_WEIGHT 10
diff --git a/src/smtp.h b/src/smtp.h
index 4f549dda1..aa1651b12 100644
--- a/src/smtp.h
+++ b/src/smtp.h
@@ -2,9 +2,10 @@
 #define RSPAMD_SMTP_H
 
 #include "config.h"
+#include "libutil/upstream.h"
+#include "libmime/smtp_utils.h"
+#include "libmime/smtp_proto.h"
 #include "main.h"
-#include "upstream.h"
-#include "smtp_utils.h"
 
 struct rspamd_dns_resolver;
 
diff --git a/src/smtp_proxy.c b/src/smtp_proxy.c
index e992a4b37..43dfc567b 100644
--- a/src/smtp_proxy.c
+++ b/src/smtp_proxy.c
@@ -22,16 +22,10 @@
  */
 
 #include "config.h"
-#include "main.h"
-#include "cfg_file.h"
-#include "util.h"
-#include "smtp_proto.h"
-#include "map.h"
-#include "message.h"
-#include "dns.h"
-#include "upstream.h"
-#include "proxy.h"
 #include "utlist.h"
+#include "libserver/proxy.h"
+#include "main.h"
+#include "smtp.h"
 
 /*
  * SMTP proxy is a simple smtp proxy worker for dns resolving and
diff --git a/src/worker.c b/src/worker.c
index abf02938f..c562528a3 100644
--- a/src/worker.c
+++ b/src/worker.c
@@ -27,15 +27,15 @@
  */
 
 #include "config.h"
-#include "util.h"
+#include "libutil/util.h"
+#include "libutil/map.h"
+#include "libutil/upstream.h"
+#include "libserver/protocol.h"
+#include "libserver/cfg_file.h"
+#include "libserver/url.h"
+#include "libserver/dns.h"
+#include "libmime/message.h"
 #include "main.h"
-#include "protocol.h"
-#include "upstream.h"
-#include "cfg_file.h"
-#include "url.h"
-#include "message.h"
-#include "map.h"
-#include "dns.h"
 
 #include "lua/lua_common.h"