9 files changed, 18 insertions, 18 deletions
diff --git a/modules/commands/os_defcon.cpp b/modules/commands/os_defcon.cpp
index 47851bd89..4966f9e78 100644
--- a/modules/commands/os_defcon.cpp
+++ b/modules/commands/os_defcon.cpp
@@ -243,7 +243,7 @@ class CommandOSDefcon : public Command
 
 class OSDefcon : public Module
 {
-	service_reference<SessionService> session_service;
+	service_reference<SessionService, Base> session_service;
 	service_reference<XLineManager> akills;
 	CommandOSDefcon commandosdefcon;
 
diff --git a/modules/commands/os_forbid.cpp b/modules/commands/os_forbid.cpp
index f4ce7b0c8..ef591923c 100644
--- a/modules/commands/os_forbid.cpp
+++ b/modules/commands/os_forbid.cpp
@@ -75,7 +75,7 @@ class MyForbidService : public ForbidService
 
 class CommandOSForbid : public Command
 {
-	service_reference<ForbidService> fs;
+	service_reference<ForbidService, Base> fs;
  public:
 	CommandOSForbid(Module *creator) : Command(creator, "operserv/forbid", 1, 5), fs("forbid")
 	{
diff --git a/modules/commands/os_forbid.h b/modules/commands/os_forbid.h
index d7b6e1467..06a936645 100644
--- a/modules/commands/os_forbid.h
+++ b/modules/commands/os_forbid.h
@@ -19,10 +19,10 @@ struct ForbidData
 	ForbidType type;
 };
 
-class ForbidService : public Service<ForbidService>
+class ForbidService : public Service<Base>
 {
  public:
-	ForbidService(Module *m) : Service<ForbidService>(m, "forbid") { }
+	ForbidService(Module *m) : Service<Base>(m, "forbid") { }
 
 	virtual void AddForbid(ForbidData *d) = 0;
 
diff --git a/modules/commands/os_ignore.cpp b/modules/commands/os_ignore.cpp
index 46286786f..5f2cbb195 100644
--- a/modules/commands/os_ignore.cpp
+++ b/modules/commands/os_ignore.cpp
@@ -146,7 +146,7 @@ class CommandOSIgnore : public Command
  private:
 	void DoAdd(CommandSource &source, const std::vector<Anope::string> &params)
 	{
-		service_reference<IgnoreService> ignore_service("ignore");
+		service_reference<IgnoreService, Base> ignore_service("ignore");
 		if (!ignore_service)
 			return;
 
@@ -181,7 +181,7 @@ class CommandOSIgnore : public Command
 
 	void DoList(CommandSource &source)
 	{
-		service_reference<IgnoreService> ignore_service("ignore");
+		service_reference<IgnoreService, Base> ignore_service("ignore");
 		if (!ignore_service)
 			return;
 
@@ -205,7 +205,7 @@ class CommandOSIgnore : public Command
 
 	void DoDel(CommandSource &source, const std::vector<Anope::string> &params)
 	{
-		service_reference<IgnoreService> ignore_service("ignore");
+		service_reference<IgnoreService, Base> ignore_service("ignore");
 		if (!ignore_service)
 			return;
 
@@ -222,7 +222,7 @@ class CommandOSIgnore : public Command
 
 	void DoClear(CommandSource &source)
 	{
-		service_reference<IgnoreService> ignore_service("ignore");
+		service_reference<IgnoreService, Base> ignore_service("ignore");
 		if (!ignore_service)
 			return;
 
@@ -301,7 +301,7 @@ class OSIgnore : public Module
 	{
 		if (params.size() >= 4 && params[0].equals_ci("OS") && params[1].equals_ci("IGNORE"))
 		{
-			service_reference<IgnoreService> ignore_service("ignore");
+			service_reference<IgnoreService, Base> ignore_service("ignore");
 			if (ignore_service)
 			{
 				const Anope::string &mask = params[2];
diff --git a/modules/commands/os_ignore.h b/modules/commands/os_ignore.h
index daa8e1863..b00f427dd 100644
--- a/modules/commands/os_ignore.h
+++ b/modules/commands/os_ignore.h
@@ -18,12 +18,12 @@ struct IgnoreData
 	time_t time; /* When do we stop ignoring them? */
 };
 
-class IgnoreService : public Service<IgnoreService>
+class IgnoreService : public Service<Base>
 {
  protected:
 	std::list<IgnoreData> ignores;
 
-	IgnoreService(Module *c, const Anope::string &n) : Service<IgnoreService>(c, n) { }
+	IgnoreService(Module *c, const Anope::string &n) : Service<Base>(c, n) { }
 	
  public:
 	virtual void AddIgnore(const Anope::string &mask, const Anope::string &creator, const Anope::string &reason, time_t delta = Anope::CurTime) = 0;
diff --git a/modules/commands/os_news.cpp b/modules/commands/os_news.cpp
index 227bc9380..6a959ee47 100644
--- a/modules/commands/os_news.cpp
+++ b/modules/commands/os_news.cpp
@@ -106,7 +106,7 @@ static const char **findmsgs(NewsType type)
 
 class NewsBase : public Command
 {
-	service_reference<NewsService> ns;
+	service_reference<NewsService, Base> ns;
 
  protected:
 	void DoList(CommandSource &source, NewsType type, const char **msgs)
diff --git a/modules/commands/os_news.h b/modules/commands/os_news.h
index 484c8403e..436cadcb4 100644
--- a/modules/commands/os_news.h
+++ b/modules/commands/os_news.h
@@ -23,10 +23,10 @@ struct NewsItem
 	time_t time;
 };
 
-class NewsService : public Service<NewsService>
+class NewsService : public Service<Base>
 {
  public:
-	NewsService(Module *m) : Service<NewsService>(m, "news") { }
+	NewsService(Module *m) : Service<Base>(m, "news") { }
 	
 	virtual void AddNewsItem(NewsItem *n) = 0;
 	
diff --git a/modules/commands/os_session.cpp b/modules/commands/os_session.cpp
index a8808420c..8b174f333 100644
--- a/modules/commands/os_session.cpp
+++ b/modules/commands/os_session.cpp
@@ -14,7 +14,7 @@
 #include "module.h"
 #include "os_session.h"
 
-static service_reference<SessionService> sessionservice("session");
+static service_reference<SessionService, Base> sessionservice("session");
 
 class MySessionService : public SessionService
 {
@@ -634,7 +634,7 @@ class OSSession : public Module
 	ExpireTimer expiretimer;
 	CommandOSSession commandossession;
 	CommandOSException commandosexception;
-	service_reference<XLineManager> akills;
+	service_reference<XLineManager, Base> akills;
 
 	void AddSession(User *u, bool exempt)
 	{
diff --git a/modules/commands/os_session.h b/modules/commands/os_session.h
index e47fb3c51..d406a7154 100644
--- a/modules/commands/os_session.h
+++ b/modules/commands/os_session.h
@@ -1,13 +1,13 @@
 #ifndef OS_SESSION_H
 #define OS_SESSION_H
 
-class SessionService : public Service<SessionService>
+class SessionService : public Service<Base>
 {
  public:
 	typedef Anope::map<Session *> SessionMap;
 	typedef std::vector<Exception *> ExceptionVector;
 
-	SessionService(Module *m) : Service<SessionService>(m, "session") { }
+	SessionService(Module *m) : Service<Base>(m, "session") { }
 
 	virtual void AddException(Exception *e) = 0;