Fix some problematic includes.

7 files changed, 28 insertions, 41 deletions

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