6 files changed, 3 insertions, 7 deletions
diff --git a/src/bots.cpp b/src/bots.cpp
index da5fe7574..c484ec5d4 100644
--- a/src/bots.cpp
+++ b/src/bots.cpp
@@ -32,7 +32,9 @@ static const Anope::string BotServFlagStrings[] = {
 };
 template<> const Anope::string* Flags<BotServFlag>::flags_strings = BotServFlagStrings;
 
-BotInfo::BotInfo(const Anope::string &nnick, const Anope::string &nuser, const Anope::string &nhost, const Anope::string &nreal, const Anope::string &bmodes) : User(nnick, nuser, nhost, "", "", Me, nreal, Anope::CurTime, "", Servers::TS6_UID_Retrieve()), Serializable("BotInfo"), Service(NULL, "BotInfo", nnick), botmodes(bmodes)
+BotInfo *BotServ = NULL, *ChanServ = NULL, *Global = NULL, *HostServ = NULL, *MemoServ = NULL, *NickServ = NULL, *OperServ = NULL;
+
+BotInfo::BotInfo(const Anope::string &nnick, const Anope::string &nuser, const Anope::string &nhost, const Anope::string &nreal, const Anope::string &bmodes) : User(nnick, nuser, nhost, "", "", Me, nreal, Anope::CurTime, "", Servers::TS6_UID_Retrieve()), Serializable("BotInfo"), botmodes(bmodes)
 {
 	this->lastmsg = this->created = Anope::CurTime;
 	this->introduced = false;
diff --git a/src/channels.cpp b/src/channels.cpp
index 41755b9c8..f6d44e9f8 100644
--- a/src/channels.cpp
+++ b/src/channels.cpp
@@ -23,7 +23,6 @@
 #include "config.h"
 #include "access.h"
 #include "sockets.h"
-#include "chanserv.h"
 
 channel_map ChannelList;
 
diff --git a/src/logger.cpp b/src/logger.cpp
index f6058ab42..6341effd1 100644
--- a/src/logger.cpp
+++ b/src/logger.cpp
@@ -22,8 +22,6 @@
 #include "uplink.h"
 #include "protocol.h"
 #include "global.h"
-#include "operserv.h"
-#include "chanserv.h"
 
 #ifndef _WIN32
 #include <sys/time.h>
diff --git a/src/protocol.cpp b/src/protocol.cpp
index de2013cc6..44b7770da 100644
--- a/src/protocol.cpp
+++ b/src/protocol.cpp
@@ -19,7 +19,6 @@
 #include "uplink.h"
 #include "bots.h"
 #include "channels.h"
-#include "operserv.h"
 
 IRCDProto *IRCD = NULL;
 
diff --git a/src/regchannel.cpp b/src/regchannel.cpp
index 43c51d783..28c247cd9 100644
--- a/src/regchannel.cpp
+++ b/src/regchannel.cpp
@@ -20,7 +20,6 @@
 #include "bots.h"
 #include "language.h"
 #include "servers.h"
-#include "chanserv.h"
 
 Serialize::Checker<registered_channel_map> RegisteredChannelList("ChannelInfo");
 
diff --git a/src/users.cpp b/src/users.cpp
index 628b0c464..3bbc0d7fd 100644
--- a/src/users.cpp
+++ b/src/users.cpp
@@ -22,7 +22,6 @@
 #include "config.h"
 #include "opertype.h"
 #include "nickserv.h"
-#include "operserv.h"
 #include "language.h"
 
 user_map UserListByNick, UserListByUID;