Clean up includes

All the headers are now self-contained (g++ Header.h -o /dev/null).

Some system headers where moved to the .cpp they are actually needed in,
some of our own headers are includes less. (Especially MD5.h)

Headers are sorted alphabetically while in e.g. FileUtils.cpp FileUtils.h
is the first file included.


git-svn-id: https://znc.svn.sourceforge.net/svnroot/znc/trunk@915 726aef4b-f618-498e-8847-2d620e286838

modules/autoattach.cpp

@@ -6,11 +6,8 @@
  * by the Free Software Foundation.
  */
 
-#include "main.h"
-#include "User.h"
-#include "Nick.h"
-#include "Modules.h"
 #include "Chan.h"
+#include "Modules.h"
 
 class CChanAttach : public CModule {
 public:

modules/autoop.cpp

@@ -6,11 +6,8 @@
  * by the Free Software Foundation.
  */
 
-#include "main.h"
-#include "User.h"
-#include "Nick.h"
-#include "Modules.h"
 #include "Chan.h"
+#include "User.h"
 
 class CAutoOpMod;
 

modules/away.cpp

@@ -11,15 +11,8 @@
 
 #define REQUIRESSL
 
-#include "main.h"
 #include "User.h"
-#include "Nick.h"
-#include "Modules.h"
-#include "Chan.h"
-#include "Utils.h"
-#include <pwd.h>
-#include <map>
-#include <vector>
+#include <sys/stat.h>
 
 #define CRYPT_VERIFICATION_TOKEN "::__:AWAY:__::"
 

modules/awaynick.cpp

@@ -7,12 +7,8 @@
  */
 
 // @todo handle raw 433 (nick in use)
-#include "main.h"
-#include "User.h"
-#include "Nick.h"
-#include "Modules.h"
-#include "Chan.h"
 #include "IRCSock.h"
+#include "User.h"
 
 class CAwayNickMod;
 

modules/chansaver.cpp

@@ -6,12 +6,9 @@
  * by the Free Software Foundation.
  */
 
-#include "main.h"
-#include "znc.h"
-#include "User.h"
-#include "Nick.h"
-#include "Modules.h"
 #include "Chan.h"
+#include "User.h"
+#include "znc.h"
 
 class CChanSaverMod : public CModule {
 public:

modules/crypt.cpp

@@ -22,12 +22,8 @@
 //       It is strongly suggested that you enable SSL between znc and your client otherwise the encryption stops at znc and gets sent to your client in plain text.
 // 
 
-#include "main.h"
-#include "User.h"
-#include "Nick.h"
-#include "Modules.h"
 #include "Chan.h"
-#include "String.h"
+#include "User.h"
 
 #define REQUIRESSL	1
 

modules/email.cpp

@@ -9,18 +9,13 @@
  * Author: imaginos <imaginos@imaginos.net>
  */
 
-#include "znc.h"
-#include "main.h"
-#include "User.h"
-#include "Nick.h"
-#include "Modules.h"
-#include "Chan.h"
-#include "Utils.h"
-#include "FileUtils.h"
 #include "MD5.h"
-#include <pwd.h>
+#include "User.h"
+#include "znc.h"
 #include <sstream>
 
+using std::stringstream;
+
 struct EmailST
 {
 	CString	sFrom;

modules/imapauth.cpp

@@ -6,15 +6,8 @@
  * by the Free Software Foundation.
  */
 
-#include "main.h"
-#include "User.h"
-#include "Nick.h"
 #include "Modules.h"
-#include "Chan.h"
 #include "znc.h"
-#include "HTTPSock.h"
-#include "Server.h"
-#include <map>
 
 using std::map;
 

modules/kickrejoin.cpp

@@ -12,8 +12,7 @@
  * Usage: LoadModule = rejoin [delay]
  *
  */
-#include <main.h>
-#include <Modules.h>
+
 #include <Chan.h>
 #include <User.h>
 

modules/modperl.cpp

@@ -7,13 +7,8 @@
  */
 
 #ifdef HAVE_PERL
-#include "main.h"
-#include "User.h"
-#include "Nick.h"
-#include "Modules.h"
 #include "Chan.h"
-#include "FileUtils.h"
-#include "Csocket.h"
+#include "User.h"
 #include "znc.h"
 
 // perl stuff

modules/nickserv.cpp

@@ -6,15 +6,7 @@
  * by the Free Software Foundation.
  */
 
-#include "main.h"
 #include "User.h"
-#include "Nick.h"
-#include "Modules.h"
-#include "Chan.h"
-#include "Utils.h"
-#include <pwd.h>
-#include <map>
-#include <vector>
 
 class CNickServ : public CModule
 {

modules/partyline.cpp

@@ -6,14 +6,8 @@
  * by the Free Software Foundation.
  */
 
-#include "main.h"
 #include "User.h"
-#include "Nick.h"
-#include "Modules.h"
-#include "Chan.h"
 #include "znc.h"
-#include "HTTPSock.h"
-#include "Server.h"
 
 class CPartylineChannel {
 public:

modules/perform.cpp

@@ -6,15 +6,7 @@
  * by the Free Software Foundation.
  */
 
-#include "main.h"
 #include "User.h"
-#include "Nick.h"
-#include "Modules.h"
-#include "Chan.h"
-#include "Utils.h"
-#include <pwd.h>
-#include <map>
-#include <vector>
 
 class CPerform : public CModule
 {

modules/raw.cpp

@@ -6,11 +6,7 @@
  * by the Free Software Foundation.
  */
 
-#include "main.h"
 #include "User.h"
-#include "Nick.h"
-#include "Modules.h"
-#include "Chan.h"
 
 class CRawMod : public CModule {
 public:

modules/sample.cpp

@@ -6,11 +6,8 @@
  * by the Free Software Foundation.
  */
 
-#include "main.h"
-#include "User.h"
-#include "Nick.h"
-#include "Modules.h"
 #include "Chan.h"
+#include "Modules.h"
 
 class CSampleTimer : public CTimer {
 public:

modules/saslauth.cpp

@@ -10,10 +10,9 @@
  * @brief SASL authentication module for znc.
  */
 
-#include <sasl/sasl.h>
-
 #include "Modules.h"
 #include "znc.h"
+#include <sasl/sasl.h>
 
 class CSASLAuthMod : public CGlobalModule {
 public:

modules/savebuff.cpp

@@ -14,14 +14,9 @@
 
 #define REQUIRESSL
 
-#include "main.h"
-#include "znc.h"
-#include "User.h"
-#include "Nick.h"
-#include "Modules.h"
 #include "Chan.h"
-#include "Utils.h"
-#include <pwd.h>
+#include "User.h"
+#include <sys/stat.h>
 
 /* TODO list
  * store timestamp to be displayed

modules/schat.cpp

@@ -11,21 +11,12 @@
 
 #define REQUIRESSL
 
-#include "main.h"
-#include "znc.h"
 #include "User.h"
-#include "Nick.h"
-#include "Modules.h"
-#include "Chan.h"
-#include "Utils.h"
-#include "String.h"
-#include "FileUtils.h"
-#include "Csocket.h"
-#include "MD5.h"
-#include <pwd.h>
+#include "znc.h"
 #include <sstream>
 
 using std::pair;
+using std::stringstream;
 
 class CSChat;
 

modules/shell.cpp

@@ -6,16 +6,8 @@
  * by the Free Software Foundation.
  */
 
-#include "main.h"
-#include "Csocket.h"
 #include "User.h"
-#include "Nick.h"
-#include "Modules.h"
-#include "Chan.h"
-#include "Utils.h"
-#include "FileUtils.h"
 #include "znc.h"
-#include <sys/wait.h>
 
 // Forward Declaration
 class CShellMod;

modules/stickychan.cpp

@@ -6,16 +6,8 @@
  * by the Free Software Foundation.
  */
 
-#include "main.h"
-#include "User.h"
-#include "Nick.h"
-#include "Modules.h"
 #include "Chan.h"
-#include "Utils.h"
-#include "FileUtils.h"
-#include <pwd.h>
-#include <map>
-#include <vector>
+#include "User.h"
 
 class CStickyChan : public CModule 
 {

modules/watch.cpp

@@ -6,15 +6,10 @@
  * by the Free Software Foundation.
  */
 
-#include "main.h"
-#include "User.h"
-#include "Nick.h"
-#include "Modules.h"
 #include "Chan.h"
-#include "Buffer.h"
-#include "Utils.h"
-
+#include "User.h"
 #include <list>
+
 using std::list;
 
 class CWatchSource {

modules/webadmin.cpp

@@ -6,21 +6,19 @@
  * by the Free Software Foundation.
  */
 
-#include "main.h"
-#include "User.h"
-#include "Nick.h"
-#include "Modules.h"
 #include "Chan.h"
-#include "znc.h"
 #include "HTTPSock.h"
-#include "Client.h"
 #include "Server.h"
 #include "Template.h"
+#include "User.h"
+#include "znc.h"
+#include <sstream>
+
+using std::stringstream;
 
 class CWebAdminMod;
 class CWebAdminSock;
 
-
 class CWebAdminAuth : public CAuthBase {
 public:
 	CWebAdminAuth(CWebAdminSock* pWebAdminSock, const CString& sUsername, const CString& sPassword)