Remove unneeded headers.

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>

modules/autoattach.cpp

@@ -8,7 +8,6 @@
 
 #include <znc/Chan.h>
 #include <znc/Modules.h>
-#include <znc/User.h>
 
 using std::vector;
 

modules/autocycle.cpp

@@ -7,7 +7,6 @@
  */
 
 #include <znc/Chan.h>
-#include <znc/User.h>
 #include <znc/IRCNetwork.h>
 
 using std::vector;

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:

modules/autovoice.cpp

@@ -7,7 +7,6 @@
  */
 
 #include <znc/Modules.h>
-#include <znc/User.h>
 #include <znc/Chan.h>
 
 using std::map;

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;

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;

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;
 

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;
 

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;
 

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;

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;
 

modules/clearbufferonmsg.cpp

@@ -8,7 +8,6 @@
 
 #include <znc/IRCNetwork.h>
 #include <znc/Chan.h>
-#include <znc/Modules.h>
 
 using std::vector;
 

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>
 

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>
 

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;

modules/disconkick.cpp

@@ -6,7 +6,6 @@
  * by the Free Software Foundation.
  */
 
-#include <znc/Modules.h>
 #include <znc/IRCNetwork.h>
 #include <znc/Chan.h>
 

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;

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;

modules/imapauth.cpp

@@ -6,7 +6,6 @@
  * by the Free Software Foundation.
  */
 
-#include <znc/Modules.h>
 #include <znc/znc.h>
 
 using std::map;

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>
 

modules/lastseen.cpp

@@ -7,7 +7,6 @@
  */
 
 #include <znc/User.h>
-#include <znc/Chan.h>
 #include <znc/znc.h>
 
 using std::map;

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:

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>
 

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;
 

modules/partyline.cpp

@@ -7,7 +7,6 @@
  */
 
 #include <znc/User.h>
-#include <znc/znc.h>
 #include <znc/IRCNetwork.h>
 
 using std::set;

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) {

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;

modules/raw.cpp

@@ -7,7 +7,6 @@
  */
 
 #include <znc/Modules.h>
-#include <znc/User.h>
 
 class CRawMod : public CModule {
 public:

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>
 

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;

modules/sasl.cpp

@@ -6,7 +6,6 @@
  * by the Free Software Foundation.
  */
 
-#include <znc/Modules.h>
 #include <znc/IRCNetwork.h>
 #include <znc/IRCSock.h>
 

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;
 

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;

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;

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;

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;

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) {

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;

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;
 

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;

src/Csocket.cpp

@@ -49,7 +49,6 @@
 #include <openssl/engine.h>
 #endif /* HAVE_LIBSSL */
 
-#include <list>
 
 #define CS_SRANDBUFFER 128
 

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>

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;

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;

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;

src/Listener.cpp

@@ -6,7 +6,6 @@
  * by the Free Software Foundation.
  */
 
-#include <znc/Listener.h>
 #include <znc/znc.h>
 
 CListener::~CListener() {

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>

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 */

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;

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;

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

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>

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;

src/version.cpp

@@ -1,4 +1,3 @@
-#include <znc/version.h>
 
 #ifdef VERSION_EXTRA
 const char* ZNC_VERSION_EXTRA = VERSION_EXTRA;

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;

test/ConfigTest.cpp

@@ -9,7 +9,6 @@
 #include "znc/ZNCDebug.h"
 #include "znc/FileUtils.h"
 #include "znc/Config.h"
-#include <cstdlib>
 
 class CConfigTest {
 public:

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)