7 files changed, 11 insertions, 9 deletions
diff --git a/src/modules/extra/m_pgsql.cpp b/src/modules/extra/m_pgsql.cpp
index 14e32ac36..10dc9fd60 100644
--- a/src/modules/extra/m_pgsql.cpp
+++ b/src/modules/extra/m_pgsql.cpp
@@ -83,7 +83,7 @@ enum SQLstatus { CREAD, CWRITE, WREAD, WWRITE };
  * until pop() is called.
  */
 
-class QueryQueue
+class QueryQueue : public classbase
 {
 private:
 	std::deque<SQLresult> priority;	/* The priority queue */
diff --git a/src/modules/extra/m_sql.cpp b/src/modules/extra/m_sql.cpp
index 22933de07..654d84191 100644
--- a/src/modules/extra/m_sql.cpp
+++ b/src/modules/extra/m_sql.cpp
@@ -37,7 +37,7 @@ using namespace std;
 #define mysql_field_count mysql_num_fields
 #endif
 
-class SQLConnection
+class SQLConnection : public classbase
 {
  protected:
 
diff --git a/src/modules/extra/m_sql.h b/src/modules/extra/m_sql.h
index 2fa61fbe9..ce9ce7743 100644
--- a/src/modules/extra/m_sql.h
+++ b/src/modules/extra/m_sql.h
@@ -18,7 +18,7 @@ using namespace std;
 // so that we can neatly pass information around the
 // system.
 
-class SQLRequest
+class SQLRequest : public classbase
 {
  protected:
 	long conn_id;
@@ -65,7 +65,7 @@ class SQLRequest
 
 // Upon completion, an SQLRequest returns an SQLResponse.
 
-class SQLResult
+class SQLResult : public classbase
 {
  protected:
 	int resptype;
@@ -118,7 +118,7 @@ class SQLResult
 	}
 };
 
-class SQLQuery
+class SQLQuery : public classbase
 {
  private:
 	SQLRequest* rowrequest;
diff --git a/src/modules/m_cloaking.cpp b/src/modules/m_cloaking.cpp
index 33e41355c..99898259a 100644
--- a/src/modules/m_cloaking.cpp
+++ b/src/modules/m_cloaking.cpp
@@ -58,7 +58,9 @@ typedef unsigned int uint32_t;
 typedef uint32_t word32; /* NOT unsigned long. We don't support 16 bit platforms, anyway. */
 typedef unsigned char byte;
 
-struct xMD5Context {
+class xMD5Context : public classbase
+{
+ public:
 	word32 buf[4];
 	word32 bytes[2];
 	word32 in[16];
diff --git a/src/modules/m_spanningtree.cpp b/src/modules/m_spanningtree.cpp
index ec5d6a517..5ae16c50d 100644
--- a/src/modules/m_spanningtree.cpp
+++ b/src/modules/m_spanningtree.cpp
@@ -154,7 +154,7 @@ extern std::vector<ELine> pelines;
  * are created and destroyed.
  */
 
-class TreeServer
+class TreeServer : public classbase
 {
 	TreeServer* Parent;			/* Parent entry */
 	TreeServer* Route;			/* Route entry */
diff --git a/src/modules/m_timedbans.cpp b/src/modules/m_timedbans.cpp
index b1b0de25f..da0c0faeb 100644
--- a/src/modules/m_timedbans.cpp
+++ b/src/modules/m_timedbans.cpp
@@ -28,7 +28,7 @@ using namespace std;
 
 static Server *Srv;
 	 
-class TimedBan
+class TimedBan : public classbase
 {
  public:
 	std::string channel;
diff --git a/src/modules/m_watch.cpp b/src/modules/m_watch.cpp
index 1e11dfd51..faf0792dc 100644
--- a/src/modules/m_watch.cpp
+++ b/src/modules/m_watch.cpp
@@ -29,7 +29,7 @@ using namespace std;
 
 static Server *Srv;
 
-class watchentry
+class watchentry : public classbase
 {
  public:
 	userrec* watcher;