diff --git a/alertik.c b/alertik.c
index 746f7e5..6c20ac9 100644
--- a/alertik.c
+++ b/alertik.c
@@ -4,19 +4,9 @@
  */
 
 #define _POSIX_C_SOURCE 200809L
-#include <errno.h>
-#include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
-#include <stdarg.h>
 #include <pthread.h>
-#include <unistd.h>
-#include <arpa/inet.h>
-#include <sys/socket.h>
-#include <sys/types.h>
-#include <sys/stat.h>
-#include <netinet/in.h>
-#include <netdb.h>
 
 #include "alertik.h"
 #include "events.h"
diff --git a/alertik.h b/alertik.h
index 8a2140d..8f2aa88 100644
--- a/alertik.h
+++ b/alertik.h
@@ -6,8 +6,6 @@
 #ifndef ALERTIK_H
 #define ALERTIK_H
 
-	#include <stdarg.h>
-	#include <stdlib.h>
 	#include <time.h>
 
 	#define MIN(a,b) (((a)<(b))?(a):(b))
diff --git a/env_events.c b/env_events.c
index ad650c7..d530734 100644
--- a/env_events.c
+++ b/env_events.c
@@ -7,7 +7,10 @@
 #include <errno.h>
 #include <limits.h>
 #include <stdio.h>
+#include <stdlib.h>
 #include <string.h>
+
+#include "log.h"
 #include "env_events.h"
 #include "alertik.h"
 #include "notifiers.h"
diff --git a/env_events.h b/env_events.h
index 6f8e0bd..ee2bf42 100644
--- a/env_events.h
+++ b/env_events.h
@@ -6,8 +6,6 @@
 #ifndef ENV_EVENTS_H
 #define ENV_EVENTS_H
 
-	#include "events.h"
-
 	#define MAX_ENV_EVENTS  16
 
 	struct env_event {
diff --git a/log.c b/log.c
index 23ac3e7..ab7e754 100644
--- a/log.c
+++ b/log.c
@@ -3,18 +3,15 @@
  * This is free and unencumbered software released into the public domain.
  */
 
-#include <ctype.h>
-#include <errno.h>
 #include <fcntl.h>
-#include <limits.h>
 #include <pthread.h>
 #include <unistd.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <stdarg.h>
-#include <string.h>
 #include <sys/types.h>
 #include <sys/stat.h>
+#include <time.h>
 
 #include "events.h"
 #include "log.h"
diff --git a/log.h b/log.h
index d9391e7..66b961e 100644
--- a/log.h
+++ b/log.h
@@ -6,7 +6,10 @@
 #ifndef LOG_H
 #define LOG_H
 
-	#include "events.h"
+	#include <errno.h>
+	#include <stdlib.h>
+	#include <sys/types.h>
+	struct log_event;
 
 	/* Uncomment/comment to enable/disable the following settings. */
 	// #define USE_FILE_AS_LOG           /* stdout if commented. */
diff --git a/notifiers.c b/notifiers.c
index c0d8956..47baec1 100644
--- a/notifiers.c
+++ b/notifiers.c
@@ -3,14 +3,12 @@
  * This is free and unencumbered software released into the public domain.
  */
 
-#include <ctype.h>
-#include <errno.h>
-#include <limits.h>
 #include <stdio.h>
-#include <string.h>
-
+#include <stdlib.h>
+#include <time.h>
 #include <curl/curl.h>
 
+#include "log.h"
 #include "notifiers.h"
 #include "alertik.h"
 
diff --git a/syslog.c b/syslog.c
index 7fa9be1..d40784d 100644
--- a/syslog.c
+++ b/syslog.c
@@ -3,22 +3,15 @@
  * This is free and unencumbered software released into the public domain.
  */
 
-#include <ctype.h>
-#include <errno.h>
-#include <fcntl.h>
-#include <limits.h>
 #include <pthread.h>
-#include <unistd.h>
 #include <stdio.h>
-#include <stdlib.h>
-#include <stdarg.h>
 #include <string.h>
 #include <sys/types.h>
-#include <sys/stat.h>
 #include <sys/socket.h>
 #include <netinet/in.h>
+#include <time.h>
 
-
+#include "events.h"
 #include "log.h"
 #include "syslog.h"
 
diff --git a/syslog.h b/syslog.h
index d73f6c4..9953acf 100644
--- a/syslog.h
+++ b/syslog.h
@@ -6,6 +6,8 @@
 #ifndef SYSLOG_H
 #define SYSLOG_H
 
+	struct log_event;
+
 	#define FIFO_MAX    64
 	#define SYSLOG_PORT 5140