7 files changed, 10 insertions, 6 deletions
diff --git a/include/zbxrtc.h b/include/zbxrtc.h
index e6bd50dd8a5..50053cfcf64 100644
--- a/include/zbxrtc.h
+++ b/include/zbxrtc.h
@@ -20,6 +20,7 @@
 #ifndef ZABBIX_ZBXRTC_H
 #define ZABBIX_ZBXRTC_H
 
+#include "zbxalgo.h"
 #include "zbxipcservice.h"
 
 typedef struct
@@ -39,7 +40,7 @@ typedef struct
 }
 zbx_rtc_hook_t;
 
-ZBX_PTR_VECTOR_DECL(rtc_hook, zbx_rtc_hook_t *);
+ZBX_PTR_VECTOR_DECL(rtc_hook, zbx_rtc_hook_t *)
 
 typedef struct
 {
diff --git a/src/libs/zbxrtc/rtc.h b/src/libs/zbxrtc/rtc.h
index a4f48874bb3..f947f574425 100644
--- a/src/libs/zbxrtc/rtc.h
+++ b/src/libs/zbxrtc/rtc.h
@@ -20,6 +20,7 @@
 #ifndef ZABBIX_RTC_H
 #define ZABBIX_RTC_H
 
+#include "sysinc.h"
 #include "zbxtypes.h"
 #include "zbxrtc.h"
 
diff --git a/src/libs/zbxrtc/rtc_client.c b/src/libs/zbxrtc/rtc_client.c
index d275eb4e5ba..ca1561dabd7 100644
--- a/src/libs/zbxrtc/rtc_client.c
+++ b/src/libs/zbxrtc/rtc_client.c
@@ -17,9 +17,11 @@
 ** Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 **/
 
+#include "rtc.h"
+
+#include "common.h"
 #include "zbxserialize.h"
 #include "zbxjson.h"
-#include "rtc.h"
 #include "zbxself.h"
 #include "log.h"
 
diff --git a/src/libs/zbxrtc/rtc_proxy.c b/src/libs/zbxrtc/rtc_proxy.c
index 7164fc108b0..c102e353ca5 100644
--- a/src/libs/zbxrtc/rtc_proxy.c
+++ b/src/libs/zbxrtc/rtc_proxy.c
@@ -17,11 +17,11 @@
 ** Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 **/
 
+#include "rtc.h"
+
 #include "zbxtypes.h"
 #include "proxy.h"
 
-#include "rtc.h"
-
 extern int	CONFIG_PROXYMODE;
 
 int	rtc_parse_options_ex(const char *opt, zbx_uint32_t *code, char **data, char **error)
diff --git a/src/libs/zbxrtc/rtc_server.c b/src/libs/zbxrtc/rtc_server.c
index 24735235c77..610959f6156 100644
--- a/src/libs/zbxrtc/rtc_server.c
+++ b/src/libs/zbxrtc/rtc_server.c
@@ -23,7 +23,6 @@
 #include "zbxha.h"
 #include "zbxtypes.h"
 #include "common.h"
-#include "daemon.h"
 
 #include "rtc.h"
 #include "zbxservice.h"
diff --git a/src/zabbix_server/housekeeper/housekeeper.c b/src/zabbix_server/housekeeper/housekeeper.c
index 9f3211657ca..bba3113e052 100644
--- a/src/zabbix_server/housekeeper/housekeeper.c
+++ b/src/zabbix_server/housekeeper/housekeeper.c
@@ -26,6 +26,7 @@
 #include "zbxalgo.h"
 #include "zbxserver.h"
 #include "zbxrtc.h"
+#include "zbxipcservice.h"
 
 #include "history_compress.h"
 #include "../../libs/zbxdbcache/valuecache.h"
diff --git a/tests/libs/zbxeval/zbx_eval_execute.c b/tests/libs/zbxeval/zbx_eval_execute.c
index 1f65b10f4f8..97d58b01c1d 100644
--- a/tests/libs/zbxeval/zbx_eval_execute.c
+++ b/tests/libs/zbxeval/zbx_eval_execute.c
@@ -78,7 +78,7 @@ void	zbx_mock_test_entry(void **state)
 	if (SUCCEED == expected_ret)
 	{
 		/* use custom epsilon for floating point values to account for */
-		/* rounding differences with various sytems/libs               */
+		/* rounding differences with various systems/libs              */
 		if (ZBX_VARIANT_DBL == value.type)
 		{
 			double	expected_value;