Tidy up source files:

- Use #pragma once instead of include guards.
- Move header files in src/modules to include/modules.
- Fixed various spacing issues.

56 files changed, 57 insertions, 989 deletions

diff --git a/src/modules/account.h b/src/modules/account.h
deleted file mode 100644
index ba671ba0b..000000000
--- a/src/modules/account.h
+++ /dev/null
@@ -1,44 +0,0 @@
-/*
- * InspIRCd -- Internet Relay Chat Daemon
- *
- *   Copyright (C) 2008 Craig Edwards <craigedwards@brainbox.cc>
- *
- * This file is part of InspIRCd.  InspIRCd is free software: you can
- * redistribute it and/or modify it under the terms of the GNU General Public
- * License as published by the Free Software Foundation, version 2.
- *
- * This program is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
- * FOR A PARTICULAR PURPOSE.  See the GNU General Public License for more
- * details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-
-#ifndef ACCOUNT_H
-#define ACCOUNT_H
-
-#include <map>
-#include <string>
-
-class AccountEvent : public Event
-{
- public:
-	User* const user;
-	const std::string account;
-	AccountEvent(Module* me, User* u, const std::string& name)
-		: Event(me, "account_login"), user(u), account(name)
-	{
-	}
-};
-
-typedef StringExtItem AccountExtItem;
-
-inline AccountExtItem* GetAccountExtItem()
-{
-	return static_cast<AccountExtItem*>(ServerInstance->Extensions.GetItem("accountname"));
-}
-
-#endif
diff --git a/src/modules/extra/m_mysql.cpp b/src/modules/extra/m_mysql.cpp
index b71c3543e..2a7e2f878 100644
--- a/src/modules/extra/m_mysql.cpp
+++ b/src/modules/extra/m_mysql.cpp
@@ -25,7 +25,7 @@
 
 #include "inspircd.h"
 #include <mysql.h>
-#include "sql.h"
+#include "modules/sql.h"
 
 #ifdef _WIN32
 # pragma comment(lib, "mysqlclient.lib")
diff --git a/src/modules/extra/m_pgsql.cpp b/src/modules/extra/m_pgsql.cpp
index ea94834f3..6d2e0c88a 100644
--- a/src/modules/extra/m_pgsql.cpp
+++ b/src/modules/extra/m_pgsql.cpp
@@ -26,7 +26,7 @@
 #include <cstdlib>
 #include <sstream>
 #include <libpq-fe.h>
-#include "sql.h"
+#include "modules/sql.h"
 
 /* $ModDesc: PostgreSQL Service Provider module for all other m_sql* modules, uses v2 of the SQL API */
 /* $CompileFlags: -Iexec("pg_config --includedir") eval("my $s = `pg_config --version`;$s =~ /^.*?(\d+)\.(\d+)\.(\d+).*?$/;my $v = hex(sprintf("0x%02x%02x%02x", $1, $2, $3));print "-DPGSQL_HAS_ESCAPECONN" if(($v >= 0x080104) || ($v >= 0x07030F && $v < 0x070400) || ($v >= 0x07040D && $v < 0x080000) || ($v >= 0x080008 && $v < 0x080100));") */
diff --git a/src/modules/extra/m_regex_pcre.cpp b/src/modules/extra/m_regex_pcre.cpp
index e9d9aba8a..b2dd53515 100644
--- a/src/modules/extra/m_regex_pcre.cpp
+++ b/src/modules/extra/m_regex_pcre.cpp
@@ -20,10 +20,10 @@
 
 #include "inspircd.h"
 #include <pcre.h>
-#include "m_regex.h"
+#include "modules/regex.h"
 
 /* $ModDesc: Regex Provider Module for PCRE */
-/* $ModDep: m_regex.h */
+/* $ModDep: modules/regex.h */
 /* $CompileFlags: exec("pcre-config --cflags") */
 /* $LinkerFlags: exec("pcre-config --libs") rpath("pcre-config --libs") -lpcre */
 
diff --git a/src/modules/extra/m_regex_posix.cpp b/src/modules/extra/m_regex_posix.cpp
index 513f54cfc..2c1295fd8 100644
--- a/src/modules/extra/m_regex_posix.cpp
+++ b/src/modules/extra/m_regex_posix.cpp
@@ -19,12 +19,12 @@
 
 
 #include "inspircd.h"
-#include "m_regex.h"
+#include "modules/regex.h"
 #include <sys/types.h>
 #include <regex.h>
 
 /* $ModDesc: Regex Provider Module for POSIX Regular Expressions */
-/* $ModDep: m_regex.h */
+/* $ModDep: modules/regex.h */
 
 class POSIXRegexException : public ModuleException
 {
diff --git a/src/modules/extra/m_regex_stdlib.cpp b/src/modules/extra/m_regex_stdlib.cpp
index 64d479cbc..3c15f5568 100644
--- a/src/modules/extra/m_regex_stdlib.cpp
+++ b/src/modules/extra/m_regex_stdlib.cpp
@@ -17,7 +17,7 @@
  */
 
 #include "inspircd.h"
-#include "m_regex.h"
+#include "modules/regex.h"
 #include <regex>
 
 /* $ModDesc: Regex Provider Module for std::regex Regular Expressions */
@@ -25,7 +25,7 @@
  *  Specify the Regular Expression engine to use here. Valid settings are
  *  bre, ere, awk, grep, egrep, ecmascript (default if not specified)*/
 /* $CompileFlags: -std=c++11 */
-/* $ModDep: m_regex.h */
+/* $ModDep: modules/regex.h */
 
 class StdRegexException : public ModuleException
 {
diff --git a/src/modules/extra/m_regex_tre.cpp b/src/modules/extra/m_regex_tre.cpp
index b5bd7d012..c352d5fdf 100644
--- a/src/modules/extra/m_regex_tre.cpp
+++ b/src/modules/extra/m_regex_tre.cpp
@@ -19,14 +19,14 @@
 
 
 #include "inspircd.h"
-#include "m_regex.h"
+#include "modules/regex.h"
 #include <sys/types.h>
 #include <tre/regex.h>
 
 /* $ModDesc: Regex Provider Module for TRE Regular Expressions */
 /* $CompileFlags: pkgconfincludes("tre","tre/regex.h","") */
 /* $LinkerFlags: pkgconflibs("tre","/libtre.so","-ltre") rpath("pkg-config --libs tre") */
-/* $ModDep: m_regex.h */
+/* $ModDep: modules/regex.h */
 
 class TRERegexException : public ModuleException
 {
diff --git a/src/modules/extra/m_sqlite3.cpp b/src/modules/extra/m_sqlite3.cpp
index 40f44557a..5cffa3640 100644
--- a/src/modules/extra/m_sqlite3.cpp
+++ b/src/modules/extra/m_sqlite3.cpp
@@ -22,7 +22,7 @@
 
 #include "inspircd.h"
 #include <sqlite3.h>
-#include "sql.h"
+#include "modules/sql.h"
 
 #ifdef _WIN32
 # pragma comment(lib, "sqlite3.lib")
diff --git a/src/modules/extra/m_ssl_gnutls.cpp b/src/modules/extra/m_ssl_gnutls.cpp
index 31beb258f..1caacaa0f 100644
--- a/src/modules/extra/m_ssl_gnutls.cpp
+++ b/src/modules/extra/m_ssl_gnutls.cpp
@@ -25,8 +25,8 @@
 #include <gcrypt.h>
 #include <gnutls/gnutls.h>
 #include <gnutls/x509.h>
-#include "ssl.h"
-#include "m_cap.h"
+#include "modules/ssl.h"
+#include "modules/cap.h"
 
 #ifdef _WIN32
 # pragma comment(lib, "libgnutls.lib")
diff --git a/src/modules/extra/m_ssl_openssl.cpp b/src/modules/extra/m_ssl_openssl.cpp
index 427439eb3..5a0e56db2 100644
--- a/src/modules/extra/m_ssl_openssl.cpp
+++ b/src/modules/extra/m_ssl_openssl.cpp
@@ -33,7 +33,7 @@
 #include "inspircd.h"
 #include <openssl/ssl.h>
 #include <openssl/err.h>
-#include "ssl.h"
+#include "modules/ssl.h"
 
 #ifdef _WIN32
 # pragma comment(lib, "libcrypto.lib")
diff --git a/src/modules/hash.h b/src/modules/hash.h
deleted file mode 100644
index dd7f082b0..000000000
--- a/src/modules/hash.h
+++ /dev/null
@@ -1,61 +0,0 @@
-/*
- * InspIRCd -- Internet Relay Chat Daemon
- *
- *   Copyright (C) 2010 Daniel De Graaf <danieldg@inspircd.org>
- *
- * This file is part of InspIRCd.  InspIRCd is free software: you can
- * redistribute it and/or modify it under the terms of the GNU General Public
- * License as published by the Free Software Foundation, version 2.
- *
- * This program is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
- * FOR A PARTICULAR PURPOSE.  See the GNU General Public License for more
- * details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-
-#ifndef HASH_H
-#define HASH_H
-
-#include "modules.h"
-
-class HashProvider : public DataProvider
-{
- public:
-	const unsigned int out_size;
-	const unsigned int block_size;
-	HashProvider(Module* mod, const std::string& Name, int osiz, int bsiz)
-		: DataProvider(mod, Name), out_size(osiz), block_size(bsiz) {}
-	virtual std::string sum(const std::string& data) = 0;
-	inline std::string hexsum(const std::string& data)
-	{
-		return BinToHex(sum(data));
-	}
-
-	inline std::string b64sum(const std::string& data)
-	{
-		return BinToBase64(sum(data), NULL, 0);
-	}
-
-	/** HMAC algorithm, RFC 2104 */
-	std::string hmac(const std::string& key, const std::string& msg)
-	{
-		std::string hmac1, hmac2;
-		std::string kbuf = key.length() > block_size ? sum(key) : key;
-		kbuf.resize(block_size);
-
-		for (size_t n = 0; n < block_size; n++)
-		{
-			hmac1.push_back(static_cast<char>(kbuf[n] ^ 0x5C));
-			hmac2.push_back(static_cast<char>(kbuf[n] ^ 0x36));
-		}
-		hmac2.append(msg);
-		hmac1.append(sum(hmac2));
-		return sum(hmac1);
-	}
-};
-
-#endif
diff --git a/src/modules/httpd.h b/src/modules/httpd.h
deleted file mode 100644
index 57c60b3b2..000000000
--- a/src/modules/httpd.h
+++ /dev/null
@@ -1,206 +0,0 @@
-/*
- * InspIRCd -- Internet Relay Chat Daemon
- *
- *   Copyright (C) 2009 Daniel De Graaf <danieldg@inspircd.org>
- *   Copyright (C) 2008 Pippijn van Steenhoven <pip88nl@gmail.com>
- *   Copyright (C) 2007 John Brooks <john.brooks@dereferenced.net>
- *   Copyright (C) 2007 Dennis Friis <peavey@inspircd.org>
- *   Copyright (C) 2006 Craig Edwards <craigedwards@brainbox.cc>
- *
- * This file is part of InspIRCd.  InspIRCd is free software: you can
- * redistribute it and/or modify it under the terms of the GNU General Public
- * License as published by the Free Software Foundation, version 2.
- *
- * This program is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
- * FOR A PARTICULAR PURPOSE.  See the GNU General Public License for more
- * details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-
-#include "base.h"
-
-#ifndef HTTPD_H
-#define HTTPD_H
-
-#include <string>
-#include <sstream>
-#include <map>
-
-/** A modifyable list of HTTP header fields
- */
-class HTTPHeaders
-{
- protected:
-	std::map<std::string,std::string> headers;
- public:
-
-	/** Set the value of a header
-	 * Sets the value of the named header. If the header is already present, it will be replaced
-	 */
-	void SetHeader(const std::string &name, const std::string &data)
-	{
-		headers[name] = data;
-	}
-
-	/** Set the value of a header, only if it doesn't exist already
-	 * Sets the value of the named header. If the header is already present, it will NOT be updated
-	 */
-	void CreateHeader(const std::string &name, const std::string &data)
-	{
-		if (!IsSet(name))
-			SetHeader(name, data);
-	}
-
-	/** Remove the named header
-	 */
-	void RemoveHeader(const std::string &name)
-	{
-		headers.erase(name);
-	}
-
-	/** Remove all headers
-	 */
-	void Clear()
-	{
-		headers.clear();
-	}
-
-	/** Get the value of a header
-	 * @return The value of the header, or an empty string
-	 */
-	std::string GetHeader(const std::string &name)
-	{
-		std::map<std::string,std::string>::iterator it = headers.find(name);
-		if (it == headers.end())
-			return std::string();
-
-		return it->second;
-	}
-
-	/** Check if the given header is specified
-	 * @return true if the header is specified
-	 */
-	bool IsSet(const std::string &name)
-	{
-		std::map<std::string,std::string>::iterator it = headers.find(name);
-		return (it != headers.end());
-	}
-
-	/** Get all headers, formatted by the HTTP protocol
-	 * @return Returns all headers, formatted according to the HTTP protocol. There is no request terminator at the end
-	 */
-	std::string GetFormattedHeaders()
-	{
-		std::string re;
-
-		for (std::map<std::string,std::string>::iterator i = headers.begin(); i != headers.end(); i++)
-			re += i->first + ": " + i->second + "\r\n";
-
-		return re;
-	}
-};
-
-class HttpServerSocket;
-
-/** This class represents a HTTP request.
- */
-class HTTPRequest : public Event
-{
- protected:
-	std::string type;
-	std::string document;
-	std::string ipaddr;
-	std::string postdata;
-
- public:
-
-	HTTPHeaders *headers;
-	int errorcode;
-
-	/** A socket pointer, which you must return in your HTTPDocument class
-	 * if you reply to this request.
-	 */
-	HttpServerSocket* sock;
-
-	/** Initialize HTTPRequest.
-	 * This constructor is called by m_httpd.so to initialize the class.
-	 * @param request_type The request type, e.g. GET, POST, HEAD
-	 * @param uri The URI, e.g. /page
-	 * @param hdr The headers sent with the request
-	 * @param opaque An opaque pointer used internally by m_httpd, which you must pass back to the module in your reply.
-	 * @param ip The IP address making the web request.
-	 * @param pdata The post data (content after headers) received with the request, up to Content-Length in size
-	 */
-	HTTPRequest(Module* me, const std::string &eventid, const std::string &request_type, const std::string &uri,
-		HTTPHeaders* hdr, HttpServerSocket* socket, const std::string &ip, const std::string &pdata)
-		: Event(me, eventid), type(request_type), document(uri), ipaddr(ip), postdata(pdata), headers(hdr), sock(socket)
-	{
-	}
-
-	/** Get the post data (request content).
-	 * All post data will be returned, including carriage returns and linefeeds.
-	 * @return The postdata
-	 */
-	std::string& GetPostData()
-	{
-		return postdata;
-	}
-
-	/** Get the request type.
-	 * Any request type can be intercepted, even ones which are invalid in the HTTP/1.1 spec.
-	 * @return The request type, e.g. GET, POST, HEAD
-	 */
-	std::string& GetType()
-	{
-		return type;
-	}
-
-	/** Get URI.
-	 * The URI string (URL minus hostname and scheme) will be provided by this function.
-	 * @return The URI being requested
-	 */
-	std::string& GetURI()
-	{
-		return document;
-	}
-
-	/** Get IP address of requester.
-	 * The requesting system's ip address will be returned.
-	 * @return The IP address as a string
-	 */
-	std::string& GetIP()
-	{
-		return ipaddr;
-	}
-};
-
-/** You must return a HTTPDocument to the httpd module by using the Request class.
- * When you initialize this class you may initialize it with all components required to
- * form a valid HTTP response, including document data, headers, and a response code.
- */
-class HTTPDocumentResponse : public Request
-{
- public:
-	std::stringstream* document;
-	int responsecode;
-	HTTPHeaders headers;
-	HTTPRequest& src;
-
-	/** Initialize a HTTPRequest ready for sending to m_httpd.so.
-	 * @param opaque The socket pointer you obtained from the HTTPRequest at an earlier time
-	 * @param doc A stringstream containing the document body
-	 * @param response A valid HTTP/1.0 or HTTP/1.1 response code. The response text will be determined for you
-	 * based upon the response code.
-	 * @param extra Any extra headers to include with the defaults, seperated by carriage return and linefeed.
-	 */
-	HTTPDocumentResponse(Module* me, HTTPRequest& req, std::stringstream* doc, int response)
-		: Request(me, req.source, "HTTP-DOC"), document(doc), responsecode(response), src(req)
-	{
-	}
-};
-
-#endif
diff --git a/src/modules/m_banexception.cpp b/src/modules/m_banexception.cpp
index cf4144935..63f0085ed 100644
--- a/src/modules/m_banexception.cpp
+++ b/src/modules/m_banexception.cpp
@@ -25,7 +25,6 @@
 #include "listmode.h"
 
 /* $ModDesc: Provides support for the +e channel mode */
-/* $ModDep: ../../include/listmode.h */
 
 /* Written by Om<om@inspircd.org>, April 2005. */
 /* Rewritten to use the listmode utility by Om, December 2005 */
diff --git a/src/modules/m_cap.cpp b/src/modules/m_cap.cpp
index 59b92eb27..ee9c96936 100644
--- a/src/modules/m_cap.cpp
+++ b/src/modules/m_cap.cpp
@@ -19,7 +19,7 @@
 
 
 #include "inspircd.h"
-#include "m_cap.h"
+#include "modules/cap.h"
 
 /* $ModDesc: Provides the CAP negotiation mechanism seen in ratbox-derived ircds */
 
diff --git a/src/modules/m_cap.h b/src/modules/m_cap.h
deleted file mode 100644
index 409671f48..000000000
--- a/src/modules/m_cap.h
+++ /dev/null
@@ -1,92 +0,0 @@
-/*
- * InspIRCd -- Internet Relay Chat Daemon
- *
- *   Copyright (C) 2009 Daniel De Graaf <danieldg@inspircd.org>
- *   Copyright (C) 2008 Craig Edwards <craigedwards@brainbox.cc>
- *
- * This file is part of InspIRCd.  InspIRCd is free software: you can
- * redistribute it and/or modify it under the terms of the GNU General Public
- * License as published by the Free Software Foundation, version 2.
- *
- * This program is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
- * FOR A PARTICULAR PURPOSE.  See the GNU General Public License for more
- * details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-
-#ifndef M_CAP_H
-#define M_CAP_H
-
-class CapEvent : public Event
-{
- public:
-	enum CapEventType
-	{
-		CAPEVENT_REQ,
-		CAPEVENT_LS,
-		CAPEVENT_LIST,
-		CAPEVENT_CLEAR
-	};
-
-	CapEventType type;
-	std::vector<std::string> wanted;
-	std::vector<std::string> ack;
-	User* user;
-	CapEvent(Module* sender, User* u, CapEventType capevtype) : Event(sender, "cap_request"), type(capevtype), user(u) {}
-};
-
-class GenericCap
-{
- public:
-	LocalIntExt ext;
-	const std::string cap;
-	GenericCap(Module* parent, const std::string &Cap) : ext("cap_" + Cap, parent), cap(Cap)
-	{
-		ServerInstance->Modules->AddService(ext);
-	}
-
-	void HandleEvent(Event& ev)
-	{
-		if (ev.id != "cap_request")
-			return;
-
-		CapEvent *data = static_cast<CapEvent*>(&ev);
-		if (data->type == CapEvent::CAPEVENT_REQ)
-		{
-			for (std::vector<std::string>::iterator it = data->wanted.begin(); it != data->wanted.end(); ++it)
-			{
-				if (it->empty())
-					continue;
-				bool enablecap = ((*it)[0] != '-');
-				if (((enablecap) && (*it == cap)) || (*it == "-" + cap))
-				{
-					// we can handle this, so ACK it, and remove it from the wanted list
-					data->ack.push_back(*it);
-					data->wanted.erase(it);
-					ext.set(data->user, enablecap ? 1 : 0);
-					break;
-				}
-			}
-		}
-		else if (data->type == CapEvent::CAPEVENT_LS)
-		{
-			data->wanted.push_back(cap);
-		}
-		else if (data->type == CapEvent::CAPEVENT_LIST)
-		{
-			if (ext.get(data->user))
-				data->wanted.push_back(cap);
-		}
-		else if (data->type == CapEvent::CAPEVENT_CLEAR)
-		{
-			data->ack.push_back("-" + cap);
-			ext.set(data->user, 0);
-		}
-	}
-};
-
-#endif
diff --git a/src/modules/m_cloaking.cpp b/src/modules/m_cloaking.cpp
index 5bec93f03..9eb9a8da9 100644
--- a/src/modules/m_cloaking.cpp
+++ b/src/modules/m_cloaking.cpp
@@ -24,7 +24,7 @@
 
 
 #include "inspircd.h"
-#include "hash.h"
+#include "modules/hash.h"
 
 /* $ModDesc: Provides masking of user hostnames */
 
diff --git a/src/modules/m_filter.cpp b/src/modules/m_filter.cpp
index 7e7ded306..027222b3a 100644
--- a/src/modules/m_filter.cpp
+++ b/src/modules/m_filter.cpp
@@ -22,7 +22,7 @@
 
 #include "inspircd.h"
 #include "xline.h"
-#include "m_regex.h"
+#include "modules/regex.h"
 
 /* $ModDesc: Text (spam) filtering */
 
diff --git a/src/modules/m_httpd.cpp b/src/modules/m_httpd.cpp
index 46f0d6907..d768a9436 100644
--- a/src/modules/m_httpd.cpp
+++ b/src/modules/m_httpd.cpp
@@ -23,10 +23,10 @@
 
 
 #include "inspircd.h"
-#include "httpd.h"
+#include "modules/httpd.h"
 
 /* $ModDesc: Provides HTTP serving facilities to modules */
-/* $ModDep: httpd.h */
+/* $ModDep: modules/httpd.h */
 
 class ModuleHttpServer;
 
diff --git a/src/modules/m_httpd_acl.cpp b/src/modules/m_httpd_acl.cpp
index 70c36a154..aaf03802c 100644
--- a/src/modules/m_httpd_acl.cpp
+++ b/src/modules/m_httpd_acl.cpp
@@ -19,7 +19,7 @@
 
 
 #include "inspircd.h"
-#include "httpd.h"
+#include "modules/httpd.h"
 #include "protocol.h"
 
 /* $ModDesc: Provides access control lists (passwording of resources, ip restrictions etc) to m_httpd.so dependent modules */
diff --git a/src/modules/m_httpd_config.cpp b/src/modules/m_httpd_config.cpp
index 88594e2fe..cfdaa4290 100644
--- a/src/modules/m_httpd_config.cpp
+++ b/src/modules/m_httpd_config.cpp
@@ -19,7 +19,7 @@
 
 
 #include "inspircd.h"
-#include "httpd.h"
+#include "modules/httpd.h"
 #include "protocol.h"
 
 /* $ModDesc: Allows for the server configuration to be viewed over HTTP via m_httpd.so */
diff --git a/src/modules/m_httpd_stats.cpp b/src/modules/m_httpd_stats.cpp
index 2eb9f7cb7..7d7ebcf3d 100644
--- a/src/modules/m_httpd_stats.cpp
+++ b/src/modules/m_httpd_stats.cpp
@@ -22,7 +22,7 @@
 
 
 #include "inspircd.h"
-#include "httpd.h"
+#include "modules/httpd.h"
 #include "xline.h"
 #include "protocol.h"
 
diff --git a/src/modules/m_inviteexception.cpp b/src/modules/m_inviteexception.cpp
index 2d8382832..69498a942 100644
--- a/src/modules/m_inviteexception.cpp
+++ b/src/modules/m_inviteexception.cpp
@@ -25,7 +25,6 @@
 #include "listmode.h"
 
 /* $ModDesc: Provides support for the +I channel mode */
-/* $ModDep: ../../include/listmode.h */
 
 /*
  * Written by Om <om@inspircd.org>, April 2005.
diff --git a/src/modules/m_ircv3.cpp b/src/modules/m_ircv3.cpp
index cc2e6c322..0e28d59f2 100644
--- a/src/modules/m_ircv3.cpp
+++ b/src/modules/m_ircv3.cpp
@@ -19,8 +19,8 @@
 /* $ModDesc: Provides support for extended-join, away-notify and account-notify CAP capabilities */
 
 #include "inspircd.h"
-#include "account.h"
-#include "m_cap.h"
+#include "modules/account.h"
+#include "modules/cap.h"
 
 class ModuleIRCv3 : public Module
 {
diff --git a/src/modules/m_md5.cpp b/src/modules/m_md5.cpp
index c42507ea1..feba027f6 100644
--- a/src/modules/m_md5.cpp
+++ b/src/modules/m_md5.cpp
@@ -27,7 +27,7 @@
 #ifdef HAS_STDINT
 #include <stdint.h>
 #endif
-#include "hash.h"
+#include "modules/hash.h"
 
 /* The four core functions - F1 is optimized somewhat */
 #define F1(x, y, z) (z ^ (x & (y ^ z)))
diff --git a/src/modules/m_namesx.cpp b/src/modules/m_namesx.cpp
index 4ba8613d8..48d8cc871 100644
--- a/src/modules/m_namesx.cpp
+++ b/src/modules/m_namesx.cpp
@@ -21,7 +21,7 @@
 
 
 #include "inspircd.h"
-#include "m_cap.h"
+#include "modules/cap.h"
 
 /* $ModDesc: Provides the NAMESX (CAP multi-prefix) capability. */
 
diff --git a/src/modules/m_password_hash.cpp b/src/modules/m_password_hash.cpp
index 98462780b..e913f4925 100644
--- a/src/modules/m_password_hash.cpp
+++ b/src/modules/m_password_hash.cpp
@@ -21,7 +21,7 @@
 /* $ModDesc: Allows for hashed oper passwords */
 
 #include "inspircd.h"
-#include "hash.h"
+#include "modules/hash.h"
 
 /* Handle /MKPASSWD
  */
diff --git a/src/modules/m_regex.h b/src/modules/m_regex.h
deleted file mode 100644
index 0233f938a..000000000
--- a/src/modules/m_regex.h
+++ /dev/null
@@ -1,58 +0,0 @@
-/*
- * InspIRCd -- Internet Relay Chat Daemon
- *
- *   Copyright (C) 2009 Daniel De Graaf <danieldg@inspircd.org>
- *   Copyright (C) 2008 Thomas Stagner <aquanight@inspircd.org>
- *
- * This file is part of InspIRCd.  InspIRCd is free software: you can
- * redistribute it and/or modify it under the terms of the GNU General Public
- * License as published by the Free Software Foundation, version 2.
- *
- * This program is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
- * FOR A PARTICULAR PURPOSE.  See the GNU General Public License for more
- * details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-
-#ifndef M_REGEX_H
-#define M_REGEX_H
-
-#include "inspircd.h"
-
-class Regex : public classbase
-{
-protected:
-	std::string regex_string; // The raw uncompiled regex string.
-
-	// Constructor may as well be protected, as this class is abstract.
-	Regex(const std::string& rx) : regex_string(rx)
-	{
-	}
-
-public:
-
-	virtual ~Regex()
-	{
-	}
-
-	virtual bool Matches(const std::string& text) = 0;
-
-	const std::string& GetRegexString() const
-	{
-		return regex_string;
-	}
-};
-
-class RegexFactory : public DataProvider
-{
- public:
-	RegexFactory(Module* Creator, const std::string& Name) : DataProvider(Creator, Name) {}
-
-	virtual Regex* Create(const std::string& expr) = 0;
-};
-
-#endif
diff --git a/src/modules/m_regex_glob.cpp b/src/modules/m_regex_glob.cpp
index a3088cabd..f53ac2b9c 100644
--- a/src/modules/m_regex_glob.cpp
+++ b/src/modules/m_regex_glob.cpp
@@ -18,7 +18,7 @@
  */
 
 
-#include "m_regex.h"
+#include "modules/regex.h"
 #include "inspircd.h"
 
 /* $ModDesc: Regex module using plain wildcard matching. */
diff --git a/src/modules/m_regonlycreate.cpp b/src/modules/m_regonlycreate.cpp
index 9d4cd5f60..98250d2a7 100644
--- a/src/modules/m_regonlycreate.cpp
+++ b/src/modules/m_regonlycreate.cpp
@@ -21,7 +21,7 @@
 
 
 #include "inspircd.h"
-#include "account.h"
+#include "modules/account.h"
 
 /* $ModDesc: Prevents users whose nicks are not registered from creating new channels */
 
diff --git a/src/modules/m_ripemd160.cpp b/src/modules/m_ripemd160.cpp
index e487d6e30..3e7d00049 100644
--- a/src/modules/m_ripemd160.cpp
+++ b/src/modules/m_ripemd160.cpp
@@ -64,7 +64,7 @@
 #ifdef HAS_STDINT
 #include <stdint.h>
 #endif
-#include "hash.h"
+#include "modules/hash.h"
 
 #define RMDsize 160
 
diff --git a/src/modules/m_rline.cpp b/src/modules/m_rline.cpp
index 2e94df042..c4439cbfb 100644
--- a/src/modules/m_rline.cpp
+++ b/src/modules/m_rline.cpp
@@ -23,7 +23,7 @@
 /* $ModDesc: RLINE: Regexp user banning. */
 
 #include "inspircd.h"
-#include "m_regex.h"
+#include "modules/regex.h"
 #include "xline.h"
 
 static bool ZlineOnMatch = false;
diff --git a/src/modules/m_sasl.cpp b/src/modules/m_sasl.cpp
index ff007f799..e949e3fd4 100644
--- a/src/modules/m_sasl.cpp
+++ b/src/modules/m_sasl.cpp
@@ -19,10 +19,10 @@
 
 
 #include "inspircd.h"
-#include "m_cap.h"
-#include "account.h"
-#include "sasl.h"
-#include "ssl.h"
+#include "modules/cap.h"
+#include "modules/account.h"
+#include "modules/sasl.h"
+#include "modules/ssl.h"
 
 /* $ModDesc: Provides support for IRC Authentication Layer (aka: atheme SASL) via AUTHENTICATE. */
 
diff --git a/src/modules/m_services_account.cpp b/src/modules/m_services_account.cpp
index fbf099924..bdd47b4bc 100644
--- a/src/modules/m_services_account.cpp
+++ b/src/modules/m_services_account.cpp
@@ -25,7 +25,7 @@
 /* $ModDesc: Provides support for ircu-style services accounts, including chmode +R, etc. */
 
 #include "inspircd.h"
-#include "account.h"
+#include "modules/account.h"
 
 /** Channel mode +r - mark a channel as identified
  */
diff --git a/src/modules/m_sha256.cpp b/src/modules/m_sha256.cpp
index 360b18ddd..2c53e7170 100644
--- a/src/modules/m_sha256.cpp
+++ b/src/modules/m_sha256.cpp
@@ -62,7 +62,7 @@
 #ifdef HAS_STDINT
 #include <stdint.h>
 #endif
-#include "hash.h"
+#include "modules/hash.h"
 
 #ifndef HAS_STDINT
 typedef unsigned int uint32_t;
diff --git a/src/modules/m_spanningtree/cachetimer.h b/src/modules/m_spanningtree/cachetimer.h
index bad1b7419..da9911170 100644
--- a/src/modules/m_spanningtree/cachetimer.h
+++ b/src/modules/m_spanningtree/cachetimer.h
@@ -17,8 +17,7 @@
  */
 
 
-#ifndef M_SPANNINGTREE_CACHETIMER_H
-#define M_SPANNINGTREE_CACHETIMER_H
+#pragma once
 
 #include "timer.h"
 
@@ -37,5 +36,3 @@ class CacheRefreshTimer : public Timer
 	CacheRefreshTimer(SpanningTreeUtilities* Util);
 	virtual void Tick(time_t TIME);
 };
-
-#endif
diff --git a/src/modules/m_spanningtree/commands.h b/src/modules/m_spanningtree/commands.h
index 3b5b499c1..93455c8c4 100644
--- a/src/modules/m_spanningtree/commands.h
+++ b/src/modules/m_spanningtree/commands.h
@@ -17,8 +17,7 @@
  */
 
 
-#ifndef M_SPANNINGTREE_COMMANDS_H
-#define M_SPANNINGTREE_COMMANDS_H
+#pragma once
 
 #include "main.h"
 
@@ -151,5 +150,3 @@ class SpanningTreeCommands
 	CommandFName fname;
 	SpanningTreeCommands(ModuleSpanningTree* module);
 };
-
-#endif
diff --git a/src/modules/m_spanningtree/hmac.cpp b/src/modules/m_spanningtree/hmac.cpp
index 8dc18cbbd..ec39fb746 100644
--- a/src/modules/m_spanningtree/hmac.cpp
+++ b/src/modules/m_spanningtree/hmac.cpp
@@ -21,8 +21,8 @@
 #include "inspircd.h"
 #include "socket.h"
 #include "xline.h"
-#include "../hash.h"
-#include "../ssl.h"
+#include "modules/hash.h"
+#include "modules/ssl.h"
 #include "socketengine.h"
 
 #include "main.h"
diff --git a/src/modules/m_spanningtree/link.h b/src/modules/m_spanningtree/link.h
index 797f108d8..b318c9bf2 100644
--- a/src/modules/m_spanningtree/link.h
+++ b/src/modules/m_spanningtree/link.h
@@ -18,8 +18,7 @@
  */
 
 
-#ifndef M_SPANNINGTREE_LINK_H
-#define M_SPANNINGTREE_LINK_H
+#pragma once
 
 class Link : public refcountbase
 {
@@ -51,5 +50,3 @@ class Autoconnect : public refcountbase
 	int position;
 	Autoconnect(ConfigTag* Tag) : tag(Tag) {}
 };
-
-#endif
diff --git a/src/modules/m_spanningtree/main.h b/src/modules/m_spanningtree/main.h
index 1a16d72bb..fc59a3c7d 100644
--- a/src/modules/m_spanningtree/main.h
+++ b/src/modules/m_spanningtree/main.h
@@ -21,8 +21,7 @@
  */
 
 
-#ifndef M_SPANNINGTREE_MAIN_H
-#define M_SPANNINGTREE_MAIN_H
+#pragma once
 
 #include "inspircd.h"
 #include <stdarg.h>
@@ -178,5 +177,3 @@ class ModuleSpanningTree : public Module
 	Version GetVersion();
 	void Prioritize();
 };
-
-#endif
diff --git a/src/modules/m_spanningtree/operquit.cpp b/src/modules/m_spanningtree/operquit.cpp
index af2e04ebc..235f74781 100644
--- a/src/modules/m_spanningtree/operquit.cpp
+++ b/src/modules/m_spanningtree/operquit.cpp
@@ -19,7 +19,6 @@
 
 #include "inspircd.h"
 #include "xline.h"
-
 #include "treesocket.h"
 #include "treeserver.h"
 #include "utils.h"
diff --git a/src/modules/m_spanningtree/protocolinterface.h b/src/modules/m_spanningtree/protocolinterface.h
index 297366893..2757db8da 100644
--- a/src/modules/m_spanningtree/protocolinterface.h
+++ b/src/modules/m_spanningtree/protocolinterface.h
@@ -17,8 +17,7 @@
  */
 
 
-#ifndef M_SPANNINGTREE_PROTOCOLINTERFACE_H
-#define M_SPANNINGTREE_PROTOCOLINTERFACE_H
+#pragma once
 
 class SpanningTreeUtilities;
 class ModuleSpanningTree;
@@ -43,6 +42,3 @@ class SpanningTreeProtocolInterface : public ProtocolInterface
 	virtual void SendUserNotice(User* target, const std::string &text);
 	virtual void GetServerList(ProtoServerList &sl);
 };
-
-#endif
-
diff --git a/src/modules/m_spanningtree/resolvers.h b/src/modules/m_spanningtree/resolvers.h
index 65b9e7249..a092e156b 100644
--- a/src/modules/m_spanningtree/resolvers.h
+++ b/src/modules/m_spanningtree/resolvers.h
@@ -18,8 +18,7 @@
  */
 
 
-#ifndef M_SPANNINGTREE_RESOLVERS_H
-#define M_SPANNINGTREE_RESOLVERS_H
+#pragma once
 
 #include "socket.h"
 #include "inspircd.h"
@@ -63,5 +62,3 @@ class ServernameResolver : public Resolver
 	void OnLookupComplete(const std::string &result, unsigned int ttl, bool cached);
 	void OnError(ResolverError e, const std::string &errormessage);
 };
-
-#endif
diff --git a/src/modules/m_spanningtree/treeserver.cpp b/src/modules/m_spanningtree/treeserver.cpp
index 6213483ee..42cd37fb9 100644
--- a/src/modules/m_spanningtree/treeserver.cpp
+++ b/src/modules/m_spanningtree/treeserver.cpp
@@ -24,7 +24,7 @@
 #include "socket.h"
 #include "xline.h"
 #include "main.h"
-#include "../spanningtree.h"
+#include "modules/spanningtree.h"
 
 #include "utils.h"
 #include "treeserver.h"
diff --git a/src/modules/m_spanningtree/treeserver.h b/src/modules/m_spanningtree/treeserver.h
index 60b6d1def..f5d81bc73 100644
--- a/src/modules/m_spanningtree/treeserver.h
+++ b/src/modules/m_spanningtree/treeserver.h
@@ -19,8 +19,7 @@
  */
 
 
-#ifndef M_SPANNINGTREE_TREESERVER_H
-#define M_SPANNINGTREE_TREESERVER_H
+#pragma once
 
 #include "treesocket.h"
 
@@ -210,5 +209,3 @@ class TreeServer : public classbase
 	 */
 	~TreeServer();
 };
-
-#endif
diff --git a/src/modules/m_spanningtree/treesocket.h b/src/modules/m_spanningtree/treesocket.h
index 85d256c61..2d975a4bf 100644
--- a/src/modules/m_spanningtree/treesocket.h
+++ b/src/modules/m_spanningtree/treesocket.h
@@ -20,8 +20,7 @@
  */
 
 
-#ifndef M_SPANNINGTREE_TREESOCKET_H
-#define M_SPANNINGTREE_TREESOCKET_H
+#pragma once
 
 #include "socket.h"
 #include "inspircd.h"
@@ -318,6 +317,3 @@ class TreeSocket : public BufferedSocket
 	 */
 	bool Introduced();
 };
-
-#endif
-
diff --git a/src/modules/m_spanningtree/treesocket1.cpp b/src/modules/m_spanningtree/treesocket1.cpp
index 26171ee72..6a528ed8d 100644
--- a/src/modules/m_spanningtree/treesocket1.cpp
+++ b/src/modules/m_spanningtree/treesocket1.cpp
@@ -26,7 +26,7 @@
 #include "socketengine.h"
 
 #include "main.h"
-#include "../spanningtree.h"
+#include "modules/spanningtree.h"
 #include "utils.h"
 #include "treeserver.h"
 #include "link.h"
diff --git a/src/modules/m_spanningtree/utils.h b/src/modules/m_spanningtree/utils.h
index 0d44cd24f..fed90c253 100644
--- a/src/modules/m_spanningtree/utils.h
+++ b/src/modules/m_spanningtree/utils.h
@@ -20,8 +20,7 @@
  */
 
 
-#ifndef M_SPANNINGTREE_UTILS_H
-#define M_SPANNINGTREE_UTILS_H
+#pragma once
 
 #include "inspircd.h"
 
@@ -179,5 +178,3 @@ class SpanningTreeUtilities : public classbase
 	 */
 	void RefreshIPCache();
 };
-
-#endif
diff --git a/src/modules/m_sqlauth.cpp b/src/modules/m_sqlauth.cpp
index 8647e3e9e..e92eea3a5 100644
--- a/src/modules/m_sqlauth.cpp
+++ b/src/modules/m_sqlauth.cpp
@@ -18,8 +18,8 @@
 
 
 #include "inspircd.h"
-#include "sql.h"
-#include "hash.h"
+#include "modules/sql.h"
+#include "modules/hash.h"
 
 /* $ModDesc: Allow/Deny connections based upon an arbitrary SQL table */
 
diff --git a/src/modules/m_sqloper.cpp b/src/modules/m_sqloper.cpp
index 881b8d6d2..b5b020d9d 100644
--- a/src/modules/m_sqloper.cpp
+++ b/src/modules/m_sqloper.cpp
@@ -18,8 +18,8 @@
 
 
 #include "inspircd.h"
-#include "sql.h"
-#include "hash.h"
+#include "modules/sql.h"
+#include "modules/hash.h"
 
 /* $ModDesc: Allows storage of oper credentials in an SQL table */
 
diff --git a/src/modules/m_sslinfo.cpp b/src/modules/m_sslinfo.cpp
index a04a643a0..b51c30b76 100644
--- a/src/modules/m_sslinfo.cpp
+++ b/src/modules/m_sslinfo.cpp
@@ -18,7 +18,7 @@
 
 
 #include "inspircd.h"
-#include "ssl.h"
+#include "modules/ssl.h"
 
 /* $ModDesc: Provides SSL metadata, including /WHOIS information and /SSLINFO command */
 
diff --git a/src/modules/m_sslmodes.cpp b/src/modules/m_sslmodes.cpp
index fbd77c249..d862a0706 100644
--- a/src/modules/m_sslmodes.cpp
+++ b/src/modules/m_sslmodes.cpp
@@ -22,7 +22,7 @@
 
 
 #include "inspircd.h"
-#include "ssl.h"
+#include "modules/ssl.h"
 
 /* $ModDesc: Provides channel mode +z to allow for Secure/SSL only channels */
 
diff --git a/src/modules/m_uhnames.cpp b/src/modules/m_uhnames.cpp
index 1b0c91c94..a0ff796ae 100644
--- a/src/modules/m_uhnames.cpp
+++ b/src/modules/m_uhnames.cpp
@@ -20,7 +20,7 @@
 
 
 #include "inspircd.h"
-#include "m_cap.h"
+#include "modules/cap.h"
 
 /* $ModDesc: Provides the UHNAMES facility. */
 
diff --git a/src/modules/sasl.h b/src/modules/sasl.h
deleted file mode 100644
index f67351104..000000000
--- a/src/modules/sasl.h
+++ /dev/null
@@ -1,34 +0,0 @@
-/*
- * InspIRCd -- Internet Relay Chat Daemon
- *
- *   Copyright (C) 2010 Daniel De Graaf <danieldg@inspircd.org>
- *
- * This file is part of InspIRCd.  InspIRCd is free software: you can
- * redistribute it and/or modify it under the terms of the GNU General Public
- * License as published by the Free Software Foundation, version 2.
- *
- * This program is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
- * FOR A PARTICULAR PURPOSE.  See the GNU General Public License for more
- * details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-
-#ifndef SASL_H
-#define SASL_H
-
-class SASLFallback : public Event
-{
- public:
-	const parameterlist& params;
-	SASLFallback(Module* me, const parameterlist& p)
-		: Event(me, "sasl_fallback"), params(p)
-	{
-		Send();
-	}
-};
-
-#endif
diff --git a/src/modules/spanningtree.h b/src/modules/spanningtree.h
deleted file mode 100644
index 212f35ff3..000000000
--- a/src/modules/spanningtree.h
+++ /dev/null
@@ -1,43 +0,0 @@
-/*
- * InspIRCd -- Internet Relay Chat Daemon
- *
- *   Copyright (C) 2009 Daniel De Graaf <danieldg@inspircd.org>
- *
- * This file is part of InspIRCd.  InspIRCd is free software: you can
- * redistribute it and/or modify it under the terms of the GNU General Public
- * License as published by the Free Software Foundation, version 2.
- *
- * This program is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
- * FOR A PARTICULAR PURPOSE.  See the GNU General Public License for more
- * details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-
-#ifndef SPANNINGTREE_H
-#define SPANNINGTREE_H
-
-struct AddServerEvent : public Event
-{
-	const std::string servername;
-	AddServerEvent(Module* me, const std::string& name)
-		: Event(me, "new_server"), servername(name)
-	{
-		Send();
-	}
-};
-
-struct DelServerEvent : public Event
-{
-	const std::string servername;
-	DelServerEvent(Module* me, const std::string& name)
-		: Event(me, "lost_server"), servername(name)
-	{
-		Send();
-	}
-};
-
-#endif
diff --git a/src/modules/sql.h b/src/modules/sql.h
deleted file mode 100644
index 436cd1da8..000000000
--- a/src/modules/sql.h
+++ /dev/null
@@ -1,187 +0,0 @@
-/*
- * InspIRCd -- Internet Relay Chat Daemon
- *
- *   Copyright (C) 2010 Daniel De Graaf <danieldg@inspircd.org>
- *
- * This file is part of InspIRCd.  InspIRCd is free software: you can
- * redistribute it and/or modify it under the terms of the GNU General Public
- * License as published by the Free Software Foundation, version 2.
- *
- * This program is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
- * FOR A PARTICULAR PURPOSE.  See the GNU General Public License for more
- * details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-
-#ifndef INSPIRCD_SQLAPI_3
-#define INSPIRCD_SQLAPI_3
-
-/** Defines the error types which SQLerror may be set to
- */
-enum SQLerrorNum { SQL_NO_ERROR, SQL_BAD_DBID, SQL_BAD_CONN, SQL_QSEND_FAIL, SQL_QREPLY_FAIL };
-
-/** A list of format parameters for an SQLquery object.
- */
-typedef std::vector<std::string> ParamL;
-
-typedef std::map<std::string, std::string> ParamM;
-
-class SQLEntry
-{
- public:
-	std::string value;
-	bool nul;
-	SQLEntry() : nul(true) {}
-	SQLEntry(const std::string& v) : value(v), nul(false) {}
-	inline operator std::string&() { return value; }
-};
-
-typedef std::vector<SQLEntry> SQLEntries;
-
-/**
- * Result of an SQL query. Only valid inside OnResult
- */
-class SQLResult : public classbase
-{
- public:
-	/**
-	 * Return the number of rows in the result.
-	 *
-	 * Note that if you have perfomed an INSERT or UPDATE query or other
-	 * query which will not return rows, this will return the number of
-	 * affected rows. In this case you SHOULD NEVER access any of the result
-	 * set rows, as there aren't any!
-	 * @returns Number of rows in the result set.
-	 */
-	virtual int Rows() = 0;
-
-	/**
-	 * Return a single row (result of the query). The internal row counter
-	 * is incremented by one.
-	 *
-	 * @param result Storage for the result data.
-	 * @returns true if there was a row, false if no row exists (end of
-	 * iteration)
-	 */
-	virtual bool GetRow(SQLEntries& result) = 0;
-
-	/** Returns column names for the items in this row
-	 */
-	virtual void GetCols(std::vector<std::string>& result) = 0;
-};
-
-/** SQLerror holds the error state of a request.
- * The error string varies from database software to database software
- * and should be used to display informational error messages to users.
- */
-class SQLerror
-{
- public:
-	/** The error id
-	 */
-	SQLerrorNum id;
-
-	/** The error string
-	 */
-	std::string str;
-
-	/** Initialize an SQLerror
-	 * @param i The error ID to set
-	 * @param s The (optional) error string to set
-	 */
-	SQLerror(SQLerrorNum i, const std::string &s = "")
-	: id(i), str(s)
-	{
-	}
-
-	/** Return the error string for an error
-	 */
-	const char* Str()
-	{
-		if(str.length())
-			return str.c_str();
-
-		switch(id)
-		{
-			case SQL_BAD_DBID:
-				return "Invalid database ID";
-			case SQL_BAD_CONN:
-				return "Invalid connection";
-			case SQL_QSEND_FAIL:
-				return "Sending query failed";
-			case SQL_QREPLY_FAIL:
-				return "Getting query result failed";
-			default:
-				return "Unknown error";
-		}
-	}
-};
-
-/**
- * Object representing an SQL query. This should be allocated on the heap and
- * passed to an SQLProvider, which will free it when the query is complete or
- * when the querying module is unloaded.
- *
- * You should store whatever information is needed to have the callbacks work in
- * this object (UID of user, channel name, etc).
- */
-class SQLQuery : public classbase
-{
- public:
-	ModuleRef creator;
-
-	SQLQuery(Module* Creator) : creator(Creator) {}
-	virtual ~SQLQuery() {}
-
-	virtual void OnResult(SQLResult& result) = 0;
-	/**
-	 * Called when the query fails
-	 */
-	virtual void OnError(SQLerror& error) { }
-};
-
-/**
- * Provider object for SQL servers
- */
-class SQLProvider : public DataProvider
-{
- public:
-	SQLProvider(Module* Creator, const std::string& Name) : DataProvider(Creator, Name) {}
-	/** Submit an asynchronous SQL request
-	 * @param callback The result reporting point
-	 * @param query The hardcoded query string. If you have parameters to substitute, see below.
-	 */
-	virtual void submit(SQLQuery* callback, const std::string& query) = 0;
-
-	/** Submit an asynchronous SQL request
-	 * @param callback The result reporting point
-	 * @param format The simple parameterized query string ('?' parameters)
-	 * @param p Parameters to fill in for the '?' entries
-	 */
-	virtual void submit(SQLQuery* callback, const std::string& format, const ParamL& p) = 0;
-
-	/** Submit an asynchronous SQL request.
-	 * @param callback The result reporting point
-	 * @param format The parameterized query string ('$name' parameters)
-	 * @param p Parameters to fill in for the '$name' entries
-	 */
-	virtual void submit(SQLQuery* callback, const std::string& format, const ParamM& p) = 0;
-
-	/** Convenience function to prepare a map from a User* */
-	void PopulateUserInfo(User* user, ParamM& userinfo)
-	{
-		userinfo["nick"] = user->nick;
-		userinfo["host"] = user->host;
-		userinfo["ip"] = user->GetIPString();
-		userinfo["gecos"] = user->fullname;
-		userinfo["ident"] = user->ident;
-		userinfo["server"] = user->server;
-		userinfo["uuid"] = user->uuid;
-	}
-};
-
-#endif
diff --git a/src/modules/ssl.h b/src/modules/ssl.h
deleted file mode 100644
index 9deafb830..000000000
--- a/src/modules/ssl.h
+++ /dev/null
@@ -1,175 +0,0 @@
-/*
- * InspIRCd -- Internet Relay Chat Daemon
- *
- *   Copyright (C) 2009 Daniel De Graaf <danieldg@inspircd.org>
- *   Copyright (C) 2006 Craig Edwards <craigedwards@brainbox.cc>
- *
- * This file is part of InspIRCd.  InspIRCd is free software: you can
- * redistribute it and/or modify it under the terms of the GNU General Public
- * License as published by the Free Software Foundation, version 2.
- *
- * This program is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
- * FOR A PARTICULAR PURPOSE.  See the GNU General Public License for more
- * details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-
-#ifndef SSL_H
-#define SSL_H
-
-#include <map>
-#include <string>
-
-/** ssl_cert is a class which abstracts SSL certificate
- * and key information.
- *
- * Because gnutls and openssl represent key information in
- * wildly different ways, this class allows it to be accessed
- * in a unified manner. These classes are attached to ssl-
- * connected local users using SSLCertExt
- */
-class ssl_cert : public refcountbase
-{
- public:
-	std::string dn;
-	std::string issuer;
-	std::string error;
-	std::string fingerprint;
-	bool trusted, invalid, unknownsigner, revoked;
-
-	ssl_cert() : trusted(false), invalid(true), unknownsigner(true), revoked(false) {}
-
-	/** Get certificate distinguished name
-	 * @return Certificate DN
-	 */
-	const std::string& GetDN()
-	{
-		return dn;
-	}
-
-	/** Get Certificate issuer
-	 * @return Certificate issuer
-	 */
-	const std::string& GetIssuer()
-	{
-		return issuer;
-	}
-
-	/** Get error string if an error has occured
-	 * @return The error associated with this users certificate,
-	 * or an empty string if there is no error.
-	 */
-	const std::string& GetError()
-	{
-		return error;
-	}
-
-	/** Get key fingerprint.
-	 * @return The key fingerprint as a hex string.
-	 */
-	const std::string& GetFingerprint()
-	{
-		return fingerprint;
-	}
-
-	/** Get trust status
-	 * @return True if this is a trusted certificate
-	 * (the certificate chain validates)
-	 */
-	bool IsTrusted()
-	{
-		return trusted;
-	}
-
-	/** Get validity status
-	 * @return True if the certificate itself is
-	 * correctly formed.
-	 */
-	bool IsInvalid()
-	{
-		return invalid;
-	}
-
-	/** Get signer status
-	 * @return True if the certificate appears to be
-	 * self-signed.
-	 */
-	bool IsUnknownSigner()
-	{
-		return unknownsigner;
-	}
-
-	/** Get revokation status.
-	 * @return True if the certificate is revoked.
-	 * Note that this only works properly for GnuTLS
-	 * right now.
-	 */
-	bool IsRevoked()
-	{
-		return revoked;
-	}
-
-	bool IsCAVerified()
-	{
-		return trusted && !invalid && !revoked && !unknownsigner && error.empty();
-	}
-
-	std::string GetMetaLine()
-	{
-		std::stringstream value;
-		bool hasError = !error.empty();
-		value << (IsInvalid() ? "v" : "V") << (IsTrusted() ? "T" : "t") << (IsRevoked() ? "R" : "r")
-			<< (IsUnknownSigner() ? "s" : "S") << (hasError ? "E" : "e") << " ";
-		if (hasError)
-			value << GetError();
-		else
-			value << GetFingerprint() << " " << GetDN() << " " << GetIssuer();
-		return value.str();
-	}
-};
-
-/** Get certificate from a socket (only useful with an SSL module) */
-struct SocketCertificateRequest : public Request
-{
-	StreamSocket* const sock;
-	ssl_cert* cert;
-
-	SocketCertificateRequest(StreamSocket* ss, Module* Me)
-		: Request(Me, ss->GetIOHook(), "GET_SSL_CERT"), sock(ss), cert(NULL)
-	{
-		Send();
-	}
-
-	std::string GetFingerprint()
-	{
-		if (cert)
-			return cert->GetFingerprint();
-		return "";
-	}
-};
-
-/** Get certificate from a user (requires m_sslinfo) */
-struct UserCertificateRequest : public Request
-{
-	User* const user;
-	ssl_cert* cert;
-
-	UserCertificateRequest(User* u, Module* Me, Module* info = ServerInstance->Modules->Find("m_sslinfo.so"))
-		: Request(Me, info, "GET_USER_CERT"), user(u), cert(NULL)
-	{
-		Send();
-	}
-
-	std::string GetFingerprint()
-	{
-		if (cert)
-			return cert->GetFingerprint();
-		return "";
-	}
-};
-
-#endif