Fix some coding style issues.

24 files changed, 88 insertions, 88 deletions

diff --git a/include/access.h b/include/access.h
index b1587f0c7..a2e65b153 100644
--- a/include/access.h
+++ b/include/access.h
@@ -98,7 +98,7 @@ public:
 	NickCore *GetAccount() const;
 
 	void Serialize(Serialize::Data &data) const override;
-	static Serializable* Unserialize(Serializable *obj, Serialize::Data &);
+	static Serializable *Unserialize(Serializable *obj, Serialize::Data &);
 
 	static const unsigned int MAX_DEPTH = 4;
 
@@ -107,7 +107,7 @@ public:
 	 * @param nc The account
 	 * @param next Next channel to check if any
 	 */
-	virtual bool Matches(const User *u, const NickCore *nc, ChannelInfo* &next) const;
+	virtual bool Matches(const User *u, const NickCore *nc, ChannelInfo *&next) const;
 
 	/** Check if this access entry has the given privilege.
 	 * @param name The privilege name
diff --git a/include/account.h b/include/account.h
index 3d6e0e846..ea65af9d4 100644
--- a/include/account.h
+++ b/include/account.h
@@ -56,7 +56,7 @@ public:
 	~NickAlias();
 
 	void Serialize(Serialize::Data &data) const override;
-	static Serializable* Unserialize(Serializable *obj, Serialize::Data &);
+	static Serializable *Unserialize(Serializable *obj, Serialize::Data &);
 
 	/** Set a vhost for the user
 	 * @param ident The ident
@@ -153,7 +153,7 @@ public:
 	~NickCore();
 
 	void Serialize(Serialize::Data &data) const override;
-	static Serializable* Unserialize(Serializable *obj, Serialize::Data &);
+	static Serializable *Unserialize(Serializable *obj, Serialize::Data &);
 
 	/** Changes the display for this account
 	 * @param na The new display, must be grouped to this account.
@@ -224,7 +224,7 @@ public:
 	 * @param nick The account name to find
 	 * @return The account, if it exists
 	 */
-	static NickCore* Find(const Anope::string &nick);
+	static NickCore *Find(const Anope::string &nick);
 
 	void AddChannelReference(ChannelInfo *ci);
 	void RemoveChannelReference(ChannelInfo *ci);
diff --git a/include/anope.h b/include/anope.h
index 0f181c87f..b71f84f19 100644
--- a/include/anope.h
+++ b/include/anope.h
@@ -140,8 +140,8 @@ namespace Anope
 		 */
 		inline void push_back(char c) { return this->_string.push_back(c); }
 
-		inline string& append(const string &s) { this->_string.append(s.str()); return *this; }
-		inline string& append(const char *s, size_t n) { this->_string.append(s, n); return *this; }
+		inline string &append(const string &s) { this->_string.append(s.str()); return *this; }
+		inline string &append(const char *s, size_t n) { this->_string.append(s, n); return *this; }
 
 		/**
 		 * Resizes the string content to n characters.
@@ -159,21 +159,21 @@ namespace Anope
 		 * Trim leading and trailing white spaces from the string.
 		 */
 
-		inline string& ltrim(const Anope::string &what = " \t\r\n")
+		inline string &ltrim(const Anope::string &what = " \t\r\n")
 		{
 			while (!this->_string.empty() && what.find(this->_string[0]) != Anope::string::npos)
 				this->_string.erase(this->_string.begin());
 			return *this;
 		}
 
-		inline string& rtrim(const Anope::string &what = " \t\r\n")
+		inline string &rtrim(const Anope::string &what = " \t\r\n")
 		{
 			while (!this->_string.empty() && what.find(this->_string[this->_string.length() - 1]) != Anope::string::npos)
 				this->_string.erase(this->_string.length() - 1);
 			return *this;
 		}
 
-		inline string& trim(const Anope::string &what = " \t\r\n")
+		inline string &trim(const Anope::string &what = " \t\r\n")
 		{
 			this->ltrim(what);
 			this->rtrim(what);
@@ -210,9 +210,9 @@ namespace Anope
 		inline size_type find_last_not_of(const string &_str, size_type pos = npos) const { return this->_string.find_last_not_of(_str._string, pos); }
 		inline size_type find_last_not_of_ci(const string &_str, size_type pos = npos) const { return ci::string(this->_string.c_str()).find_last_not_of(ci::string(_str._string.c_str()), pos); }
 
-		inline int compare(size_t pos, size_t len, const string& str) const { return ci::string(this->_string.c_str()).compare(pos, len, ci::string(str.c_str())); }
-		inline int compare(size_t pos, size_t len, const string& str, size_t subpos, size_type sublen = npos) const { return ci::string(this->_string.c_str()).compare(pos, len, ci::string(str.c_str()), subpos, sublen); }
-		inline int compare(size_t pos, size_t len, const char* s, size_type n = npos) const { return ci::string(this->_string.c_str()).compare(pos, len, s, n); }
+		inline int compare(size_t pos, size_t len, const string &str) const { return ci::string(this->_string.c_str()).compare(pos, len, ci::string(str.c_str())); }
+		inline int compare(size_t pos, size_t len, const string &str, size_t subpos, size_type sublen = npos) const { return ci::string(this->_string.c_str()).compare(pos, len, ci::string(str.c_str()), subpos, sublen); }
+		inline int compare(size_t pos, size_t len, const char *s, size_type n = npos) const { return ci::string(this->_string.c_str()).compare(pos, len, s, n); }
 
 		/**
 		 * Determine if string consists of only numbers.
@@ -600,7 +600,7 @@ public:
 	/** Gets every token from this stream
 	 * @param token Tokens are pushed back here
 	 */
-	template<typename T> void GetTokens(T& token)
+	template<typename T> void GetTokens(T &token)
 	{
 		token.clear();
 		Anope::string t;
diff --git a/include/base.h b/include/base.h
index 07b3bdf89..f8d508b7e 100644
--- a/include/base.h
+++ b/include/base.h
@@ -103,14 +103,14 @@ public:
 		return NULL;
 	}
 
-	inline T* operator->()
+	inline T *operator->()
 	{
 		if (operator bool())
 			return this->ref;
 		return NULL;
 	}
 
-	inline T* operator*()
+	inline T *operator*()
 	{
 		if (operator bool())
 			return this->ref;
diff --git a/include/bots.h b/include/bots.h
index 8917621d6..711e306b5 100644
--- a/include/bots.h
+++ b/include/bots.h
@@ -56,7 +56,7 @@ public:
 	virtual ~BotInfo();
 
 	void Serialize(Serialize::Data &data) const;
-	static Serializable* Unserialize(Serializable *obj, Serialize::Data &);
+	static Serializable *Unserialize(Serializable *obj, Serialize::Data &);
 
 	void GenerateUID();
 
@@ -118,7 +118,7 @@ public:
 	 * @param permission Permission required to execute the command, if any
 	 * @return The commandinfo for the newly created command
 	 */
-	CommandInfo& SetCommand(const Anope::string &cname, const Anope::string &sname, const Anope::string &permission = "");
+	CommandInfo &SetCommand(const Anope::string &cname, const Anope::string &sname, const Anope::string &permission = "");
 
 	/** Get command info for a command
 	 * @param cname The command name
@@ -131,5 +131,5 @@ public:
 	 * @param nick_only True to only look by nick, and not by UID
 	 * @return The bot, if it exists
 	 */
-	static BotInfo* Find(const Anope::string &nick, bool nick_only = false);
+	static BotInfo *Find(const Anope::string &nick, bool nick_only = false);
 };
diff --git a/include/channels.h b/include/channels.h
index d918f4a52..4fecd9fc8 100644
--- a/include/channels.h
+++ b/include/channels.h
@@ -110,7 +110,7 @@ public:
 	 * @param status The status to give the user, if any
 	 * @return The UserContainer for the user
 	 */
-	ChanUserContainer* JoinUser(User *u, const ChannelStatus *status);
+	ChanUserContainer *JoinUser(User *u, const ChannelStatus *status);
 
 	/** Remove a user internally from the channel
 	 * @param u The user
@@ -302,7 +302,7 @@ public:
 	 * @param name The channel to find
 	 * @return The channel, if found
 	 */
-	static Channel* Find(const Anope::string &name);
+	static Channel *Find(const Anope::string &name);
 
 	/** Finds or creates a channel
 	 * @param name The channel name
diff --git a/include/commands.h b/include/commands.h
index ed318e60a..583f02da1 100644
--- a/include/commands.h
+++ b/include/commands.h
@@ -44,7 +44,7 @@ struct CoreExport CommandReply
 {
 	virtual ~CommandReply() = default;
 	virtual void SendMessage(BotInfo *source, const Anope::string &msg) = 0;
-	virtual void SendMessage(CommandSource& source, const Anope::string &msg);
+	virtual void SendMessage(CommandSource &source, const Anope::string &msg);
 };
 
 /* The source for a command */
@@ -182,5 +182,5 @@ public:
 	 * @param name If found, is set to the command name, eg REGISTER
 	 * @return true if the given command service exists
 	 */
-	static bool FindCommandFromService(const Anope::string &command_service, BotInfo* &bi, Anope::string &name);
+	static bool FindCommandFromService(const Anope::string &command_service, BotInfo *&bi, Anope::string &name);
 };
diff --git a/include/config.h b/include/config.h
index c71625ac9..f787f60b0 100644
--- a/include/config.h
+++ b/include/config.h
@@ -42,8 +42,8 @@ namespace Configuration
 		Block(const Anope::string &);
 		const Anope::string &GetName() const;
 		int CountBlock(const Anope::string &name) const;
-		const Block* GetBlock(const Anope::string &name, int num = 0) const;
-		Block* GetMutableBlock(const Anope::string &name, int num = 0);
+		const Block *GetBlock(const Anope::string &name, int num = 0) const;
+		Block *GetMutableBlock(const Anope::string &name, int num = 0);
 
 		template<typename T> T Get(const Anope::string &tag, const Anope::string &def = "") const
 		{
@@ -61,7 +61,7 @@ namespace Configuration
 		const item_map &GetItems() const;
 	};
 
-	template<> CoreExport const Anope::string Block::Get(const Anope::string &tag, const Anope::string& def) const;
+	template<> CoreExport const Anope::string Block::Get(const Anope::string &tag, const Anope::string &def) const;
 	template<> CoreExport time_t Block::Get(const Anope::string &tag, const Anope::string &def) const;
 	template<> CoreExport bool Block::Get(const Anope::string &tag, const Anope::string &def) const;
 	} // namespace Internal
diff --git a/include/extensible.h b/include/extensible.h
index df76be036..0444e8226 100644
--- a/include/extensible.h
+++ b/include/extensible.h
@@ -41,12 +41,12 @@ public:
 
 	void UnsetExtensibles();
 
-	template<typename T> T* GetExt(const Anope::string &name) const;
+	template<typename T> T *GetExt(const Anope::string &name) const;
 	bool HasExt(const Anope::string &name) const;
 
-	template<typename T> T* Extend(const Anope::string &name, const T &what);
-	template<typename T> T* Extend(const Anope::string &name);
-	template<typename T> T* Require(const Anope::string &name);
+	template<typename T> T *Extend(const Anope::string &name, const T &what);
+	template<typename T> T *Extend(const Anope::string &name);
+	template<typename T> T *Require(const Anope::string &name);
 	template<typename T> void Shrink(const Anope::string &name);
 
 	static void ExtensibleSerialize(const Extensible *, const Serializable *, Serialize::Data &data);
@@ -77,17 +77,17 @@ public:
 		}
 	}
 
-	T* Set(Extensible *obj, const T &value)
+	T *Set(Extensible *obj, const T &value)
 	{
-		T* t = Set(obj);
+		T *t = Set(obj);
 		if (t)
 			*t = value;
 		return t;
 	}
 
-	T* Set(Extensible *obj)
+	T *Set(Extensible *obj)
 	{
-		T* t = Create(obj);
+		T *t = Create(obj);
 		Unset(obj);
 		items[obj] = t;
 		obj->extension_items.insert(this);
@@ -102,7 +102,7 @@ public:
 		delete value;
 	}
 
-	T* Get(const Extensible *obj) const
+	T *Get(const Extensible *obj) const
 	{
 		std::map<Extensible *, void *>::const_iterator it = items.find(const_cast<Extensible *>(obj));
 		if (it != items.end())
@@ -115,9 +115,9 @@ public:
 		return items.find(const_cast<Extensible *>(obj)) != items.end();
 	}
 
-	T* Require(Extensible *obj)
+	T *Require(Extensible *obj)
 	{
-		T* t = Get(obj);
+		T *t = Get(obj);
 		if (t)
 			return t;
 
@@ -130,7 +130,7 @@ class ExtensibleItem
 	: public BaseExtensibleItem<T>
 {
 protected:
-	T* Create(Extensible *obj) override
+	T *Create(Extensible *obj) override
 	{
 		return new T(obj);
 	}
@@ -143,7 +143,7 @@ class PrimitiveExtensibleItem
 	: public BaseExtensibleItem<T>
 {
 protected:
-	T* Create(Extensible *obj) override
+	T *Create(Extensible *obj) override
 	{
 		return new T();
 	}
@@ -155,7 +155,7 @@ template<>
 class PrimitiveExtensibleItem<bool> : public BaseExtensibleItem<bool>
 {
 protected:
-	bool* Create(Extensible *) override
+	bool *Create(Extensible *) override
 	{
 		return NULL;
 	}
@@ -172,7 +172,7 @@ public:
 
 	void ExtensibleSerialize(const Extensible *e, const Serializable *s, Serialize::Data &data) const override
 	{
-		T* t = this->Get(e);
+		T *t = this->Get(e);
 		data[this->name] << *t;
 	}
 
@@ -216,7 +216,7 @@ struct ExtensibleRef final
 };
 
 template<typename T>
-T* Extensible::GetExt(const Anope::string &name) const
+T *Extensible::GetExt(const Anope::string &name) const
 {
 	ExtensibleRef<T> ref(name);
 	if (ref)
@@ -227,16 +227,16 @@ T* Extensible::GetExt(const Anope::string &name) const
 }
 
 template<typename T>
-T* Extensible::Extend(const Anope::string &name, const T &what)
+T *Extensible::Extend(const Anope::string &name, const T &what)
 {
-	T* t = Extend<T>(name);
+	T *t = Extend<T>(name);
 	if (t)
 		*t = what;
 	return t;
 }
 
 template<typename T>
-T* Extensible::Extend(const Anope::string &name)
+T *Extensible::Extend(const Anope::string &name)
 {
 	ExtensibleRef<T> ref(name);
 	if (ref)
@@ -247,7 +247,7 @@ T* Extensible::Extend(const Anope::string &name)
 }
 
 template<typename T>
-T* Extensible::Require(const Anope::string &name)
+T *Extensible::Require(const Anope::string &name)
 {
 	if (HasExt(name))
 		return GetExt<T>(name);
diff --git a/include/memo.h b/include/memo.h
index 70d8d63b7..233c1c065 100644
--- a/include/memo.h
+++ b/include/memo.h
@@ -25,7 +25,7 @@ public:
 	~Memo();
 
 	void Serialize(Serialize::Data &data) const override;
-	static Serializable* Unserialize(Serializable *obj, Serialize::Data &);
+	static Serializable *Unserialize(Serializable *obj, Serialize::Data &);
 
 	Anope::string owner;
 	/* When it was sent */
diff --git a/include/modules/bs_badwords.h b/include/modules/bs_badwords.h
index c20b4e87a..e4866d250 100644
--- a/include/modules/bs_badwords.h
+++ b/include/modules/bs_badwords.h
@@ -46,13 +46,13 @@ struct BadWords
 	 * @param type The type (SINGLE START END)
 	 * @return The badword
 	 */
-	virtual BadWord* AddBadWord(const Anope::string &word, BadWordType type) = 0;
+	virtual BadWord *AddBadWord(const Anope::string &word, BadWordType type) = 0;
 
 	/** Get a badword structure by index
 	 * @param index The index
 	 * @return The badword
 	 */
-	virtual BadWord* GetBadWord(unsigned index) const = 0;
+	virtual BadWord *GetBadWord(unsigned index) const = 0;
 
 	/** Get how many badwords are on this channel
 	 * @return The number of badwords in the vector
diff --git a/include/modules/cs_entrymsg.h b/include/modules/cs_entrymsg.h
index 8259adf49..219c598a6 100644
--- a/include/modules/cs_entrymsg.h
+++ b/include/modules/cs_entrymsg.h
@@ -33,5 +33,5 @@ public:
 			delete (*this)->at(i - 1);
 	}
 
-	virtual EntryMsg* Create() = 0;
+	virtual EntryMsg *Create() = 0;
 };
diff --git a/include/modules/httpd.h b/include/modules/httpd.h
index b08ca8bf4..d78de4a02 100644
--- a/include/modules/httpd.h
+++ b/include/modules/httpd.h
@@ -27,9 +27,9 @@ struct HTTPReply final
 	std::vector<cookie> cookies;
 
 	HTTPReply() = default;
-	HTTPReply& operator=(const HTTPReply &) = default;
+	HTTPReply &operator=(const HTTPReply &) = default;
 
-	HTTPReply(const HTTPReply& other) : error(other.error), length(other.length)
+	HTTPReply(const HTTPReply &other) : error(other.error), length(other.length)
 	{
 		content_type = other.content_type;
 		headers = other.headers;
@@ -169,7 +169,7 @@ public:
 
 	virtual bool RegisterPage(HTTPPage *page) = 0;
 	virtual void UnregisterPage(HTTPPage *page) = 0;
-	virtual HTTPPage* FindPage(const Anope::string &name) = 0;
+	virtual HTTPPage *FindPage(const Anope::string &name) = 0;
 };
 
 namespace HTTPUtils
@@ -180,7 +180,7 @@ namespace HTTPUtils
 
 		for (unsigned i = 0; i < url.length(); ++i)
 		{
-			const char& c = url[i];
+			const char &c = url[i];
 
 			if (c == '%' && i + 2 < url.length())
 			{
diff --git a/include/modules/ns_cert.h b/include/modules/ns_cert.h
index 804643e77..8ecf610bb 100644
--- a/include/modules/ns_cert.h
+++ b/include/modules/ns_cert.h
@@ -78,5 +78,5 @@ class CertService
 public:
 	CertService(Module *c) : Service(c, "CertService", "certs") { }
 
-	virtual NickCore* FindAccountFromCert(const Anope::string &cert) = 0;
+	virtual NickCore *FindAccountFromCert(const Anope::string &cert) = 0;
 };
diff --git a/include/modules/os_forbid.h b/include/modules/os_forbid.h
index 19b34a1e6..3dd7e3959 100644
--- a/include/modules/os_forbid.h
+++ b/include/modules/os_forbid.h
@@ -41,7 +41,7 @@ public:
 
 	virtual void RemoveForbid(ForbidData *d) = 0;
 
-	virtual ForbidData* CreateForbid() = 0;
+	virtual ForbidData *CreateForbid() = 0;
 
 	virtual ForbidData *FindForbid(const Anope::string &mask, ForbidType type) = 0;
 
diff --git a/include/modules/os_session.h b/include/modules/os_session.h
index 7077b0985..4281ed086 100644
--- a/include/modules/os_session.h
+++ b/include/modules/os_session.h
@@ -29,7 +29,7 @@ struct Exception final
 
 	Exception() : Serializable("Exception") { }
 	void Serialize(Serialize::Data &data) const override;
-	static Serializable* Unserialize(Serializable *obj, Serialize::Data &data);
+	static Serializable *Unserialize(Serializable *obj, Serialize::Data &data);
 };
 
 class SessionService
@@ -70,7 +70,7 @@ void Exception::Serialize(Serialize::Data &data) const
 	data["expires"] << this->expires;
 }
 
-Serializable* Exception::Unserialize(Serializable *obj, Serialize::Data &data)
+Serializable *Exception::Unserialize(Serializable *obj, Serialize::Data &data)
 {
 	if (!session_service)
 		return NULL;
diff --git a/include/modules/sasl.h b/include/modules/sasl.h
index 2e4d990c5..e4d683d3f 100644
--- a/include/modules/sasl.h
+++ b/include/modules/sasl.h
@@ -32,7 +32,7 @@ namespace SASL
 
 		virtual Anope::string GetAgent() = 0;
 
-		virtual Session* GetSession(const Anope::string &uid) = 0;
+		virtual Session *GetSession(const Anope::string &uid) = 0;
 
 		virtual void SendMessage(SASL::Session *session, const Anope::string &type, const Anope::string &data) = 0;
 
@@ -67,7 +67,7 @@ namespace SASL
 	public:
 		Mechanism(Module *o, const Anope::string &sname) : Service(o, "SASL::Mechanism", sname) { }
 
-		virtual Session* CreateSession(const Anope::string &uid) { return new Session(this, uid); }
+		virtual Session *CreateSession(const Anope::string &uid) { return new Session(this, uid); }
 
 		virtual void ProcessMessage(Session *session, const Message &) = 0;
 
diff --git a/include/modules/sql.h b/include/modules/sql.h
index 8355fe009..1fe87b5f1 100644
--- a/include/modules/sql.h
+++ b/include/modules/sql.h
@@ -24,7 +24,7 @@ namespace SQL
 			Clear();
 		}
 
-		std::iostream& operator[](const Anope::string &key) override
+		std::iostream &operator[](const Anope::string &key) override
 		{
 			std::stringstream *&ss = data[key];
 			if (!ss)
@@ -107,7 +107,7 @@ namespace SQL
 		Query() { }
 		Query(const Anope::string &q) : query(q) { }
 
-		Query& operator=(const Anope::string &q)
+		Query &operator=(const Anope::string &q)
 		{
 			this->query = q;
 			this->parameters.clear();
@@ -124,7 +124,7 @@ namespace SQL
 			return !(*this == other);
 		}
 
-		template<typename T> void SetValue(const Anope::string &key, const T& value, bool escape = true)
+		template<typename T> void SetValue(const Anope::string &key, const T &value, bool escape = true)
 		{
 			try
 			{
diff --git a/include/modules/xmlrpc.h b/include/modules/xmlrpc.h
index 698a8e6ce..115fe4ad4 100644
--- a/include/modules/xmlrpc.h
+++ b/include/modules/xmlrpc.h
@@ -18,7 +18,7 @@ public:
 	Anope::string name;
 	Anope::string id;
 	std::deque<Anope::string> data;
-	HTTPReply& r;
+	HTTPReply &r;
 
 	XMLRPCRequest(HTTPReply &_r) : r(_r) { }
 	inline void reply(const Anope::string &dname, const Anope::string &ddata) { this->replies.emplace(dname, ddata); }
diff --git a/include/regchannel.h b/include/regchannel.h
index 9b6a64971..4276333d5 100644
--- a/include/regchannel.h
+++ b/include/regchannel.h
@@ -39,7 +39,7 @@ public:
 	AutoKick();
 	~AutoKick();
 	void Serialize(Serialize::Data &data) const override;
-	static Serializable* Unserialize(Serializable *obj, Serialize::Data &);
+	static Serializable *Unserialize(Serializable *obj, Serialize::Data &);
 };
 
 /* It matters that Base is here before Extensible (it is inherited by Serializable)
@@ -95,10 +95,10 @@ public:
 	ChannelInfo(const ChannelInfo &ci);
 
 	~ChannelInfo();
-	ChannelInfo& operator=(const ChannelInfo &) = default;
+	ChannelInfo &operator=(const ChannelInfo &) = default;
 
 	void Serialize(Serialize::Data &data) const override;
-	static Serializable* Unserialize(Serializable *obj, Serialize::Data &);
+	static Serializable *Unserialize(Serializable *obj, Serialize::Data &);
 
 	/** Change the founder of the channel
 	 * @params nc The new founder
@@ -169,7 +169,7 @@ public:
 	 * @param t The time the akick was added, defaults to now
 	 * @param lu The time the akick was last used, defaults to never
 	 */
-	AutoKick* AddAkick(const Anope::string &user, NickCore *akicknc, const Anope::string &reason, time_t t = Anope::CurTime, time_t lu = 0);
+	AutoKick *AddAkick(const Anope::string &user, NickCore *akicknc, const Anope::string &reason, time_t t = Anope::CurTime, time_t lu = 0);
 
 	/** Add an akick entry to the channel by reason
 	 * @param user The user who added the akick
@@ -178,13 +178,13 @@ public:
 	 * @param t The time the akick was added, defaults to now
 	 * @param lu The time the akick was last used, defaults to never
 	 */
-	AutoKick* AddAkick(const Anope::string &user, const Anope::string &mask, const Anope::string &reason, time_t t = Anope::CurTime, time_t lu = 0);
+	AutoKick *AddAkick(const Anope::string &user, const Anope::string &mask, const Anope::string &reason, time_t t = Anope::CurTime, time_t lu = 0);
 
 	/** Get an entry from the channel akick list
 	 * @param index The index in the akick vector
 	 * @return The akick structure, or NULL if not found
 	 */
-	AutoKick* GetAkick(unsigned index) const;
+	AutoKick *GetAkick(unsigned index) const;
 
 	/** Get the size of the akick vector for this channel
 	 * @return The akick vector size
@@ -238,7 +238,7 @@ public:
 	 * @param name channel name to lookup
 	 * @return the ChannelInfo associated with the channel
 	 */
-	static ChannelInfo* Find(const Anope::string &name);
+	static ChannelInfo *Find(const Anope::string &name);
 
 	void AddChannelReference(const Anope::string &what);
 	void RemoveChannelReference(const Anope::string &what);
diff --git a/include/serialize.h b/include/serialize.h
index 91ced7370..02e58a21f 100644
--- a/include/serialize.h
+++ b/include/serialize.h
@@ -29,7 +29,7 @@ namespace Serialize
 
 		virtual ~Data() = default;
 
-		virtual std::iostream& operator[](const Anope::string &key) = 0;
+		virtual std::iostream &operator[](const Anope::string &key) = 0;
 		virtual std::set<Anope::string> KeySet() const { throw CoreException("Not supported"); }
 		virtual size_t Hash() const { throw CoreException("Not supported"); }
 
@@ -97,7 +97,7 @@ public:
 	/** Get the type of serializable object this is
 	 * @return The serializable object type
 	 */
-	Serialize::Type* GetSerializableType() const { return this->s_type; }
+	Serialize::Type *GetSerializableType() const { return this->s_type; }
 
 	virtual void Serialize(Serialize::Data &data) const = 0;
 
@@ -111,7 +111,7 @@ public:
 class CoreExport Serialize::Type final
 	: public Base
 {
-	typedef Serializable* (*unserialize_func)(Serializable *obj, Serialize::Data &);
+	typedef Serializable *(*unserialize_func)(Serializable *obj, Serialize::Data &);
 
 	static std::vector<Anope::string> TypeOrder;
 	static std::map<Anope::string, Serialize::Type *> Types;
@@ -168,7 +168,7 @@ public:
 	 */
 	void UpdateTimestamp();
 
-	Module* GetOwner() const { return this->owner; }
+	Module *GetOwner() const { return this->owner; }
 
 	static Serialize::Type *Find(const Anope::string &name);
 
@@ -201,23 +201,23 @@ class Serialize::Checker
 public:
 	Checker(const Anope::string &n) : name(n) { }
 
-	inline const T* operator->() const
+	inline const T *operator->() const
 	{
 		this->Check();
 		return &this->obj;
 	}
-	inline T* operator->()
+	inline T *operator->()
 	{
 		this->Check();
 		return &this->obj;
 	}
 
-	inline const T& operator*() const
+	inline const T &operator*() const
 	{
 		this->Check();
 		return this->obj;
 	}
-	inline T& operator*()
+	inline T &operator*()
 	{
 		this->Check();
 		return this->obj;
@@ -305,7 +305,7 @@ public:
 		return NULL;
 	}
 
-	inline T* operator*() const
+	inline T *operator*() const
 	{
 		if (!this->invalid)
 		{
@@ -318,7 +318,7 @@ public:
 		return NULL;
 	}
 
-	inline T* operator->() const
+	inline T *operator->() const
 	{
 		if (!this->invalid)
 		{
diff --git a/include/servers.h b/include/servers.h
index 8f491fe01..cfdc9c4de 100644
--- a/include/servers.h
+++ b/include/servers.h
@@ -25,7 +25,7 @@ namespace Servers
 	 * the only server whose uplink *is* Me that is not a juped server.
 	 * @return Our uplink, or NULL if not uplinked to anything
 	 */
-	extern CoreExport Server* GetUplink();
+	extern CoreExport Server *GetUplink();
 
 	/* Server maps by name and id */
 	extern CoreExport Anope::map<Server *> ByName;
diff --git a/include/users.h b/include/users.h
index d8860e6f2..2cd71c240 100644
--- a/include/users.h
+++ b/include/users.h
@@ -116,7 +116,7 @@ protected:
 	virtual ~User();
 
 public:
-	static User* OnIntroduce(const Anope::string &snick, const Anope::string &sident, const Anope::string &shost, const Anope::string &svhost, const Anope::string &sip, Server *sserver, const Anope::string &srealname, time_t ts, const Anope::string &smodes, const Anope::string &suid, NickCore *nc);
+	static User *OnIntroduce(const Anope::string &snick, const Anope::string &sident, const Anope::string &shost, const Anope::string &svhost, const Anope::string &sip, Server *sserver, const Anope::string &srealname, time_t ts, const Anope::string &smodes, const Anope::string &suid, NickCore *nc);
 
 	/** Update the nickname of a user record accordingly, should be
 	 * called from ircd protocol.
@@ -193,7 +193,7 @@ public:
 	 */
 	void SendMessage(BotInfo *source, const char *fmt, ...) ATTR_FORMAT(3, 4);
 	void SendMessage(BotInfo *source, const Anope::string &msg) override;
-	void SendMessage(CommandSource& source, const Anope::string &msg) override;
+	void SendMessage(CommandSource &source, const Anope::string &msg) override;
 
 	/** Identify the user to a nick.
 	 * updates last_seen, logs the user in,
@@ -377,7 +377,7 @@ public:
 	 * @param nick_only set to true to only look up by nick, not UID
 	 * @return the user, if they exist
 	 */
-	static User* Find(const Anope::string &name, bool nick_only = false);
+	static User *Find(const Anope::string &name, bool nick_only = false);
 
 	/** Quits all users who are pending to be quit
 	 */
diff --git a/include/xline.h b/include/xline.h
index 1c269e7ac..7ba9e1a9a 100644
--- a/include/xline.h
+++ b/include/xline.h
@@ -45,7 +45,7 @@ public:
 	bool IsRegex() const;
 
 	void Serialize(Serialize::Data &data) const override;
-	static Serializable* Unserialize(Serializable *obj, Serialize::Data &data);
+	static Serializable *Unserialize(Serializable *obj, Serialize::Data &data);
 };
 
 /* Managers XLines. There is one XLineManager per type of XLine. */
@@ -125,7 +125,7 @@ public:
 	 * @param index The index
 	 * @return The XLine, or NULL if the index is out of bounds
 	 */
-	XLine* GetEntry(unsigned index);
+	XLine *GetEntry(unsigned index);
 
 	/** Clear the XLine vector
 	 * Note: This does not remove the XLines from the IRCd
@@ -145,7 +145,7 @@ public:
 	 * @param mask The mask
 	 * @return The XLine the user matches, or NULL
 	 */
-	XLine* HasEntry(const Anope::string &mask);
+	XLine *HasEntry(const Anope::string &mask);
 
 	/** Check a user against all of the xlines in this XLineManager
 	 * @param u The user