Fix a bunch of broken indentation.

33 files changed, 74 insertions, 74 deletions

diff --git a/include/access.h b/include/access.h
index 4df23ebd8..41958fc66 100644
--- a/include/access.h
+++ b/include/access.h
@@ -80,7 +80,7 @@ class CoreExport ChanAccess : public Serializable
  public:
 	typedef std::vector<ChanAccess *> Path;
 
- 	/* The provider that created this access entry */
+	/* The provider that created this access entry */
 	AccessProvider *provider;
 	/* Channel this access entry is on */
 	Serialize::Reference<ChannelInfo> ci;
@@ -139,7 +139,7 @@ class CoreExport AccessGroup
 	/* access entries + paths */
 	std::vector<ChanAccess::Path> paths;
 	/* Channel these access entries are on */
- 	const ChannelInfo *ci;
+	const ChannelInfo *ci;
 	/* Account these entries affect, if any */
 	const NickCore *nc;
 	/* super_admin always gets all privs. founder is a special case where ci->founder == nc */
diff --git a/include/account.h b/include/account.h
index 58dad381e..ad6e8ebac 100644
--- a/include/account.h
+++ b/include/account.h
@@ -45,7 +45,7 @@ class CoreExport NickAlias : public Serializable, public Extensible
 	/* Account this nick is tied to. Multiple nicks can be tied to a single account. */
 	Serialize::Reference<NickCore> nc;
 
- 	/** Constructor
+	/** Constructor
 	 * @param nickname The nick
 	 * @param nickcore The nickcore for this nick
 	 */
@@ -55,7 +55,7 @@ class CoreExport NickAlias : public Serializable, public Extensible
 	void Serialize(Serialize::Data &data) const anope_override;
 	static Serializable* Unserialize(Serializable *obj, Serialize::Data &);
 
- 	/** Set a vhost for the user
+	/** Set a vhost for the user
 	 * @param ident The ident
 	 * @param host The host
 	 * @param creator Who created the vhost
@@ -108,7 +108,7 @@ class CoreExport NickCore : public Serializable, public Extensible
 	/* Channels which reference this core in some way (this is on their access list, akick list, is founder, successor, etc) */
 	Serialize::Checker<std::map<ChannelInfo *, int> > chanaccess;
  public:
- 	/* Name of the account. Find(display)->nc == this. */
+	/* Name of the account. Find(display)->nc == this. */
 	Anope::string display;
 	/* User password in form of hashm:data */
 	Anope::string pass;
@@ -242,7 +242,7 @@ class CoreExport IdentifyRequest
 	virtual ~IdentifyRequest();
 
  public:
- 	/* One of these is called when the request goes through */
+	/* One of these is called when the request goes through */
 	virtual void OnSuccess() = 0;
 	virtual void OnFail() = 0;
 
diff --git a/include/base.h b/include/base.h
index 28e41a690..0c1021b9d 100644
--- a/include/base.h
+++ b/include/base.h
@@ -50,7 +50,7 @@ class Reference : public ReferenceBase
  protected:
 	T *ref;
  public:
- 	Reference() : ref(NULL)
+	Reference() : ref(NULL)
 	{
 	}
 
diff --git a/include/channels.h b/include/channels.h
index 48974065f..7e89fcff0 100644
--- a/include/channels.h
+++ b/include/channels.h
@@ -41,7 +41,7 @@ class CoreExport Channel : public Base, public Extensible
 	ModeList modes;
 
  public:
- 	/* Channel name */
+	/* Channel name */
 	Anope::string name;
 	/* Set if this channel is registered. ci->c == this. Contains information relevant to the registered channel */
 	Serialize::Reference<ChannelInfo> ci;
@@ -139,7 +139,7 @@ class CoreExport Channel : public Base, public Extensible
 	/** See if a channel has a mode
 	 * @param name The mode name
 	 * @return The number of modes set
- 	 * @param param The optional mode param
+	 * @param param The optional mode param
 	 */
 	size_t HasMode(const Anope::string &name, const Anope::string &param = "");
 
diff --git a/include/commands.h b/include/commands.h
index 871524fb1..bd9cd0230 100644
--- a/include/commands.h
+++ b/include/commands.h
@@ -101,7 +101,7 @@ class CoreExport Command : public Service
 	bool require_user;
 
  public:
- 	/* Maximum paramaters accepted by this command */
+	/* Maximum paramaters accepted by this command */
 	size_t max_params;
 	/* Minimum parameters required to use this command */
 	size_t min_params;
@@ -136,11 +136,11 @@ class CoreExport Command : public Service
 	bool AllowUnregistered() const;
 	bool RequireUser() const;
 
- 	/** Get the command description
+	/** Get the command description
 	 * @param source The source wanting the command description
 	 * @return The commands description
 	 */
- 	virtual const Anope::string GetDesc(CommandSource &source) const;
+	virtual const Anope::string GetDesc(CommandSource &source) const;
 
 	/** Execute this command.
 	 * @param source The source
diff --git a/include/config.h b/include/config.h
index 5d79136db..30d9255b8 100644
--- a/include/config.h
+++ b/include/config.h
@@ -35,7 +35,7 @@ namespace Configuration
 		int linenum;
 
 	 public:
-	 	Block(const Anope::string &);
+		Block(const Anope::string &);
 		const Anope::string &GetName() const;
 		int CountBlock(const Anope::string &name);
 		Block* GetBlock(const Anope::string &name, int num = 0);
diff --git a/include/extensible.h b/include/extensible.h
index d57799737..abb4af13b 100644
--- a/include/extensible.h
+++ b/include/extensible.h
@@ -164,7 +164,7 @@ template<typename T>
 class SerializableExtensibleItem : public PrimitiveExtensibleItem<T>
 {
  public:
- 	SerializableExtensibleItem(Module *m, const Anope::string &n) : PrimitiveExtensibleItem<T>(m, n) { }
+	SerializableExtensibleItem(Module *m, const Anope::string &n) : PrimitiveExtensibleItem<T>(m, n) { }
 
 	void ExtensibleSerialize(const Extensible *e, const Serializable *s, Serialize::Data &data) const anope_override
 	{
@@ -186,7 +186,7 @@ template<>
 class SerializableExtensibleItem<bool> : public PrimitiveExtensibleItem<bool>
 {
  public:
- 	SerializableExtensibleItem(Module *m, const Anope::string &n) : PrimitiveExtensibleItem<bool>(m, n) { }
+	SerializableExtensibleItem(Module *m, const Anope::string &n) : PrimitiveExtensibleItem<bool>(m, n) { }
 
 	void ExtensibleSerialize(const Extensible *e, const Serializable *s, Serialize::Data &data) const anope_override
 	{
diff --git a/include/lists.h b/include/lists.h
index 3c728aa10..c0a9604f1 100644
--- a/include/lists.h
+++ b/include/lists.h
@@ -64,7 +64,7 @@ class CoreExport NumberList
 class CoreExport ListFormatter
 {
  public:
- 	typedef std::map<Anope::string, Anope::string> ListEntry;
+	typedef std::map<Anope::string, Anope::string> ListEntry;
  private:
 	NickCore *nc;
 	std::vector<Anope::string> columns;
diff --git a/include/logger.h b/include/logger.h
index fed6c51dd..85718cf32 100644
--- a/include/logger.h
+++ b/include/logger.h
@@ -52,7 +52,7 @@ struct LogFile
 class CoreExport Log
 {
  public:
- 	/* Bot that should log this message */
+	/* Bot that should log this message */
 	BotInfo *bi;
 	/* For commands, the user executing the command, but might not always exist */
 	User *u;
@@ -113,7 +113,7 @@ class CoreExport Log
 class CoreExport LogInfo
 {
  public:
- 	BotInfo *bot;
+	BotInfo *bot;
 	std::vector<Anope::string> targets;
 	std::vector<LogFile *> logfiles;
 	int last_day;
diff --git a/include/mail.h b/include/mail.h
index 2c0d3e2a4..030e50efb 100644
--- a/include/mail.h
+++ b/include/mail.h
@@ -26,7 +26,7 @@ namespace Mail
 	class Message : public Thread
 	{
 	 private:
-	 	Anope::string sendmail_path;
+		Anope::string sendmail_path;
 		Anope::string send_from;
 		Anope::string mail_to;
 		Anope::string addr;
@@ -36,7 +36,7 @@ namespace Mail
 
 		bool success;
 	 public:
-	 	/** Construct this message. Once constructed call Thread::Start to launch the mail sending.
+		/** Construct this message. Once constructed call Thread::Start to launch the mail sending.
 		 * @param sf Config->SendFrom
 		 * @param mailto Name of person being mailed (u->nick, nc->display, etc)
 		 * @param addr Destination address to mail
diff --git a/include/memo.h b/include/memo.h
index 6544efcc3..6be934bb8 100644
--- a/include/memo.h
+++ b/include/memo.h
@@ -19,9 +19,9 @@ class CoreExport Memo : public Serializable
 {
  public:
 	MemoInfo *mi;
- 	bool unread;
+	bool unread;
 	bool receipt;
- 	Memo();
+	Memo();
 	~Memo();
 
 	void Serialize(Serialize::Data &data) const anope_override;
diff --git a/include/messages.h b/include/messages.h
index 6d683408f..53d1200f3 100644
--- a/include/messages.h
+++ b/include/messages.h
@@ -165,7 +165,7 @@ namespace Message
 
 	struct CoreExport Whois : IRCDMessage
 	{
- 		Whois(Module *creator, const Anope::string &mname = "WHOIS") : IRCDMessage(creator, mname, 1) { SetFlag(IRCDMESSAGE_SOFT_LIMIT); }
+		Whois(Module *creator, const Anope::string &mname = "WHOIS") : IRCDMessage(creator, mname, 1) { SetFlag(IRCDMESSAGE_SOFT_LIMIT); }
 
 		void Run(MessageSource &source, const std::vector<Anope::string> &params) anope_override;
 	};
diff --git a/include/modes.h b/include/modes.h
index bd7966864..d3134d4f0 100644
--- a/include/modes.h
+++ b/include/modes.h
@@ -39,8 +39,8 @@ enum ModeClass
 class CoreExport Mode : public Base
 {
  public:
- 	/* Mode name */
- 	Anope::string name;
+	/* Mode name */
+	Anope::string name;
 	/* Class of mode this is (user/channel) */
 	ModeClass mclass;
 	/* Mode char for this, eg 'b' */
@@ -78,7 +78,7 @@ class CoreExport UserMode : public Mode
 class CoreExport UserModeParam : public UserMode
 {
  public:
- 	/** constructor
+	/** constructor
 	 * @param name The mode name
 	 * @param mc The mode char
 	 */
@@ -229,9 +229,9 @@ class CoreExport ChannelStatus
 {
 	Anope::string modes;
  public:
- 	ChannelStatus();
- 	ChannelStatus(const Anope::string &modes);
- 	void AddMode(char c);
+	ChannelStatus();
+	ChannelStatus(const Anope::string &modes);
+	void AddMode(char c);
 	void DelMode(char c);
 	bool HasMode(char c) const;
 	bool Empty() const;
@@ -399,7 +399,7 @@ class CoreExport Entry
 	Anope::string nick, user, host, real;
 
 	/** Constructor
- 	 * @param mode What mode this host is for, can be empty for unknown/no mode
+	 * @param mode What mode this host is for, can be empty for unknown/no mode
 	 * @param host A full or poartial nick!ident@host/cidr#real name mask
 	 */
 	Entry(const Anope::string &mode, const Anope::string &host);
diff --git a/include/modules.h b/include/modules.h
index abf1808c6..05eb60230 100644
--- a/include/modules.h
+++ b/include/modules.h
@@ -1138,7 +1138,7 @@ class CoreExport ModuleManager
 	 */
 	static std::vector<Module *> EventHandlers[I_SIZE];
 
- 	/** List of all modules loaded in Anope
+	/** List of all modules loaded in Anope
 	 */
 	static std::list<Module *> Modules;
 
diff --git a/include/modules/cs_log.h b/include/modules/cs_log.h
index 1a5658dd1..ca2a6bcaa 100644
--- a/include/modules/cs_log.h
+++ b/include/modules/cs_log.h
@@ -37,6 +37,6 @@ struct LogSettings : Serialize::Checker<std::vector<LogSetting *> >
 	}
 
  public:
- 	virtual ~LogSettings() { }
+	virtual ~LogSettings() { }
 	virtual LogSetting *Create() = 0;
 };
diff --git a/include/modules/cs_mode.h b/include/modules/cs_mode.h
index 480217e59..4ac2e1450 100644
--- a/include/modules/cs_mode.h
+++ b/include/modules/cs_mode.h
@@ -74,7 +74,7 @@ struct ModeLocks
 
 	/** Get details for a specific mlock
 	 * @param mname The mode name
- 	 * @param An optional param to match with
+	 * @param An optional param to match with
 	 * @return The MLock, if any
 	 */
 	virtual const ModeLock *GetMLock(const Anope::string &mname, const Anope::string &param = "") = 0;
diff --git a/include/modules/dns.h b/include/modules/dns.h
index c9c6c9088..c35144210 100644
--- a/include/modules/dns.h
+++ b/include/modules/dns.h
@@ -139,8 +139,8 @@ namespace DNS
 		/* Use result cache if available */
 		bool use_cache;
 		/* Request id */
-	 	unsigned short id;
-	 	/* Creator of this request */
+		unsigned short id;
+		/* Creator of this request */
 		Module *creator;
 
 		Request(Manager *mgr, Module *c, const Anope::string &addr, QueryType qt, bool cache = false) : Timer(0), Question(addr, qt), manager(mgr),
diff --git a/include/modules/encryption.h b/include/modules/encryption.h
index f72d95910..fccd77dc8 100644
--- a/include/modules/encryption.h
+++ b/include/modules/encryption.h
@@ -17,7 +17,7 @@ namespace Encryption
 	class Context
 	{
 	 public:
-	 	virtual ~Context() { }
+		virtual ~Context() { }
 		virtual void Update(const unsigned char *data, size_t len) = 0;
 		virtual void Finalize() = 0;
 		virtual Hash GetFinalizedHash() = 0;
diff --git a/include/modules/httpd.h b/include/modules/httpd.h
index 0e9b1196e..338254c1f 100644
--- a/include/modules/httpd.h
+++ b/include/modules/httpd.h
@@ -99,7 +99,7 @@ class HTTPPage : public Base
 	Anope::string content_type;
 
  public:
- 	HTTPPage(const Anope::string &u, const Anope::string &ct = "text/html") : url(u), content_type(ct) { }
+	HTTPPage(const Anope::string &u, const Anope::string &ct = "text/html") : url(u), content_type(ct) { }
 
 	const Anope::string &GetURL() const { return this->url; }
 
@@ -137,7 +137,7 @@ class HTTPClient : public ClientSocket, public BinarySocket, public Base
 
 class HTTPProvider : public ListenSocket, public Service
 {
- 	Anope::string ip;
+	Anope::string ip;
 	unsigned short port;
 	bool ssl;
  public:
diff --git a/include/modules/os_session.h b/include/modules/os_session.h
index 0c064f895..034937412 100644
--- a/include/modules/os_session.h
+++ b/include/modules/os_session.h
@@ -35,7 +35,7 @@ struct Exception : Serializable
 class SessionService : public Service
 {
  public:
- 	typedef TR1NS::unordered_map<cidr, Session *, cidr::hash> SessionMap;
+	typedef TR1NS::unordered_map<cidr, Session *, cidr::hash> SessionMap;
 	typedef std::vector<Exception *> ExceptionVector;
 
 	SessionService(Module *m) : Service(m, "SessionService", "session") { }
diff --git a/include/modules/sql.h b/include/modules/sql.h
index a70f25dc6..47b2a7aef 100644
--- a/include/modules/sql.h
+++ b/include/modules/sql.h
@@ -12,7 +12,7 @@ namespace SQL
 	class Data : public Serialize::Data
 	{
 	 public:
- 		typedef std::map<Anope::string, std::stringstream *> Map;
+		typedef std::map<Anope::string, std::stringstream *> Map;
 		Map data;
 		std::map<Anope::string, Type> types;
 
@@ -142,7 +142,7 @@ namespace SQL
 		Anope::string error;
 	 public:
 		unsigned int id;
- 		Anope::string finished_query;
+		Anope::string finished_query;
 
 		Result() : id(0) { }
 		Result(unsigned int i, const Query &q, const Anope::string &fq, const Anope::string &err = "") : query(q), error(err), id(i), finished_query(fq) { }
diff --git a/include/modules/xmlrpc.h b/include/modules/xmlrpc.h
index 61388c68e..9ac452b12 100644
--- a/include/modules/xmlrpc.h
+++ b/include/modules/xmlrpc.h
@@ -28,7 +28,7 @@ class XMLRPCServiceInterface;
 class XMLRPCEvent
 {
  public:
- 	virtual ~XMLRPCEvent() { }
+	virtual ~XMLRPCEvent() { }
 	virtual bool Run(XMLRPCServiceInterface *iface, HTTPClient *client, XMLRPCRequest &request) = 0;
 };
 
diff --git a/include/opertype.h b/include/opertype.h
index 23c3bfcf4..c239010a7 100644
--- a/include/opertype.h
+++ b/include/opertype.h
@@ -67,7 +67,7 @@ class CoreExport OperType
 	 */
 	std::set<OperType *> inheritances;
  public:
- 	/** Modes to set when someone identifys using this opertype
+	/** Modes to set when someone identifys using this opertype
 	 */
 	Anope::string modes;
 
diff --git a/include/protocol.h b/include/protocol.h
index 1f3b8c026..44f8d3017 100644
--- a/include/protocol.h
+++ b/include/protocol.h
@@ -22,7 +22,7 @@ class CoreExport IRCDProto : public Service
 	Anope::string proto_name;
 
  protected:
- 	IRCDProto(Module *creator, const Anope::string &proto_name);
+	IRCDProto(Module *creator, const Anope::string &proto_name);
  public:
 	virtual ~IRCDProto();
 
diff --git a/include/regchannel.h b/include/regchannel.h
index d7098aef9..f884c27b3 100644
--- a/include/regchannel.h
+++ b/include/regchannel.h
@@ -36,7 +36,7 @@ class CoreExport AutoKick : public Serializable
 	time_t addtime;
 	time_t last_used;
 
- 	AutoKick();
+	AutoKick();
 	~AutoKick();
 	void Serialize(Serialize::Data &data) const anope_override;
 	static Serializable* Unserialize(Serializable *obj, Serialize::Data &);
@@ -56,7 +56,7 @@ class CoreExport ChannelInfo : public Serializable, public Extensible
 	Anope::map<int16_t> levels;
 
  public:
- 	friend class ChanAccess;
+	friend class ChanAccess;
 	friend class AutoKick;
 
 	Anope::string name;                       /* Channel name */
@@ -82,7 +82,7 @@ class CoreExport ChannelInfo : public Serializable, public Extensible
 
 	time_t banexpire;                       /* Time bans expire in */
 
- 	/** Constructor
+	/** Constructor
 	 * @param chname The channel name
 	 */
 	ChannelInfo(const Anope::string &chname);
diff --git a/include/regexpr.h b/include/regexpr.h
index fe621f31a..166ea3fb6 100644
--- a/include/regexpr.h
+++ b/include/regexpr.h
@@ -30,7 +30,7 @@ class CoreExport Regex
  protected:
 	Regex(const Anope::string &expr) : expression(expr) { }
  public:
- 	virtual ~Regex() { }
+	virtual ~Regex() { }
 	const Anope::string &GetExpression() { return expression; }
 	virtual bool Matches(const Anope::string &str) = 0;
 };
diff --git a/include/serialize.h b/include/serialize.h
index d9c888b65..79273f429 100644
--- a/include/serialize.h
+++ b/include/serialize.h
@@ -22,7 +22,7 @@ namespace Serialize
 	class Data
 	{
 	 public:
- 		enum Type
+		enum Type
 		{
 			DT_TEXT,
 			DT_INT
@@ -62,7 +62,7 @@ class CoreExport Serializable : public virtual Base
 	friend class Serialize::Type;
 	/* The type of item this object is */
 	Serialize::Type *s_type;
- 	/* Iterator into serializable_items */
+	/* Iterator into serializable_items */
 	std::list<Serializable *>::iterator s_iter;
 	/* The hash of the last serialized form of this object committed to the database */
 	size_t last_commit;
@@ -70,7 +70,7 @@ class CoreExport Serializable : public virtual Base
 	time_t last_commit_time;
 
  protected:
- 	Serializable(const Anope::string &serialize_type);
+	Serializable(const Anope::string &serialize_type);
 	Serializable(const Serializable &);
 
 	Serializable &operator=(const Serializable &);
@@ -78,7 +78,7 @@ class CoreExport Serializable : public virtual Base
  public:
 	virtual ~Serializable();
 
- 	/* Unique ID (per type, not globally) for this object */
+	/* Unique ID (per type, not globally) for this object */
 	uint64_t id;
 
 	/* Only used by redis, to ignore updates */
@@ -130,7 +130,7 @@ class CoreExport Serialize::Type : public Base
 	time_t timestamp;
 
  public:
- 	/* Map of Serializable::id to Serializable objects */
+	/* Map of Serializable::id to Serializable objects */
 	std::map<uint64_t, Serializable *> objects;
 
 	/** Creates a new serializable type
@@ -247,7 +247,7 @@ class Serialize::Reference : public ReferenceBase
 	T *ref;
 
  public:
- 	Reference() : ref(NULL)
+	Reference() : ref(NULL)
 	{
 	}
 
diff --git a/include/servers.h b/include/servers.h
index 4726b8e03..11955d85c 100644
--- a/include/servers.h
+++ b/include/servers.h
@@ -79,8 +79,8 @@ class CoreExport Server : public Extensible
 	~Server();
 
  public:
- 	/* Number of users on the server */
- 	unsigned users;
+	/* Number of users on the server */
+	unsigned users;
 
 	/** Delete this server with a reason
 	 * @param reason The reason
diff --git a/include/service.h b/include/service.h
index 23433bf4d..0e09254ac 100644
--- a/include/service.h
+++ b/include/service.h
@@ -43,7 +43,7 @@ class CoreExport Service : public virtual Base
 	}
 
  public:
- 	static Service *FindService(const Anope::string &t, const Anope::string &n)
+	static Service *FindService(const Anope::string &t, const Anope::string &n)
 	{
 		std::map<Anope::string, std::map<Anope::string, Service *> >::const_iterator it = Services.find(t);
 		if (it == Services.end())
@@ -122,7 +122,7 @@ class ServiceReference : public Reference<T>
 	Anope::string name;
 
  public:
- 	ServiceReference() { }
+	ServiceReference() { }
 
 	ServiceReference(const Anope::string &t, const Anope::string &n) : type(t), name(n)
 	{
diff --git a/include/sockets.h b/include/sockets.h
index eee951eac..40a906d47 100644
--- a/include/sockets.h
+++ b/include/sockets.h
@@ -98,7 +98,7 @@ class CoreExport cidr
 	Anope::string cidr_ip;
 	unsigned short cidr_len;
  public:
- 	cidr(const Anope::string &ip);
+	cidr(const Anope::string &ip);
 	cidr(const Anope::string &ip, unsigned char len);
 	cidr(const sockaddrs &ip, unsigned char len);
 	Anope::string mask() const;
@@ -147,7 +147,7 @@ class CoreExport SocketIO
 	virtual ~SocketIO() { }
 
 	/** Receive something from the buffer
- 	 * @param s The socket
+	 * @param s The socket
 	 * @param buf The buf to read to
 	 * @param sz How much to read
 	 * @return Number of bytes received
@@ -208,13 +208,13 @@ class CoreExport Socket
 	bool ipv6;
 
  public:
- 	std::bitset<SF_SIZE> flags;
+	std::bitset<SF_SIZE> flags;
 
 	/* Sockaddrs for bind() (if it's bound) */
 	sockaddrs bindaddr;
 
 	/* I/O functions used for this socket */
- 	SocketIO *io;
+	SocketIO *io;
 
 	/** Empty constructor, should not be called.
 	 */
@@ -225,7 +225,7 @@ class CoreExport Socket
 	 * @param ipv6 true if using ipv6
 	 * @param type The socket type, defaults to SOCK_STREAM
 	 */
- 	Socket(int sock, bool ipv6 = false, int type = SOCK_STREAM);
+	Socket(int sock, bool ipv6 = false, int type = SOCK_STREAM);
 
 	/** Destructor, closes the socket and removes it from the engine
 	 */
@@ -277,8 +277,8 @@ class CoreExport Socket
 class CoreExport BufferedSocket : public virtual Socket
 {
  protected:
- 	/* Things read from the socket */
- 	Anope::string read_buffer;
+	/* Things read from the socket */
+	Anope::string read_buffer;
 	/* Things to be written to the socket */
 	Anope::string write_buffer;
 	/* How much data was received from this socket on this recv() */
@@ -385,8 +385,8 @@ class CoreExport ListenSocket : public virtual Socket
 	bool ProcessRead();
 
 	/** Called when a connection is accepted
- 	 * @param fd The FD for the new connection
- 	 * @param addr The sockaddr for where the connection came from
+	 * @param fd The FD for the new connection
+	 * @param addr The sockaddr for where the connection came from
 	 * @return The new socket
 	 */
 	virtual ClientSocket *OnAccept(int fd, const sockaddrs &addr) = 0;
@@ -462,10 +462,10 @@ class CoreExport ClientSocket : public virtual Socket
 class CoreExport Pipe : public Socket
 {
  public:
- 	/** The FD of the write pipe
+	/** The FD of the write pipe
 	 * this->sock is the readfd
 	 */
- 	int write_pipe;
+	int write_pipe;
 
 	Pipe();
 	~Pipe();
diff --git a/include/timers.h b/include/timers.h
index 55004e24a..d31d9cb12 100644
--- a/include/timers.h
+++ b/include/timers.h
@@ -17,7 +17,7 @@
 class CoreExport Timer
 {
  private:
- 	/** The owner of the timer, if any
+	/** The owner of the timer, if any
 	 */
 	Module *owner;
 
diff --git a/include/uplink.h b/include/uplink.h
index 63858af4b..257c6157c 100644
--- a/include/uplink.h
+++ b/include/uplink.h
@@ -38,9 +38,9 @@ class UplinkSocket : public ConnectionSocket, public BufferedSocket
 		std::stringstream buffer;
 
 	 public:
-	 	Message();
-	 	Message(const MessageSource &);
-	 	~Message();
+		Message();
+		Message(const MessageSource &);
+		~Message();
 		template<typename T> Message &operator<<(const T &val)
 		{
 			this->buffer << val;
diff --git a/include/users.h b/include/users.h
index a6954bbdb..b941d0dff 100644
--- a/include/users.h
+++ b/include/users.h
@@ -56,7 +56,7 @@ class CoreExport User : public virtual Base, public Extensible, public CommandRe
 
 
  public: // XXX: exposing a tiny bit too much
- 	/* User's current nick */
+	/* User's current nick */
 	Anope::string nick;
 
 	/* User's real hostname */