12 files changed, 17 insertions, 19 deletions
diff --git a/include/ctables.h b/include/ctables.h
index 0cf4c50d2..cc80053d8 100644
--- a/include/ctables.h
+++ b/include/ctables.h
@@ -85,7 +85,7 @@ struct RouteDescriptor
 /** A structure that defines a command. Every command available
  * in InspIRCd must be defined as derived from Command.
  */
-class CoreExport Command : public Extensible
+class CoreExport Command : public classbase
 {
  public:
 	/** Command name
diff --git a/include/inspircd.h b/include/inspircd.h
index 93ba8bfa6..9f7d07f5d 100644
--- a/include/inspircd.h
+++ b/include/inspircd.h
@@ -208,7 +208,7 @@ template<typename T, typename V, typename R> inline char* itoa(const T &in, V *r
  * It is used by the InspIRCd class, which internally
  * has an instance of it.
  */
-class serverstats : public classbase
+class serverstats
 {
   public:
 	/** Number of accepted connections
@@ -298,14 +298,12 @@ class CoreExport ConfigReaderThread : public Thread
 };
 
 /** The main class of the irc server.
- * This class contains instances of all the other classes
- * in this software, with the exception of the base class,
- * classbase. Amongst other things, it contains a ModeParser,
- * a DNS object, a CommandParser object, and a list of active
- * Module objects, and facilities for Module objects to
- * interact with the core system it implements.
+ * This class contains instances of all the other classes in this software.
+ * Amongst other things, it contains a ModeParser, a DNS object, a CommandParser
+ * object, and a list of active Module objects, and facilities for Module
+ * objects to interact with the core system it implements.
  */
-class CoreExport InspIRCd : public classbase
+class CoreExport InspIRCd
 {
  private:
 	/** Holds the current UID. Used to generate the next one.
diff --git a/include/logger.h b/include/logger.h
index 709d00aed..4914e86a2 100644
--- a/include/logger.h
+++ b/include/logger.h
@@ -117,7 +117,7 @@ class CoreExport LogStream : public classbase
 
 typedef std::map<FileWriter*, int> FileLogMap;
 
-class CoreExport LogManager : public classbase
+class CoreExport LogManager
 {
  private:
 	/** Lock variable, set to true when a log is in progress, which prevents further loggging from happening and creating a loop.
diff --git a/include/protocol.h b/include/protocol.h
index a3afe9fb3..ed53c3cbb 100644
--- a/include/protocol.h
+++ b/include/protocol.h
@@ -33,7 +33,7 @@ class ProtoServer
 
 typedef std::list<ProtoServer> ProtoServerList;
 
-class ProtocolInterface : public Extensible
+class ProtocolInterface
 {
  public:
 	ProtocolInterface() { }
diff --git a/include/snomasks.h b/include/snomasks.h
index dddde1ff9..591a8708c 100644
--- a/include/snomasks.h
+++ b/include/snomasks.h
@@ -14,7 +14,7 @@
 #ifndef __SNOMASKS_H__
 #define __SNOMASKS_H__
 
-class Snomask : public Extensible
+class Snomask
 {
  public:
 	char MySnomask;
diff --git a/include/testsuite.h b/include/testsuite.h
index 89318e32f..66a12ab39 100644
--- a/include/testsuite.h
+++ b/include/testsuite.h
@@ -14,7 +14,7 @@
 #ifndef __TESTSUITE_H__
 #define __TESTSUITE_H__
 
-class TestSuite : public Extensible
+class TestSuite
 {
  public:
 	TestSuite();
diff --git a/include/usermanager.h b/include/usermanager.h
index 93f0476e3..4c1f94248 100644
--- a/include/usermanager.h
+++ b/include/usermanager.h
@@ -19,7 +19,7 @@
 /** A list of ip addresses cross referenced against clone counts */
 typedef std::map<irc::string, unsigned int> clonemap;
 
-class CoreExport UserManager : public Extensible
+class CoreExport UserManager
 {
  private:
 	/** Map of local ip addresses for clone counting
diff --git a/src/modules/httpd.h b/src/modules/httpd.h
index 483009095..97148d413 100644
--- a/src/modules/httpd.h
+++ b/src/modules/httpd.h
@@ -22,7 +22,7 @@
 
 /** A modifyable list of HTTP header fields
  */
-class HTTPHeaders : public classbase
+class HTTPHeaders
 {
  protected:
 	std::map<std::string,std::string> headers;
diff --git a/src/modules/m_callerid.cpp b/src/modules/m_callerid.cpp
index cf60c084a..c356a2154 100644
--- a/src/modules/m_callerid.cpp
+++ b/src/modules/m_callerid.cpp
@@ -18,7 +18,7 @@
 
 /* $ModDesc: Implementation of callerid (umode +g & /accept, ala hybrid etc) */
 
-class callerid_data : public classbase
+class callerid_data
 {
  public:
 	time_t lastnotify;
diff --git a/src/modules/m_check.cpp b/src/modules/m_check.cpp
index df42d4608..4b960e18b 100644
--- a/src/modules/m_check.cpp
+++ b/src/modules/m_check.cpp
@@ -36,7 +36,7 @@ class CommandCheck : public Command
 	void dumpExt(User* user, std::string checkstr, Extensible* ext)
 	{
 		std::stringstream dumpkeys;
-		for(ExtensibleStore::const_iterator i = ext->GetExtList().begin(); i != ext->GetExtList().end(); i++)
+		for(Extensible::ExtensibleStore::const_iterator i = ext->GetExtList().begin(); i != ext->GetExtList().end(); i++)
 		{
 			ExtensionItem* item = i->first;
 			std::string value = item->serialize(FORMAT_USER, ext, i->second);
diff --git a/src/modules/m_nickflood.cpp b/src/modules/m_nickflood.cpp
index 7f67b8d08..a267cd404 100644
--- a/src/modules/m_nickflood.cpp
+++ b/src/modules/m_nickflood.cpp
@@ -17,7 +17,7 @@
 
 /** Holds settings and state associated with channel mode +F
  */
-class nickfloodsettings : public classbase
+class nickfloodsettings
 {
  public:
 	int secs;
diff --git a/src/modules/m_sasl.cpp b/src/modules/m_sasl.cpp
index b3b8045ae..8e1a73354 100644
--- a/src/modules/m_sasl.cpp
+++ b/src/modules/m_sasl.cpp
@@ -23,7 +23,7 @@ enum SaslResult { SASL_OK, SASL_FAIL, SASL_ABORT };
 /**
  * Tracks SASL authentication state like charybdis does. --nenolod
  */
-class SaslAuthenticator : public classbase
+class SaslAuthenticator
 {
  private:
 	InspIRCd *ServerInstance;