Improve include dependencies

Working on the bot was a bit intolerable as almost everything
unnecessarily depended on just about everything else. This has been
rectified reducing rebuild time quite a bit.

diff --git a/source/Bot.C b/source/Bot.C
index 6115cce..f479d81 100644 (file)
--- a/source/Bot.C
+++ b/source/Bot.C
@@ -17,27 +17,48 @@
 // Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
 // 02110-1301, USA.
 
-#include <fstream>
-#include <algorithm>
-#include <iomanip>
 #include <cstring>
 #include <cstdlib>
 #include <cstdio>
+
+#include <fstream>
+#include <algorithm>
+#include <iomanip>
+
 #include <dirent.h>
 #include <sys/time.h>
 #include <sys/types.h>
 #include <sys/stat.h>
 #include <unistd.h>
 
+#ifdef USESCRIPTS
+#include <libguile.h>
+#endif
+
 #include "Bot.H"
 #include "DCCConnection.H"
 #include "DCCChatConnection.H"
-#include "StringTokenizer.H"
+#include "ChannelList.H"
+#include "DCCManager.H"
+#include "DCCPerson.H"
+#include "Parser.H"
+#include "Person.H"
+#include "Server.H"
 #include "ServerConnection.H"
-#include "Utils.H"
+#include "ServerList.H"
+#include "ShitList.H"
+#include "StringTokenizer.H"
+#include "TodoList.H"
+#include "User.H"
 #include "UserCommands.H"
-#include "DCCManager.H"
+#include "UserList.H"
+#include "Utils.H"
+
 
+#ifdef USESCRIPTS
+#include "BotInterp.H"
+#include "Interp.H"
+#endif
 
 unsigned int Bot::MAX_MESSAGES = 2;
 unsigned int Bot::MAX_NICKLENGTH = 9;

diff --git a/source/Bot.H b/source/Bot.H
index aacc5b4..7dd25a1 100644 (file)
--- a/source/Bot.H
+++ b/source/Bot.H
@@ -30,31 +30,32 @@
 #include <map>
 
 #include "String.H"
-#include "Person.H"
-#include "ServerList.H"
-#include "ChannelList.H"
-#include "UserList.H"
-#include "ShitList.H"
-#include "TodoList.H"
-#include "Parser.H"
-
-#ifdef USESCRIPTS
-#include "BotInterp.H"
-#include <libguile.h>
-#endif
 
 #define VERSION_STRING PACKAGE" version "VERSION" by unknown_lamer@FreeNode <clinton@unknownlamer.org>\n1.97 and below by eb@IRCNet <eb@via.ecp.fr>"
 #define COPYRIGHT_STRING PACKAGE" version "VERSION", Copyright (C) 1997-2000 Etienne BERNARD\nCopyright (C) 2002,2003,2004,2005,2008 Clinton Ebadi"
 
 class Channel;
+class ChannelList;
+class Commands;
 class DCCConnection;
-class Parser;
-class DCCParser;
 class DCCManager;
+class DCCParser;
+class Parser;
+class Person;
 class ServerConnection;
-class Commands;
+class ServerList;
+class ShitList;
+class TodoList;
+class UserList;
 class UserCommands;
 
+class userFunction;
+class wantedChannel;
+
+#ifdef USESCRIPTS
+class BotInterp;
+#endif
+
 class Bot {
 public:
   String nickName;

diff --git a/source/BotInterp.C b/source/BotInterp.C
index de65e93..6d0349d 100644 (file)
--- a/source/BotInterp.C
+++ b/source/BotInterp.C
@@ -23,10 +23,13 @@
 
 #include <algorithm>
 
-#include "Utils.H"
-#include "Bot.H"
 #include "BotInterp.H"
 
+#include "Bot.H"
+#include "Interp.H"
+#include "Utils.H"
+
+
 #ifdef USESCRIPTS
 
 #include <libguile.h>

diff --git a/source/BotInterp.H b/source/BotInterp.H
index 4329ee4..1cd3975 100644 (file)
--- a/source/BotInterp.H
+++ b/source/BotInterp.H
@@ -26,12 +26,13 @@
 
 #ifdef USESCRIPTS
 
-#include <ctime>
 #include <functional>
 #include <list>
 #include <map>
 #include <string>
 
+#include <ctime>
+
 #include <libguile.h>
 
 #include "BotThreading.H"

diff --git a/source/Channel.C b/source/Channel.C
index ab45ba5..56b51bb 100644 (file)
--- a/source/Channel.C
+++ b/source/Channel.C
@@ -21,12 +21,21 @@
 #include "config.h"
 #endif
 
+#include "Channel.H"
+
 #include <cstdlib>
 
+#include "BanEntry.H"
+#include "Bot.H"
 #include "Macros.H"
-#include "Utils.H"
-#include "Channel.H"
+#include "Person.H"
+#include "ServerConnection.H"
+#include "ShitEntry.H"
+#include "ShitList.H"
 #include "StringTokenizer.H"
+#include "User.H"
+#include "Utils.H"
+
 #ifdef USESCRIPTS
 #include "Interp.H"
 #endif

diff --git a/source/Channel.H b/source/Channel.H
index 89856b5..348b943 100644 (file)
--- a/source/Channel.H
+++ b/source/Channel.H
@@ -24,15 +24,18 @@
 #include <map>
 #include <vector>
 
-#include "User.H"
-#include "Person.H"
-#include "ServerConnection.H"
-#include "BanEntry.H"
+#include "String.H"
 
+class BanEntry;
 class Bot;
-class Parser;
 class Commands;
+class Parser;
+class Person;
+class ServerConnection;
+class User;
 class UserCommands;
+class UserList;
+
 
 #define DEFAULT_KEEPMODES "iklmnpst"
 

diff --git a/source/ChannelList.C b/source/ChannelList.C
index 2295754..4d4e87f 100644 (file)
--- a/source/ChannelList.C
+++ b/source/ChannelList.C
@@ -21,6 +21,8 @@
 #endif
 
 #include "ChannelList.H"
+#include "ServerConnection.H"
+
 #ifdef USESCRIPTS
 #include "Interp.H"
 #endif

diff --git a/source/ChannelList.H b/source/ChannelList.H
index c4e9b35..3093180 100644 (file)
--- a/source/ChannelList.H
+++ b/source/ChannelList.H
@@ -22,11 +22,11 @@
 
 #include <map>
 
-#include "String.H"
-#include "ServerConnection.H"
 #include "Channel.H"
+#include "String.H"
 
 class UserCommands;
+class ServerConnection;
 
 class ChannelList {
   std::map<String, Channel *, std::less<String> > channel_list;

diff --git a/source/Commands.C b/source/Commands.C
index 5d7e3be..70a1d05 100644 (file)
--- a/source/Commands.C
+++ b/source/Commands.C
@@ -17,11 +17,28 @@
 // Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
 // 02110-1301, USA.
 
+#include "Commands.H"
+
+#include "BanEntry.H"
+#include "Bot.H"
+#include "ChannelList.H"
 #include "Macros.H"
 #include "Message.H"
-#include "Commands.H"
-#include "Utils.H"
+#include "Server.H"
+#include "ServerConnection.H"
+#include "ServerList.H"
+#include "ServerQueueItem.H"
+#include "ShitEntry.H"
+#include "ShitList.H"
 #include "StringTokenizer.H"
+#include "TodoList.H"
+#include "User.H"
+#include "UserList.H"
+#include "Utils.H"
+
+#ifdef USESCRIPTS
+#include "BotInterp.H"
+#endif
 
 
 #define CHECK_CONNECTION if (!bot->serverConnection) return NotConnected

diff --git a/source/Commands.H b/source/Commands.H
index 6e54fc6..fc3ebd1 100644 (file)
--- a/source/Commands.H
+++ b/source/Commands.H
@@ -23,9 +23,9 @@
 #include <ctime>
 
 #include "String.H"
-#include "Message.H"
-#include "Bot.H"
-#include "ServerConnection.H"
+
+class Bot;
+class Message;
 
 class Commands {
 public:

diff --git a/source/Connection.H b/source/Connection.H
index 8003a0f..1746eb5 100644 (file)
--- a/source/Connection.H
+++ b/source/Connection.H
@@ -18,8 +18,8 @@
 #ifndef CONNECTION_H
 #define CONNECTION_H
 
-#include "String.H"
 #include "Socket.H"
+#include "String.H"
 
 class Connection {
 public:

diff --git a/source/DCCChatConnection.C b/source/DCCChatConnection.C
index e31a3a4..5bfc302 100644 (file)
--- a/source/DCCChatConnection.C
+++ b/source/DCCChatConnection.C
@@ -16,16 +16,23 @@
 // along with this program; if not, write to the Free Software
 // Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 
+#include "DCCChatConnection.H"
+
 #include <ctime>
 #include <string>
 
-#include "Socket.H"
 #include "DCCParser.H"
-#include "DCCChatConnection.H"
+#include "DCCPerson.H"
 #include "Person.H"
-#include "BotInterp.H"
+#include "Socket.H"
+#include "User.H"
 #include "Utils.H"
 
+#ifdef USESCRIPTS
+#include "BotInterp.H"
+#endif
+
+
 DCCChatConnection::DCCChatConnection(Bot *b, String n, unsigned long address, 
                                     int port)
   : DCCConnection(b, n, address, port)

diff --git a/source/DCCChatConnection.H b/source/DCCChatConnection.H
index 729e397..7d6c2cb 100644 (file)
--- a/source/DCCChatConnection.H
+++ b/source/DCCChatConnection.H
@@ -20,11 +20,10 @@
 
 #include <ctime>
 
-#include "Connection.H"
-#include "Bot.H"
-#include "DCCPerson.H"
 #include "DCCConnection.H"
+#include "String.H"
 
+class Bot;
 class UserCommands;
 
 class DCCChatConnection : public DCCConnection {

diff --git a/source/DCCConnection.C b/source/DCCConnection.C
index 82efefc..ba2554a 100644 (file)
--- a/source/DCCConnection.C
+++ b/source/DCCConnection.C
@@ -16,15 +16,11 @@
 // along with this program; if not, write to the Free Software
 // Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 
+#include "DCCConnection.H"
+
 #include <ctime>
-#include <string>
 
-#include "Socket.H"
-#include "DCCParser.H"
-#include "DCCConnection.H"
-#include "Person.H"
-#include "BotInterp.H"
-#include "Utils.H"
+#include "String.H"
 
 DCCConnection::DCCConnection(unsigned long address, 
                             int port)

diff --git a/source/DCCConnection.H b/source/DCCConnection.H
index 916add9..5ad3abf 100644 (file)
--- a/source/DCCConnection.H
+++ b/source/DCCConnection.H
@@ -22,12 +22,8 @@
 
 #include <ctime>
 
-#include "Connection.H"
 #include "Bot.H"
-#include "DCCPerson.H"
-
-class DCCPerson;
-class UserCommands;
+#include "Connection.H"
 
 class DCCConnection : public Connection {
 protected:

diff --git a/source/DCCManager.C b/source/DCCManager.C
index 2437fea..9c2c45d 100644 (file)
--- a/source/DCCManager.C
+++ b/source/DCCManager.C
@@ -17,8 +17,16 @@
 // 02110-1301, USA.
 
 #include "DCCManager.H"
+
+#include "DCCConnection.H"
+#include "DCCPerson.H"
+#include "UserCommands.H"
 #include "Utils.H"
 
+#ifdef USESCRIPTS
+#include "BotInterp.H"
+#endif
+
 void
 DCCManager::addConnection (DCCConnection *cnx)
 {

diff --git a/source/DCCManager.H b/source/DCCManager.H
index 86e2579..e5c2fc1 100644 (file)
--- a/source/DCCManager.H
+++ b/source/DCCManager.H
@@ -18,16 +18,19 @@
 #ifndef DCC_MANAGER_H
 #define DCC_MANAGER_H
 
-#include <map>
 #include <list>
+#include <map>
 
 #include <sys/types.h>
 #include <unistd.h>
 
-#include "DCCPerson.H"
-#include "DCCConnection.H"
-#include "UserCommands.H"
 #include "String.H"
+#include "UserCommands.H"
+
+class DCCConnection;
+class DCCPerson;
+class Person;
+class ServerConnection;
 
 typedef std::map<String, DCCPerson*, std::less<String> > DCC_MAP;
 

diff --git a/source/DCCParser.C b/source/DCCParser.C
index 6ca0fa8..f04c0f6 100644 (file)
--- a/source/DCCParser.C
+++ b/source/DCCParser.C
@@ -22,11 +22,16 @@
 #endif
 
 #include "DCCParser.H"
+
+#include "DCCConnection.H"
 #include "DCCPerson.H"
 #include "Parser.H"
-#include "BotInterp.H"
 #include "Utils.H"
 
+#ifdef USESCRIPTS
+#include "BotInterp.H"
+#endif
+
 void
 DCCParser::parseLine(DCCConnection *cnx, String line)
 {

diff --git a/source/DCCParser.H b/source/DCCParser.H
index 0cb4c8d..4a51abc 100644 (file)
--- a/source/DCCParser.H
+++ b/source/DCCParser.H
@@ -19,7 +19,8 @@
 #define DCCPARSER_H
 
 #include "String.H"
-#include "DCCConnection.H"
+
+class DCCConnection;
 
 class DCCParser {
 public:

diff --git a/source/DCCPerson.C b/source/DCCPerson.C
index 9a4f74a..9d9ca18 100644 (file)
--- a/source/DCCPerson.C
+++ b/source/DCCPerson.C
@@ -18,6 +18,8 @@
 
 #include "DCCPerson.H"
 
+#include "DCCConnection.H"
+
 DCCPerson::DCCPerson(DCCConnection *cnx)
   : Person(cnx->get_bot(), cnx->get_nuh()), dcc(cnx)
 { }

diff --git a/source/DCCPerson.H b/source/DCCPerson.H
index 888691b..2467bad 100644 (file)
--- a/source/DCCPerson.H
+++ b/source/DCCPerson.H
@@ -18,11 +18,12 @@
 #ifndef DCCPERSON_H
 #define DCCPERSON_H
 
-#include "String.H"
 #include "Person.H"
-#include "DCCConnection.H"
+#include "String.H"
 #include "UserCommands.H"
 
+class DCCConnection;
+
 class DCCPerson : public Person {
   DCCConnection *dcc;
 public:

diff --git a/source/Interp.C b/source/Interp.C
index 9f1b805..911bad2 100644 (file)
--- a/source/Interp.C
+++ b/source/Interp.C
@@ -17,19 +17,23 @@
 // Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
 // 02110-1301, USA.
 
+#include "Interp.H"
+
+#ifdef USESCRIPTS
+
 #ifdef HAVE_CONFIG_H
 #include "config.h"
 #endif
 
-#ifdef USESCRIPTS
+#include <libguile.h>
 
-#include "Macros.H"
-#include "Commands.H"
-#include "Interp.H"
+#include "Bot.H"
 #include "BotInterp.H"
+#include "Commands.H"
+#include "Macros.H"
+#include "ScriptCommands.H"
 #include "ShitEntry.H"
-
-#include <libguile.h>
+#include "User.H"
 
 // static class member initial definitions
 Bot * Interp::bot = 0;

diff --git a/source/Interp.H b/source/Interp.H
index d99f445..d61ccc2 100644 (file)
--- a/source/Interp.H
+++ b/source/Interp.H
@@ -26,13 +26,15 @@
 
 #ifdef USESCRIPTS
 
+#include <libguile.h>
+
 #ifdef MULTITHREAD
 #include <pthread.h>
 #endif
 
-#include "Bot.H"
-#include "ScriptCommands.H"
-#include <libguile.h>
+#include "String.H"
+
+class Bot;
 
 struct wrapper_data {
   SCM func;

diff --git a/source/Main.C b/source/Main.C
index eb46acb..93b61a9 100644 (file)
--- a/source/Main.C
+++ b/source/Main.C
@@ -21,23 +21,26 @@
 #include "config.h"
 #endif
 
+#include <iostream>
+#include <string>
+
 #include <cstdio>
 #include <csignal>
 #include <cstdlib>
-#include <getopt.h>
+
 #include <dirent.h>
+#include <getopt.h>
 #include <unistd.h>
 #include <sys/stat.h>
 #include <sys/types.h>
 
-#include <iostream>
-#include <string>
-
 #ifdef USESCRIPTS
 #include "Interp.H"
 #endif
 
 #include "Bot.H"
+#include "Parser.H"
+#include "UserList.H"
 
 namespace 
 {

diff --git a/source/Parser.C b/source/Parser.C
index 021ebf2..456cf0e 100644 (file)
--- a/source/Parser.C
+++ b/source/Parser.C
@@ -21,17 +21,37 @@
 #include "config.h"
 #endif
 
+#include "Parser.H"
+
 #include <cstdlib>
+
 #include <sys/types.h>
 #include <netinet/in.h>
 
-#include "StringTokenizer.H"
-#include "Parser.H"
-#include "UserCommands.H"
+#ifdef USESCRIPTS
+#include <libguile.h>
+#include "BotInterp.H"
+#include "Interp.H"
+#endif
+
+#include "Bot.H"
+#include "Channel.H"
+#include "ChannelList.H"
 #include "Commands.H"
 #include "Macros.H"
-#include "Utils.H"
+#include "Message.H"
+#include "Person.H"
+#include "Server.H"
+#include "ServerConnection.H"
+#include "ServerList.H"
+#include "ShitEntry.H"
 #include "ShitList.H"
+#include "StringTokenizer.H"
+#include "UserCommands.H"
+#include "User.H"
+#include "UserList.H"
+#include "Utils.H"
+
 
 typedef void (*fptr) (ServerConnection *, Person *, String);
 std::map < std::string, fptr, std::less < std::string > > Parser::functions;

diff --git a/source/Parser.H b/source/Parser.H
index 96d0c1b..6e921ca 100644 (file)
--- a/source/Parser.H
+++ b/source/Parser.H
@@ -19,21 +19,21 @@
 #ifndef PARSER_H
 #define PARSER_H
 
+#include <map>
+#include <string>
+
 #ifdef HAVE_CONFIG_H
 #include "config.h"
 #endif
 
-#include "String.H"
-#include "Person.H"
-#include "ServerConnection.H"
-
 #ifdef USESCRIPTS
-#include "Interp.H"
 #include <libguile.h>
 #endif
 
-#include <map>
-#include <string>
+#include "String.H"
+
+class Person;
+class ServerConnection;
 
 typedef void (*fptr)(ServerConnection *, Person *, String);
 

diff --git a/source/Person.C b/source/Person.C
index 26b4cf9..cf379f2 100644 (file)
--- a/source/Person.C
+++ b/source/Person.C
@@ -17,9 +17,11 @@
 // Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
 // 02110-1301, USA.
 
+#include "Person.H"
+
 #include "Bot.H"
+#include "ServerConnection.H"
 #include "Utils.H"
-#include "Person.H"
 
 Person::Person(Bot *b, String a)
   : bot(b), address(a)

diff --git a/source/ScriptCommands.C b/source/ScriptCommands.C
index 25fa3bb..6788b03 100644 (file)
--- a/source/ScriptCommands.C
+++ b/source/ScriptCommands.C
@@ -23,18 +23,24 @@
 
 #ifdef USESCRIPTS
 
-#include "Utils.H"
-#include "Server.H"
-#include "ServerList.H"
-#include "ServerQueue.H"
 #include "ScriptCommands.H"
-#include "Interp.H"
-#include "DCCPerson.H"
-#include "DCCManager.H"
-#include "Parser.H"
+
+#include <libguile.h>
+
+#include "Bot.H"
+#include "BotInterp.H"
 #include "Commands.H"
+#include "DCCManager.H"
+#include "DCCPerson.H"
+#include "Interp.H"
 #include "Message.H"
-#include <libguile.h>
+#include "Parser.H"
+#include "Server.H"
+#include "ServerConnection.H"
+#include "ServerList.H"
+#include "ServerQueue.H"
+#include "User.H"
+#include "Utils.H"
 
 #define VERIFY_STRING(par) if (!scm_is_string((par))) \
                              return scm_from_int(-17)

diff --git a/source/ScriptCommands.H b/source/ScriptCommands.H
index b2ecaec..231baeb 100644 (file)
--- a/source/ScriptCommands.H
+++ b/source/ScriptCommands.H
@@ -27,7 +27,6 @@
 #ifdef USESCRIPTS
 
 #include <libguile.h>
-#include "Commands.H"
 
 class ScriptCommands {
 public:

diff --git a/source/ServerConnection.C b/source/ServerConnection.C
index 5e44dcd..b700320 100644 (file)
--- a/source/ServerConnection.C
+++ b/source/ServerConnection.C
@@ -16,11 +16,16 @@
 // along with this program; if not, write to the Free Software
 // Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 
+#include "ServerConnection.H"
+
 #include <ctime>
 
-#include "ServerConnection.H"
-#include "Parser.H"
 #include "Bot.H"
+#include "Channel.H"
+#include "Commands.H"
+#include "Parser.H"
+#include "Server.H"
+
 
 ServerConnection::ServerConnection(Bot *b, Server *s, String localIP)
   : Connection(s->getHostName(),

diff --git a/source/ServerConnection.H b/source/ServerConnection.H
index cd94221..8444495 100644 (file)
--- a/source/ServerConnection.H
+++ b/source/ServerConnection.H
@@ -25,18 +25,19 @@
 
 #include <ctime>
 
-#include "Server.H"
 #include "ServerQueue.H"
 #include "Connection.H"
 
 class Bot;
-class Parser;
 class Channel;
 class Commands;
+class Parser;
+class Server;
 class UserCommands;
+
 #ifdef USESCRIPTS
-class Interp;
 class BotInterp;
+class Interp;
 class ScriptCommands;
 #endif
 

diff --git a/source/ServerList.C b/source/ServerList.C
index 9371f1c..45112e6 100644 (file)
--- a/source/ServerList.C
+++ b/source/ServerList.C
@@ -18,6 +18,8 @@
 
 #include "ServerList.H"
 
+#include "Server.H"
+
 ServerList::ServerList()
   : it(v.end()), current(0), currentNumber(0)
 { }

diff --git a/source/ServerList.H b/source/ServerList.H
index ef19cd3..fc93569 100644 (file)
--- a/source/ServerList.H
+++ b/source/ServerList.H
@@ -25,12 +25,12 @@
 
 #include <vector>
 
-#include "Server.H"
+class Server;
+class UserCommands;
 
 #ifdef USESCRIPTS
 class ScriptCommands;
 #endif
-class UserCommands;
 
 class ServerList {
   std::vector<Server *> v;

diff --git a/source/ServerQueue.C b/source/ServerQueue.C
index 0dc5f74..7db7fb9 100644 (file)
--- a/source/ServerQueue.C
+++ b/source/ServerQueue.C
@@ -21,13 +21,19 @@
 #include "config.h"
 #endif
 
+#include "ServerQueue.H"
+
 #include <limits>
 
-#include "Interp.H"
-#include "BotInterp.H"
-#include "ServerQueue.H"
+#include "Bot.H"
+#include "ServerQueueItem.H"
 #include "Utils.H"
 
+#ifdef USESCRIPTS
+#include "BotInterp.H"
+#include "Interp.H"
+#endif
+
 int ServerQueue::max_penalty = 20;
 
 ServerQueue::ServerQueue(Socket * s, bool d)

diff --git a/source/ServerQueue.H b/source/ServerQueue.H
index a261248..fde62b9 100644 (file)
--- a/source/ServerQueue.H
+++ b/source/ServerQueue.H
@@ -23,9 +23,11 @@
 #include <list>
 
 #include "BotThreading.H"
-#include "String.H"
 #include "Queue.H"
-#include "ServerQueueItem.H"
+#include "String.H"
+
+class ServerQueueItem;
+class Socket;
 
 enum {
   QUIT_PRIORITY, USERMODE_PRIORITY, CHANNELMODE_PRIORITY,

diff --git a/source/ServerQueueItem.C b/source/ServerQueueItem.C
index 8daf8c4..a77a9c4 100644 (file)
--- a/source/ServerQueueItem.C
+++ b/source/ServerQueueItem.C
@@ -17,10 +17,11 @@
 // Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
 // 02110-1301, USA.
 
-#include "StringTokenizer.H"
-#include "ServerQueue.H"
 #include "ServerQueueItem.H"
 
+#include "ServerQueue.H"
+#include "StringTokenizer.H"
+
 ServerQueueItem::ServerQueueItem(int pr, int pen, int t)
   : priority(pr), penalty(pen), type(t)
 { }

diff --git a/source/ServerQueueItem.H b/source/ServerQueueItem.H
index 2e163b8..ed23da4 100644 (file)
--- a/source/ServerQueueItem.H
+++ b/source/ServerQueueItem.H
@@ -19,6 +19,8 @@
 #ifndef SERVERQUEUEITEM_H
 #define SERVERQUEUEITEM_H
 
+#include "String.H"
+
 class ServerQueueItem {
 public:
   int priority, penalty, type;

diff --git a/source/ShitList.C b/source/ShitList.C
index 2be1250..320c6f0 100644 (file)
--- a/source/ShitList.C
+++ b/source/ShitList.C
@@ -21,10 +21,13 @@
 #include "config.h"
 #endif
 
-#include <cstdlib>
+#include "ShitList.H"
+
 #include <fstream>
 
-#include "ShitList.H"
+#include <cstdlib>
+
+#include "ShitEntry.H"
 #include "StringTokenizer.H"
 #include "Utils.H"
 

diff --git a/source/ShitList.H b/source/ShitList.H
index c77b7f9..0ed0d73 100644 (file)
--- a/source/ShitList.H
+++ b/source/ShitList.H
@@ -21,11 +21,12 @@
 #define SHITLIST_H
 
 #include <list>
+
 #include <ctime>
 
 #include "String.H"
-#include "ShitEntry.H"
 
+class ShitEntry;
 class UserCommands;
 
 class ShitList {

diff --git a/source/Socket.C b/source/Socket.C
index 1e8b89b..b0f7293 100644 (file)
--- a/source/Socket.C
+++ b/source/Socket.C
@@ -18,7 +18,7 @@
 // 02110-1301, USA.
 
 #include "Socket.H"
-#include "Bot.H"
+
 #include <string>
 
 #include <sys/types.h>
@@ -31,6 +31,8 @@
 #include <fcntl.h>
 #include <errno.h>
 
+#include "Bot.H"
+
 Socket::Socket()
   : remotePort(0), remoteAddress(0),
     localPort(0), localAddress(0)

diff --git a/source/Socket.H b/source/Socket.H
index a253f61..e8fed66 100644 (file)
--- a/source/Socket.H
+++ b/source/Socket.H
@@ -18,7 +18,6 @@
 #ifndef SOCKET_H
 #define SOCKET_H
 
-
 #include "String.H"
 
 class Socket {

diff --git a/source/String.C b/source/String.C
index 15f173c..f5f6fbb 100644 (file)
--- a/source/String.C
+++ b/source/String.C
@@ -17,13 +17,15 @@
 // Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 
 #include "String.H"
-#include "Utils.H"
+
+#include <sstream>
+#include <iostream>
 
 #include <cstdlib>
 #include <cstring>
 #include <cctype>
-#include <sstream>
-#include <iostream>
+
+#include "Utils.H"
 
 String::String()
 {

diff --git a/source/StringTokenizer.C b/source/StringTokenizer.C
index c82e2f0..f45b67c 100644 (file)
--- a/source/StringTokenizer.C
+++ b/source/StringTokenizer.C
@@ -17,7 +17,9 @@
 // Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 
 #include "StringTokenizer.H"
+
 #include <string>
+
 #include <cstring>
 
 StringTokenizer::StringTokenizer(std::string s)

diff --git a/source/TodoList.H b/source/TodoList.H
index 3a9b191..8450680 100644 (file)
--- a/source/TodoList.H
+++ b/source/TodoList.H
@@ -19,9 +19,10 @@
 #ifndef TODOLIST_H
 #define TODOLIST_H
 
+#include <functional>
 #include <set>
+
 #include <ctime>
-#include <functional>
 
 #include "String.H"
 

diff --git a/source/User.C b/source/User.C
index 50078a5..bdbf423 100644 (file)
--- a/source/User.C
+++ b/source/User.C
@@ -16,9 +16,11 @@
 // Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
 // 02110-1301, USA.
 
-#include "Utils.H"
 #include "User.H"
 
+#include "UserListItem.H"
+#include "Utils.H"
+
 User::User(String n, String uh, String channel, int mode, UserList *ul)
   : mode(mode), floodNum(0),
     userListItem(ul->getUserListItem(n + "!" + uh, channel)),

diff --git a/source/User.H b/source/User.H
index e3cc995..2777c5c 100644 (file)
--- a/source/User.H
+++ b/source/User.H
@@ -19,13 +19,13 @@
 #define USER_H
 
 #include "UserList.H"
-#include "UserListItem.H"
 
 class Bot;
-class Parser;
 class Channel;
 class Commands;
+class Parser;
 class UserCommands;
+class UserListItem;
 
 class User {
 

diff --git a/source/UserCommands.C b/source/UserCommands.C
index ee7b677..457ebf5 100644 (file)
--- a/source/UserCommands.C
+++ b/source/UserCommands.C
@@ -21,12 +21,16 @@
 #include "config.h"
 #endif
 
+#include "UserCommands.H"
+
 #include <fstream>
 #include <map>
 #include <string>
+
 #include <cctype>
 #include <cstdlib>
 #include <cstring>
+
 #include <sys/types.h>
 #include <sys/socket.h>
 #include <netinet/in.h>
@@ -45,16 +49,31 @@
 
 #include <unistd.h>
 
+#include "BanEntry.H"
+#include "Channel.H"
+#include "ChannelList.H"
 #include "Commands.H"
-#include "UserCommands.H"
 #include "DCCConnection.H"
 #include "DCCManager.H"
-#include "Parser.H"
+#include "DCCPerson.H"
 #include "Macros.H"
+#include "Message.H"
+#include "Parser.H"
+#include "Person.H"
+#include "ShitList.H"
+#include "Server.H"
+#include "ServerConnection.H"
+#include "ServerList.H"
+#include "ShitEntry.H"
 #include "StringTokenizer.H"
+#include "TodoList.H"
+#include "User.H"
+#include "UserList.H"
 #include "Utils.H"
-#include "ServerList.H"
-#include "Server.H"
+
+#ifdef USESCRIPTS
+#include "Interp.H"
+#endif
 
 #ifdef NOCRYPT
 char * crypt(const char *p, const char *s) { return p; }

diff --git a/source/UserCommands.H b/source/UserCommands.H
index 4db00ff..9b08854 100644 (file)
--- a/source/UserCommands.H
+++ b/source/UserCommands.H
@@ -20,12 +20,9 @@
 #define USERCOMMANDS_H
 
 #include "String.H"
-#include "Person.H"
-#include "ServerConnection.H"
 
-#ifdef USESCRIPTS
-#include "Interp.H"
-#endif
+class Person;
+class ServerConnection;
 
 class UserCommands {
 public:

diff --git a/source/UserListItem.H b/source/UserListItem.H
index cf2ee0f..49cf509 100644 (file)
--- a/source/UserListItem.H
+++ b/source/UserListItem.H
@@ -26,10 +26,10 @@
 
 #include "Mask.H"
 
-class User;
-class UserList;
 class Commands;
+class User;
 class UserCommands;
+class UserList;
 
 class UserListItem {
   // Mask on the user

diff --git a/source/Utils.C b/source/Utils.C
index 7105380..aabee5e 100644 (file)
--- a/source/Utils.C
+++ b/source/Utils.C
@@ -20,14 +20,19 @@
 #include "config.h"
 #endif
 
-#include <cctype>
-#include <cstdlib>
+#include "Utils.H"
+
 #include <string>
 #include <sstream>
 
+#include <cctype>
+#include <cstdlib>
+
 #include "Bot.H"
-#include "Utils.H"
+#include "ChannelList.H"
 #include "StringTokenizer.H"
+#include "User.H"
+#include "UserList.H"
 
 std::string
 Utils::get_nick (std::string nuh)

diff --git a/source/Utils.H b/source/Utils.H
index 46e3762..0c5c008 100644 (file)
--- a/source/Utils.H
+++ b/source/Utils.H
@@ -24,11 +24,12 @@
 #include "config.h"
 #endif
 
-#include <ctime>
 #include <algorithm>
 #include <list>
 #include <string>
 
+#include <ctime>
+
 class Bot;
 
 #ifdef USESCRIPTS