diff --git a/modules/adminlog.cpp b/modules/adminlog.cpp
index 930bf7793d..cf196a7130 100644
--- a/modules/adminlog.cpp
+++ b/modules/adminlog.cpp
@@ -6,7 +6,6 @@
  * by the Free Software Foundation.
  */
 
-#include <znc/Client.h>
 #include <znc/FileUtils.h>
 #include <znc/Server.h>
 #include <znc/IRCNetwork.h>
diff --git a/modules/autoattach.cpp b/modules/autoattach.cpp
index 97d74ca06c..26bd96ee07 100644
--- a/modules/autoattach.cpp
+++ b/modules/autoattach.cpp
@@ -8,7 +8,6 @@
 
 #include <znc/Chan.h>
 #include <znc/Modules.h>
-#include <znc/User.h>
 
 using std::vector;
 
diff --git a/modules/autocycle.cpp b/modules/autocycle.cpp
index 3b50b7b5c6..837704001d 100644
--- a/modules/autocycle.cpp
+++ b/modules/autocycle.cpp
@@ -7,7 +7,6 @@
  */
 
 #include <znc/Chan.h>
-#include <znc/User.h>
 #include <znc/IRCNetwork.h>
 
 using std::vector;
diff --git a/modules/autoreply.cpp b/modules/autoreply.cpp
index e4b3f736e6..a5f6695e2a 100644
--- a/modules/autoreply.cpp
+++ b/modules/autoreply.cpp
@@ -7,10 +7,8 @@
  * by the Free Software Foundation.
  */
 
-#include <znc/Modules.h>
 #include <znc/IRCNetwork.h>
 #include <znc/IRCSock.h>
-#include <znc/User.h>
 
 class CAutoReplyMod : public CModule {
 public:
diff --git a/modules/autovoice.cpp b/modules/autovoice.cpp
index fa7b3f3298..77b8d0bc60 100644
--- a/modules/autovoice.cpp
+++ b/modules/autovoice.cpp
@@ -7,7 +7,6 @@
  */
 
 #include <znc/Modules.h>
-#include <znc/User.h>
 #include <znc/Chan.h>
 
 using std::map;
diff --git a/modules/awaynick.cpp b/modules/awaynick.cpp
index c21092b7f2..5bcad8b255 100644
--- a/modules/awaynick.cpp
+++ b/modules/awaynick.cpp
@@ -8,7 +8,6 @@
 
 // @todo handle raw 433 (nick in use)
 #include <znc/IRCSock.h>
-#include <znc/User.h>
 #include <znc/IRCNetwork.h>
 
 class CAwayNickMod;
diff --git a/modules/awaystore.cpp b/modules/awaystore.cpp
index 267697bf2e..81051271b7 100644
--- a/modules/awaystore.cpp
+++ b/modules/awaystore.cpp
@@ -16,11 +16,9 @@
 
 #define REQUIRESSL
 
-#include <znc/Client.h>
 #include <znc/User.h>
 #include <znc/IRCNetwork.h>
 #include <znc/FileUtils.h>
-#include <sys/stat.h>
 
 using std::vector;
 using std::map;
diff --git a/modules/blockuser.cpp b/modules/blockuser.cpp
index 4b5e15d399..6d1e80fd1e 100644
--- a/modules/blockuser.cpp
+++ b/modules/blockuser.cpp
@@ -8,8 +8,6 @@
 
 #include <znc/User.h>
 #include <znc/IRCNetwork.h>
-#include <znc/IRCSock.h>
-#include <znc/znc.h>
 
 using std::vector;
 
diff --git a/modules/bouncedcc.cpp b/modules/bouncedcc.cpp
index e0605956d1..75bc53c0c6 100644
--- a/modules/bouncedcc.cpp
+++ b/modules/bouncedcc.cpp
@@ -6,13 +6,8 @@
  * by the Free Software Foundation.
  */
 
-#include <znc/zncconfig.h>
-#include <znc/znc.h>
 #include <znc/User.h>
 #include <znc/IRCNetwork.h>
-#include <znc/Modules.h>
-#include <znc/Socket.h>
-#include <znc/FileUtils.h>
 
 using std::set;
 
diff --git a/modules/buffextras.cpp b/modules/buffextras.cpp
index e6dc717687..796c52b74a 100644
--- a/modules/buffextras.cpp
+++ b/modules/buffextras.cpp
@@ -7,9 +7,7 @@
  */
 
 #include <znc/Chan.h>
-#include <znc/User.h>
 #include <znc/IRCNetwork.h>
-#include <znc/Modules.h>
 
 using std::vector;
 
diff --git a/modules/certauth.cpp b/modules/certauth.cpp
index e893349cd3..3128a2aa55 100644
--- a/modules/certauth.cpp
+++ b/modules/certauth.cpp
@@ -8,9 +8,7 @@
 
 #define REQUIRESSL
 
-#include <znc/Modules.h>
 #include <znc/User.h>
-#include <znc/Listener.h>
 #include <znc/znc.h>
 
 using std::map;
diff --git a/modules/chansaver.cpp b/modules/chansaver.cpp
index c29ee37e6a..394c7dbe2f 100644
--- a/modules/chansaver.cpp
+++ b/modules/chansaver.cpp
@@ -9,7 +9,6 @@
 #include <znc/Chan.h>
 #include <znc/User.h>
 #include <znc/IRCNetwork.h>
-#include <znc/znc.h>
 
 using std::vector;
 
diff --git a/modules/clearbufferonmsg.cpp b/modules/clearbufferonmsg.cpp
index de6da2e456..c871814688 100644
--- a/modules/clearbufferonmsg.cpp
+++ b/modules/clearbufferonmsg.cpp
@@ -8,7 +8,6 @@
 
 #include <znc/IRCNetwork.h>
 #include <znc/Chan.h>
-#include <znc/Modules.h>
 
 using std::vector;
 
diff --git a/modules/controlpanel.cpp b/modules/controlpanel.cpp
index 90e29b1c79..6f99a90b68 100644
--- a/modules/controlpanel.cpp
+++ b/modules/controlpanel.cpp
@@ -9,10 +9,8 @@
  * by the Free Software Foundation.
  */
 
-#include <znc/znc.h>
 #include <znc/User.h>
 #include <znc/IRCNetwork.h>
-#include <znc/Modules.h>
 #include <znc/Chan.h>
 #include <znc/IRCSock.h>
 
diff --git a/modules/cyrusauth.cpp b/modules/cyrusauth.cpp
index c7690bf995..43831cb1dc 100644
--- a/modules/cyrusauth.cpp
+++ b/modules/cyrusauth.cpp
@@ -11,7 +11,6 @@
  * @brief SASL authentication module for znc.
  */
 
-#include <znc/Modules.h>
 #include <znc/znc.h>
 #include <znc/User.h>
 
diff --git a/modules/dcc.cpp b/modules/dcc.cpp
index 07dd3d4200..974e57632e 100644
--- a/modules/dcc.cpp
+++ b/modules/dcc.cpp
@@ -7,9 +7,7 @@
  */
 
 #include <znc/znc.h>
-#include <znc/Chan.h>
 #include <znc/User.h>
-#include <znc/Modules.h>
 #include <znc/FileUtils.h>
 
 using std::set;
diff --git a/modules/disconkick.cpp b/modules/disconkick.cpp
index d4c0ee1d34..47b1d6c1f8 100644
--- a/modules/disconkick.cpp
+++ b/modules/disconkick.cpp
@@ -6,7 +6,6 @@
  * by the Free Software Foundation.
  */
 
-#include <znc/Modules.h>
 #include <znc/IRCNetwork.h>
 #include <znc/Chan.h>
 
diff --git a/modules/flooddetach.cpp b/modules/flooddetach.cpp
index 4b50affaa9..9775ae22b8 100644
--- a/modules/flooddetach.cpp
+++ b/modules/flooddetach.cpp
@@ -7,8 +7,6 @@
  */
 
 #include <znc/Chan.h>
-#include <znc/Modules.h>
-#include <znc/User.h>
 #include <znc/IRCNetwork.h>
 
 using std::map;
diff --git a/modules/identfile.cpp b/modules/identfile.cpp
index 6d84bcf035..e341beb303 100644
--- a/modules/identfile.cpp
+++ b/modules/identfile.cpp
@@ -10,7 +10,6 @@
 #include <znc/IRCSock.h>
 #include <znc/User.h>
 #include <znc/IRCNetwork.h>
-#include <znc/znc.h>
 
 class CIdentFileModule : public CModule {
 	CString m_sOrigISpoof;
diff --git a/modules/imapauth.cpp b/modules/imapauth.cpp
index faf4061602..abfc72e903 100644
--- a/modules/imapauth.cpp
+++ b/modules/imapauth.cpp
@@ -6,7 +6,6 @@
  * by the Free Software Foundation.
  */
 
-#include <znc/Modules.h>
 #include <znc/znc.h>
 
 using std::map;
diff --git a/modules/keepnick.cpp b/modules/keepnick.cpp
index 2c211bc3a8..ad40b1fe6c 100644
--- a/modules/keepnick.cpp
+++ b/modules/keepnick.cpp
@@ -6,8 +6,6 @@
  * by the Free Software Foundation.
  */
 
-#include <znc/Modules.h>
-#include <znc/User.h>
 #include <znc/IRCNetwork.h>
 #include <znc/IRCSock.h>
 
diff --git a/modules/lastseen.cpp b/modules/lastseen.cpp
index 2bf4bf455f..11f0a03ce6 100644
--- a/modules/lastseen.cpp
+++ b/modules/lastseen.cpp
@@ -7,7 +7,6 @@
  */
 
 #include <znc/User.h>
-#include <znc/Chan.h>
 #include <znc/znc.h>
 
 using std::map;
diff --git a/modules/listsockets.cpp b/modules/listsockets.cpp
index 3546e4acf5..1d9df238af 100644
--- a/modules/listsockets.cpp
+++ b/modules/listsockets.cpp
@@ -6,10 +6,8 @@
  * by the Free Software Foundation.
  */
 
-#include <znc/Modules.h>
 #include <znc/User.h>
 #include <znc/znc.h>
-#include <queue>
 
 class CSocketSorter {
 public:
diff --git a/modules/modtcl.cpp b/modules/modtcl.cpp
index bfb00adf03..9a20af6d3b 100644
--- a/modules/modtcl.cpp
+++ b/modules/modtcl.cpp
@@ -8,11 +8,9 @@
 
 #include <znc/Chan.h>
 #include <znc/IRCSock.h>
-#include <znc/Modules.h>
 #include <znc/Server.h>
 #include <znc/User.h>
 #include <znc/IRCNetwork.h>
-#include <znc/znc.h>
 
 #include <tcl.h>
 
diff --git a/modules/notes.cpp b/modules/notes.cpp
index c0471d6cac..5d2880a42d 100644
--- a/modules/notes.cpp
+++ b/modules/notes.cpp
@@ -6,14 +6,7 @@
  * by the Free Software Foundation.
  */
 
-#include <znc/Chan.h>
-#include <znc/HTTPSock.h>
-#include <znc/Server.h>
-#include <znc/Template.h>
-#include <znc/User.h>
 #include <znc/znc.h>
-#include <znc/WebModules.h>
-#include <sstream>
 
 using std::stringstream;
 
diff --git a/modules/partyline.cpp b/modules/partyline.cpp
index 5540f35cdb..adb7d18d85 100644
--- a/modules/partyline.cpp
+++ b/modules/partyline.cpp
@@ -7,7 +7,6 @@
  */
 
 #include <znc/User.h>
-#include <znc/znc.h>
 #include <znc/IRCNetwork.h>
 
 using std::set;
diff --git a/modules/perform.cpp b/modules/perform.cpp
index 1f443426df..50a4edbee5 100644
--- a/modules/perform.cpp
+++ b/modules/perform.cpp
@@ -6,9 +6,7 @@
  * by the Free Software Foundation.
  */
 
-#include <znc/User.h>
 #include <znc/IRCNetwork.h>
-#include <algorithm>
 
 class CPerform : public CModule {
 	void Add(const CString& sCommand) {
diff --git a/modules/q.cpp b/modules/q.cpp
index fc3bcdea43..b859fd555e 100644
--- a/modules/q.cpp
+++ b/modules/q.cpp
@@ -6,11 +6,9 @@
  * by the Free Software Foundation.
  */
 
-#include <znc/Modules.h>
 #include <znc/User.h>
 #include <znc/IRCNetwork.h>
 #include <znc/IRCSock.h>
-#include <znc/Nick.h>
 #include <znc/Chan.h>
 
 using std::set;
diff --git a/modules/raw.cpp b/modules/raw.cpp
index 242c132b38..bc528ddc6d 100644
--- a/modules/raw.cpp
+++ b/modules/raw.cpp
@@ -7,7 +7,6 @@
  */
 
 #include <znc/Modules.h>
-#include <znc/User.h>
 
 class CRawMod : public CModule {
 public:
diff --git a/modules/route_replies.cpp b/modules/route_replies.cpp
index bd8889f9de..ae26a54d81 100644
--- a/modules/route_replies.cpp
+++ b/modules/route_replies.cpp
@@ -6,7 +6,6 @@
  * by the Free Software Foundation.
  */
 
-#include <znc/znc.h>
 #include <znc/IRCNetwork.h>
 #include <znc/IRCSock.h>
 
diff --git a/modules/sample.cpp b/modules/sample.cpp
index b3b4aa33d4..d82ac77ab4 100644
--- a/modules/sample.cpp
+++ b/modules/sample.cpp
@@ -8,7 +8,6 @@
 
 #include <znc/Client.h>
 #include <znc/Chan.h>
-#include <znc/User.h>
 #include <znc/Modules.h>
 
 using std::vector;
diff --git a/modules/sasl.cpp b/modules/sasl.cpp
index ebc9a6232b..cd833f7f01 100644
--- a/modules/sasl.cpp
+++ b/modules/sasl.cpp
@@ -6,7 +6,6 @@
  * by the Free Software Foundation.
  */
 
-#include <znc/Modules.h>
 #include <znc/IRCNetwork.h>
 #include <znc/IRCSock.h>
 
diff --git a/modules/savebuff.cpp b/modules/savebuff.cpp
index 45b7bc98b0..2171904c66 100644
--- a/modules/savebuff.cpp
+++ b/modules/savebuff.cpp
@@ -16,10 +16,8 @@
 
 #include <znc/Chan.h>
 #include <znc/User.h>
-#include <znc/Buffer.h>
 #include <znc/IRCNetwork.h>
 #include <znc/FileUtils.h>
-#include <sys/stat.h>
 
 using std::vector;
 
diff --git a/modules/schat.cpp b/modules/schat.cpp
index f7cc72aea4..c69442e091 100644
--- a/modules/schat.cpp
+++ b/modules/schat.cpp
@@ -14,8 +14,6 @@
 #include <znc/FileUtils.h>
 #include <znc/User.h>
 #include <znc/IRCNetwork.h>
-#include <znc/znc.h>
-#include <sstream>
 
 using std::pair;
 using std::stringstream;
diff --git a/modules/send_raw.cpp b/modules/send_raw.cpp
index 5cefe70890..d436e22f90 100644
--- a/modules/send_raw.cpp
+++ b/modules/send_raw.cpp
@@ -8,7 +8,6 @@
 
 #include <znc/User.h>
 #include <znc/IRCNetwork.h>
-#include <znc/znc.h>
 
 using std::vector;
 using std::map;
diff --git a/modules/watch.cpp b/modules/watch.cpp
index 2f8d9f0233..f4c110d223 100644
--- a/modules/watch.cpp
+++ b/modules/watch.cpp
@@ -7,10 +7,7 @@
  */
 
 #include <znc/Chan.h>
-#include <znc/User.h>
 #include <znc/IRCNetwork.h>
-#include <list>
-#include <set>
 
 using std::list;
 using std::vector;
diff --git a/modules/webadmin.cpp b/modules/webadmin.cpp
index fad9d79396..8a56195c28 100644
--- a/modules/webadmin.cpp
+++ b/modules/webadmin.cpp
@@ -7,18 +7,10 @@
  */
 
 #include <znc/Chan.h>
-#include <znc/HTTPSock.h>
 #include <znc/Server.h>
-#include <znc/Template.h>
 #include <znc/User.h>
-#include <znc/znc.h>
-#include <znc/WebModules.h>
-#include <znc/ZNCString.h>
-#include <znc/Listener.h>
 #include <znc/IRCNetwork.h>
 #include <znc/IRCSock.h>
-#include <sstream>
-#include <utility>
 
 using std::stringstream;
 using std::make_pair;
diff --git a/src/Buffer.cpp b/src/Buffer.cpp
index ddc0a42af8..8e5bd73721 100644
--- a/src/Buffer.cpp
+++ b/src/Buffer.cpp
@@ -6,9 +6,7 @@
  * by the Free Software Foundation.
  */
 
-#include <znc/Buffer.h>
 #include <znc/znc.h>
-#include <znc/Client.h>
 #include <znc/User.h>
 
 CBufLine::CBufLine(const CString& sFormat, const CString& sText, const timeval* ts) {
diff --git a/src/Chan.cpp b/src/Chan.cpp
index f0bc26ab1e..c7be322c7b 100644
--- a/src/Chan.cpp
+++ b/src/Chan.cpp
@@ -7,11 +7,9 @@
  */
 
 #include <znc/Chan.h>
-#include <znc/FileUtils.h>
 #include <znc/IRCSock.h>
 #include <znc/User.h>
 #include <znc/IRCNetwork.h>
-#include <znc/znc.h>
 #include <znc/Config.h>
 
 using std::set;
diff --git a/src/Client.cpp b/src/Client.cpp
index fb8ce34e21..666dfe521b 100644
--- a/src/Client.cpp
+++ b/src/Client.cpp
@@ -6,14 +6,10 @@
  * by the Free Software Foundation.
  */
 
-#include <znc/Client.h>
 #include <znc/Chan.h>
-#include <znc/FileUtils.h>
 #include <znc/IRCSock.h>
 #include <znc/User.h>
 #include <znc/IRCNetwork.h>
-#include <znc/znc.h>
-#include <znc/WebModules.h>
 
 using std::vector;
 
diff --git a/src/ClientCommand.cpp b/src/ClientCommand.cpp
index 417bde3501..c8a31c864e 100644
--- a/src/ClientCommand.cpp
+++ b/src/ClientCommand.cpp
@@ -6,15 +6,12 @@
  * by the Free Software Foundation.
  */
 
-#include <znc/Client.h>
 #include <znc/Chan.h>
 #include <znc/FileUtils.h>
 #include <znc/IRCNetwork.h>
 #include <znc/IRCSock.h>
-#include <znc/Listener.h>
 #include <znc/Server.h>
 #include <znc/User.h>
-#include <znc/znc.h>
 
 using std::vector;
 using std::set;
diff --git a/src/Csocket.cpp b/src/Csocket.cpp
index 81c1d9b2ef..93482b128a 100644
--- a/src/Csocket.cpp
+++ b/src/Csocket.cpp
@@ -49,7 +49,6 @@
 #include <openssl/engine.h>
 #endif /* HAVE_LIBSSL */
 
-#include <list>
 
 #define CS_SRANDBUFFER 128
 
diff --git a/src/FileUtils.cpp b/src/FileUtils.cpp
index a8259aadfb..1a5afb1b3b 100644
--- a/src/FileUtils.cpp
+++ b/src/FileUtils.cpp
@@ -9,8 +9,6 @@
 #include <znc/FileUtils.h>
 #include <znc/ExecSock.h>
 #include <znc/Utils.h>
-#include <znc/ZNCDebug.h>
-#include <errno.h>
 #include <fcntl.h>
 #include <pwd.h>
 #include <sys/stat.h>
diff --git a/src/HTTPSock.cpp b/src/HTTPSock.cpp
index fb0e5ff0bb..92888b0b71 100644
--- a/src/HTTPSock.cpp
+++ b/src/HTTPSock.cpp
@@ -6,13 +6,9 @@
  * by the Free Software Foundation.
  */
 
-#include <znc/HTTPSock.h>
 #include <znc/FileUtils.h>
-#include <znc/Modules.h>
 #include <znc/znc.h>
 
-#include <sstream>
-#include <iomanip>
 
 using std::map;
 using std::set;
diff --git a/src/IRCNetwork.cpp b/src/IRCNetwork.cpp
index 7257ed68e1..334b2cda1a 100644
--- a/src/IRCNetwork.cpp
+++ b/src/IRCNetwork.cpp
@@ -7,15 +7,12 @@
  */
 
 #include <znc/IRCNetwork.h>
-#include <znc/Modules.h>
 #include <znc/User.h>
 #include <znc/FileUtils.h>
 #include <znc/Config.h>
-#include <znc/Client.h>
 #include <znc/IRCSock.h>
 #include <znc/Server.h>
 #include <znc/Chan.h>
-#include <znc/znc.h>
 
 using std::vector;
 using std::set;
diff --git a/src/IRCSock.cpp b/src/IRCSock.cpp
index c42acff7dc..9a6ae1fded 100644
--- a/src/IRCSock.cpp
+++ b/src/IRCSock.cpp
@@ -8,10 +8,8 @@
 
 #include <znc/IRCSock.h>
 #include <znc/Chan.h>
-#include <znc/Client.h>
 #include <znc/User.h>
 #include <znc/IRCNetwork.h>
-#include <znc/znc.h>
 #include <znc/Server.h>
 
 using std::set;
diff --git a/src/Listener.cpp b/src/Listener.cpp
index a8d3dd3f83..4fea68b55e 100644
--- a/src/Listener.cpp
+++ b/src/Listener.cpp
@@ -6,7 +6,6 @@
  * by the Free Software Foundation.
  */
 
-#include <znc/Listener.h>
 #include <znc/znc.h>
 
 CListener::~CListener() {
diff --git a/src/Nick.cpp b/src/Nick.cpp
index 3a6a064a89..ed24ba70b6 100644
--- a/src/Nick.cpp
+++ b/src/Nick.cpp
@@ -6,7 +6,6 @@
  * by the Free Software Foundation.
  */
 
-#include <znc/Nick.h>
 #include <znc/Chan.h>
 #include <znc/IRCSock.h>
 #include <znc/IRCNetwork.h>
diff --git a/src/Socket.cpp b/src/Socket.cpp
index 96aac70a68..2ac7da3989 100644
--- a/src/Socket.cpp
+++ b/src/Socket.cpp
@@ -6,11 +6,8 @@
  * by the Free Software Foundation.
  */
 
-#include <znc/Socket.h>
-#include <znc/Modules.h>
 #include <znc/User.h>
 #include <znc/IRCNetwork.h>
-#include <znc/znc.h>
 #include <signal.h>
 
 /* We should need 2 DNS threads (host, bindhost) per IRC connection */
diff --git a/src/Template.cpp b/src/Template.cpp
index 278c3057df..94c4f3de25 100644
--- a/src/Template.cpp
+++ b/src/Template.cpp
@@ -9,7 +9,6 @@
 #include <znc/Template.h>
 #include <znc/FileUtils.h>
 #include <znc/ZNCDebug.h>
-#include <sstream>
 #include <algorithm>
 
 using std::stringstream;
diff --git a/src/User.cpp b/src/User.cpp
index 9da76a0061..763288d117 100644
--- a/src/User.cpp
+++ b/src/User.cpp
@@ -7,14 +7,10 @@
  */
 
 #include <znc/User.h>
-#include <znc/Chan.h>
 #include <znc/Config.h>
 #include <znc/FileUtils.h>
 #include <znc/IRCNetwork.h>
 #include <znc/IRCSock.h>
-#include <znc/Server.h>
-#include <znc/znc.h>
-#include <znc/Modules.h>
 #include <math.h>
 
 using std::vector;
diff --git a/src/Utils.cpp b/src/Utils.cpp
index d12ffa0fc6..dd933dd4d1 100644
--- a/src/Utils.cpp
+++ b/src/Utils.cpp
@@ -7,17 +7,11 @@
  */
 
 #include <znc/Utils.h>
-#include <znc/MD5.h>
-#include <znc/main.h>
 #include <znc/ZNCDebug.h>
 #include <znc/FileUtils.h>
-#include <errno.h>
 #ifdef HAVE_LIBSSL
 #include <openssl/ssl.h>
 #endif /* HAVE_LIBSSL */
-#include <sstream>
-#include <sys/stat.h>
-#include <sys/types.h>
 #include <unistd.h>
 
 // Required with GCC 4.3+ if openssl is disabled
diff --git a/src/ZNCString.cpp b/src/ZNCString.cpp
index e0f1a5906a..1ac49da8a1 100644
--- a/src/ZNCString.cpp
+++ b/src/ZNCString.cpp
@@ -6,7 +6,6 @@
  * by the Free Software Foundation.
  */
 
-#include <znc/ZNCString.h>
 #include <znc/FileUtils.h>
 #include <znc/Utils.h>
 #include <znc/MD5.h>
diff --git a/src/main.cpp b/src/main.cpp
index 3f3913f4ce..1c9f578d87 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -7,8 +7,6 @@
  */
 
 #include <znc/znc.h>
-#include <znc/FileUtils.h>
-#include <sys/wait.h>
 #include <signal.h>
 
 using std::cout;
diff --git a/src/version.cpp b/src/version.cpp
index aa398c7fd1..a616aed300 100644
--- a/src/version.cpp
+++ b/src/version.cpp
@@ -1,4 +1,3 @@
-#include <znc/version.h>
 
 #ifdef VERSION_EXTRA
 const char* ZNC_VERSION_EXTRA = VERSION_EXTRA;
diff --git a/src/znc.cpp b/src/znc.cpp
index ec0b4bb540..c2a9432bdb 100644
--- a/src/znc.cpp
+++ b/src/znc.cpp
@@ -6,14 +6,11 @@
  * by the Free Software Foundation.
  */
 
-#include <znc/znc.h>
-#include <znc/Chan.h>
 #include <znc/FileUtils.h>
 #include <znc/IRCSock.h>
 #include <znc/Server.h>
 #include <znc/User.h>
 #include <znc/IRCNetwork.h>
-#include <znc/Listener.h>
 #include <znc/Config.h>
 
 using std::endl;
diff --git a/test/ConfigTest.cpp b/test/ConfigTest.cpp
index 38f240eac4..48aa95673d 100644
--- a/test/ConfigTest.cpp
+++ b/test/ConfigTest.cpp
@@ -9,7 +9,6 @@
 #include "znc/ZNCDebug.h"
 #include "znc/FileUtils.h"
 #include "znc/Config.h"
-#include <cstdlib>
 
 class CConfigTest {
 public:
diff --git a/test/EscapeTest.cpp b/test/EscapeTest.cpp
index 777591050c..9121281f12 100644
--- a/test/EscapeTest.cpp
+++ b/test/EscapeTest.cpp
@@ -6,7 +6,6 @@
  * by the Free Software Foundation.
  */
 
-#include "znc/ZNCString.h"
 #include "znc/ZNCDebug.h"
 
 static int testEqual(const CString& a, const CString& b, const CString& what)