5 files changed, 5 insertions, 5 deletions
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;