diff --git a/include/modules/account.h b/include/modules/account.h
index c543a7725..c5a40a7a1 100644
--- a/include/modules/account.h
+++ b/include/modules/account.h
@@ -24,11 +24,6 @@
 
 #pragma once
 
-#include <map>
-#include <string>
-
-#include "event.h"
-
 typedef StringExtItem AccountExtItem;
 
 inline AccountExtItem* GetAccountExtItem()
diff --git a/include/modules/away.h b/include/modules/away.h
index 9e81d14a2..c6f3b94d1 100644
--- a/include/modules/away.h
+++ b/include/modules/away.h
@@ -19,8 +19,6 @@
 
 #pragma once
 
-#include "event.h"
-
 namespace Away
 {
 	class EventListener;
diff --git a/include/modules/cap.h b/include/modules/cap.h
index 3404a2d18..77145acd6 100644
--- a/include/modules/cap.h
+++ b/include/modules/cap.h
@@ -20,8 +20,6 @@
 
 #pragma once
 
-#include "event.h"
-
 namespace Cap
 {
 	static constexpr unsigned int MAX_CAPS = (sizeof(intptr_t) * 8) - 1;
diff --git a/include/modules/ctctags.h b/include/modules/ctctags.h
index b58506a1d..c6724ed13 100644
--- a/include/modules/ctctags.h
+++ b/include/modules/ctctags.h
@@ -19,7 +19,6 @@
 
 #pragma once
 
-#include "event.h"
 #include "modules/cap.h"
 
 namespace CTCTags
diff --git a/include/modules/exemption.h b/include/modules/exemption.h
index c1acfe223..4c76762be 100644
--- a/include/modules/exemption.h
+++ b/include/modules/exemption.h
@@ -19,8 +19,6 @@
 
 #pragma once
 
-#include "event.h"
-
 namespace CheckExemption
 {
 	class EventListener;
diff --git a/include/modules/extban.h b/include/modules/extban.h
index f716e82f6..635c07557 100644
--- a/include/modules/extban.h
+++ b/include/modules/extban.h
@@ -19,8 +19,6 @@
 
 #pragma once
 
-#include "event.h"
-
 namespace ExtBan
 {
 	class Acting;
diff --git a/include/modules/hash.h b/include/modules/hash.h
index 249d2fcd1..9c5370366 100644
--- a/include/modules/hash.h
+++ b/include/modules/hash.h
@@ -24,8 +24,6 @@
 
 #pragma once
 
-#include "modules.h"
-
 class HashProvider
 	: public DataProvider
 {
diff --git a/include/modules/httpd.h b/include/modules/httpd.h
index 23b40a485..6874e16b0 100644
--- a/include/modules/httpd.h
+++ b/include/modules/httpd.h
@@ -26,13 +26,6 @@
 
 #pragma once
 
-#include "base.h"
-#include "event.h"
-
-#include <string>
-#include <sstream>
-#include <map>
-
 class HTTPQueryParameters final
 	: public insp::flat_multimap<std::string, std::string>
 {
diff --git a/include/modules/ircv3_batch.h b/include/modules/ircv3_batch.h
index 30d3cb94d..2584f6f6a 100644
--- a/include/modules/ircv3_batch.h
+++ b/include/modules/ircv3_batch.h
@@ -20,7 +20,6 @@
 
 #pragma once
 
-// For CapReference
 #include "modules/cap.h"
 
 namespace IRCv3
diff --git a/include/modules/isupport.h b/include/modules/isupport.h
index 3e23caddf..db9424f34 100644
--- a/include/modules/isupport.h
+++ b/include/modules/isupport.h
@@ -19,8 +19,6 @@
 
 #pragma once
 
-#include "event.h"
-
 namespace ISupport
 {
 	class EventListener;
diff --git a/include/modules/names.h b/include/modules/names.h
index 4f1d940bd..5b0ad410c 100644
--- a/include/modules/names.h
+++ b/include/modules/names.h
@@ -19,8 +19,6 @@
 
 #pragma once
 
-#include "event.h"
-
 namespace Names
 {
 	class EventListener;
diff --git a/include/modules/regex.h b/include/modules/regex.h
index 5964f5a2f..2fc0b2b4a 100644
--- a/include/modules/regex.h
+++ b/include/modules/regex.h
@@ -25,8 +25,6 @@
 
 #pragma once
 
-#include "event.h"
-
 namespace Regex
 {
 	class Engine;
diff --git a/include/modules/reload.h b/include/modules/reload.h
index 2f3022816..fb10fe355 100644
--- a/include/modules/reload.h
+++ b/include/modules/reload.h
@@ -19,8 +19,6 @@
 
 #pragma once
 
-#include "event.h"
-
 namespace ReloadModule
 {
 	class EventListener;
diff --git a/include/modules/server.h b/include/modules/server.h
index e56b3e0dc..e3c701a61 100644
--- a/include/modules/server.h
+++ b/include/modules/server.h
@@ -23,8 +23,6 @@
 
 #pragma once
 
-#include "event.h"
-
 namespace ServerProtocol
 {
 	class BroadcastEventListener;
diff --git a/include/modules/ssl.h b/include/modules/ssl.h
index 837f4eda0..4b1c8f1ac 100644
--- a/include/modules/ssl.h
+++ b/include/modules/ssl.h
@@ -28,7 +28,6 @@
 
 #pragma once
 
-#include <string>
 #include "iohook.h"
 
 /** ssl_cert is a class which abstracts TLS certificate
diff --git a/include/modules/stats.h b/include/modules/stats.h
index 7244c8761..f4e1a377b 100644
--- a/include/modules/stats.h
+++ b/include/modules/stats.h
@@ -20,8 +20,6 @@
 
 #pragma once
 
-#include "event.h"
-
 namespace Stats
 {
 	class Context;
diff --git a/include/modules/webirc.h b/include/modules/webirc.h
index e20edd860..6f18a3d80 100644
--- a/include/modules/webirc.h
+++ b/include/modules/webirc.h
@@ -19,8 +19,6 @@
 
 #pragma once
 
-#include "event.h"
-
 namespace WebIRC
 {
 	class EventListener;
diff --git a/include/modules/who.h b/include/modules/who.h
index 779cb6ca5..d7a259f30 100644
--- a/include/modules/who.h
+++ b/include/modules/who.h
@@ -20,8 +20,6 @@
 
 #pragma once
 
-#include "event.h"
-
 namespace Who
 {
 	class EventListener;
diff --git a/include/modules/whois.h b/include/modules/whois.h
index 02f613e53..ad16cb64c 100644
--- a/include/modules/whois.h
+++ b/include/modules/whois.h
@@ -20,8 +20,6 @@
 
 #pragma once
 
-#include "event.h"
-
 namespace Whois
 {
 	class EventListener;