Reorganize includes to reduce namespace pollution.

14 files changed, 30 insertions, 1 deletions

diff --git a/src/libserver/buffer.c b/src/libserver/buffer.c
index 0875de300..4b8e3a3e5 100644
--- a/src/libserver/buffer.c
+++ b/src/libserver/buffer.c
@@ -25,6 +25,7 @@
 #include "config.h"
 #include "buffer.h"
 #include "rspamd.h"
+#include "unix-std.h"
 #ifdef HAVE_SYS_SENDFILE_H
 #include <sys/sendfile.h>
 #endif
diff --git a/src/libserver/cfg_rcl.c b/src/libserver/cfg_rcl.c
index f50b37010..57674aae3 100644
--- a/src/libserver/cfg_rcl.c
+++ b/src/libserver/cfg_rcl.c
@@ -31,6 +31,15 @@
 #include "expression.h"
 #include "composites.h"
 #include "libserver/worker_util.h"
+#include "unix-std.h"
+
+#ifdef HAVE_SYSLOG_H
+#include <syslog.h>
+#endif
+
+#ifdef HAVE_GLOB_H
+#include <glob.h>
+#endif
 
 struct rspamd_rcl_default_handler_data {
 	struct rspamd_rcl_struct_parser pd;
@@ -103,6 +112,7 @@ rspamd_rcl_logging_handler (rspamd_mempool_t *pool, const ucl_object_t *obj,
 		}
 		else if (g_ascii_strcasecmp (log_type, "syslog") == 0) {
 			/* Need to get facility */
+#ifdef HAVE_SYSLOG_H
 			cfg->log_facility = LOG_DAEMON;
 			cfg->log_type = RSPAMD_LOG_SYSLOG;
 			val = ucl_object_find_key (obj, "facility");
@@ -168,6 +178,7 @@ rspamd_rcl_logging_handler (rspamd_mempool_t *pool, const ucl_object_t *obj,
 					return FALSE;
 				}
 			}
+#endif
 		}
 		else if (g_ascii_strcasecmp (log_type,
 			"stderr") == 0 || g_ascii_strcasecmp (log_type, "console") == 0) {
diff --git a/src/libserver/cfg_utils.c b/src/libserver/cfg_utils.c
index 95c984b9c..5e3bf1561 100644
--- a/src/libserver/cfg_utils.c
+++ b/src/libserver/cfg_utils.c
@@ -34,6 +34,8 @@
 #include "dynamic_cfg.h"
 #include "utlist.h"
 #include "stat_api.h"
+#include "unix-std.h"
+#include <math.h>
 
 #define DEFAULT_SCORE 10.0
 
diff --git a/src/libserver/dynamic_cfg.c b/src/libserver/dynamic_cfg.c
index eaa658b8b..cbb7913a4 100644
--- a/src/libserver/dynamic_cfg.c
+++ b/src/libserver/dynamic_cfg.c
@@ -26,6 +26,7 @@
 #include "map.h"
 #include "filter.h"
 #include "dynamic_cfg.h"
+#include "unix-std.h"
 
 struct config_json_buf {
 	GString *buf;
diff --git a/src/libserver/fuzzy_backend.c b/src/libserver/fuzzy_backend.c
index af6eb193d..41363ae13 100644
--- a/src/libserver/fuzzy_backend.c
+++ b/src/libserver/fuzzy_backend.c
@@ -24,6 +24,7 @@
 #include "config.h"
 #include "rspamd.h"
 #include "fuzzy_backend.h"
+#include "unix-std.h"
 
 #include <sqlite3.h>
 
diff --git a/src/libserver/proxy.c b/src/libserver/proxy.c
index 09171eeb9..2eff2b08e 100644
--- a/src/libserver/proxy.c
+++ b/src/libserver/proxy.c
@@ -24,6 +24,7 @@
 #include "config.h"
 #include "rspamd.h"
 #include "proxy.h"
+#include "unix-std.h"
 
 static void rspamd_proxy_backend_handler (gint fd, gshort what, gpointer data);
 static void rspamd_proxy_client_handler (gint fd, gshort what, gpointer data);
diff --git a/src/libserver/proxy.h b/src/libserver/proxy.h
index 784a78dbc..a372f30e0 100644
--- a/src/libserver/proxy.h
+++ b/src/libserver/proxy.h
@@ -27,6 +27,7 @@
 
 #include "config.h"
 #include "buffer.h"
+#include <event.h>
 
 /**
  * @file proxy.h
diff --git a/src/libserver/roll_history.c b/src/libserver/roll_history.c
index 74c7c8214..6c48fc224 100644
--- a/src/libserver/roll_history.c
+++ b/src/libserver/roll_history.c
@@ -26,6 +26,7 @@
 #include "config.h"
 #include "rspamd.h"
 #include "roll_history.h"
+#include "unix-std.h"
 
 static const gchar rspamd_history_magic[] = {'r', 's', 'h', '1'};
 
diff --git a/src/libserver/spf.h b/src/libserver/spf.h
index 473eff086..cdb7a0434 100644
--- a/src/libserver/spf.h
+++ b/src/libserver/spf.h
@@ -3,6 +3,7 @@
 
 #include "config.h"
 #include "ref.h"
+#include "addr.h"
 
 struct rspamd_task;
 struct spf_resolved;
diff --git a/src/libserver/symbols_cache.c b/src/libserver/symbols_cache.c
index eaa4dce03..5e72eb97c 100644
--- a/src/libserver/symbols_cache.c
+++ b/src/libserver/symbols_cache.c
@@ -29,6 +29,8 @@
 #include "symbols_cache.h"
 #include "cfg_file.h"
 #include "lua/lua_common.h"
+#include "unix-std.h"
+#include <math.h>
 
 #define msg_err_cache(...) rspamd_default_log_function (G_LOG_LEVEL_CRITICAL, \
         cache->static_pool->tag.tagname, cache->cfg->checksum, \
diff --git a/src/libserver/symbols_cache.h b/src/libserver/symbols_cache.h
index f6fffcc08..95f292243 100644
--- a/src/libserver/symbols_cache.h
+++ b/src/libserver/symbols_cache.h
@@ -28,7 +28,7 @@
 #include "config.h"
 #include "ucl.h"
 #include <lua.h>
-#define MAX_SYMBOL 128
+#include <event.h>
 
 struct rspamd_task;
 struct rspamd_config;
diff --git a/src/libserver/task.c b/src/libserver/task.c
index 6dd00b8bf..eaf845949 100644
--- a/src/libserver/task.c
+++ b/src/libserver/task.c
@@ -29,6 +29,7 @@
 #include "lua/lua_common.h"
 #include "composites.h"
 #include "stat_api.h"
+#include "unix-std.h"
 
 static GQuark
 rspamd_task_quark (void)
diff --git a/src/libserver/task.h b/src/libserver/task.h
index 02f6f9ea0..ee57c0f93 100644
--- a/src/libserver/task.h
+++ b/src/libserver/task.h
@@ -30,6 +30,8 @@
 #include "mem_pool.h"
 #include "dns.h"
 
+#include <gmime/gmime.h>
+
 enum rspamd_command {
 	CMD_CHECK,
 	CMD_SYMBOLS,
diff --git a/src/libserver/worker_util.c b/src/libserver/worker_util.c
index ddd72acb9..71656116a 100644
--- a/src/libserver/worker_util.c
+++ b/src/libserver/worker_util.c
@@ -26,6 +26,10 @@
 #include "message.h"
 #include "lua/lua_common.h"
 #include "worker_util.h"
+#include "unix-std.h"
+#ifdef WITH_GPERF_TOOLS
+#include <google/profiler.h>
+#endif
 
 /**
  * Return worker's control structure by its type