diff --git a/include/znc/Buffer.h b/include/znc/Buffer.h
index bd67ae86..59d5454a 100644
--- a/include/znc/Buffer.h
+++ b/include/znc/Buffer.h
@@ -29,7 +29,7 @@ class CClient;
 class CBufLine {
 public:
 	CBufLine() { throw 0; } // shouldn't be called, but is needed for compilation
-	CBufLine(const CString& sFormat, const CString& sText = "", const timeval* ts = 0);
+	CBufLine(const CString& sFormat, const CString& sText = "", const timeval* ts = nullptr);
 	~CBufLine();
 	CString GetLine(const CClient& Client, const MCString& msParams) const;
 	void UpdateTime();
@@ -58,7 +58,7 @@ public:
 	CBuffer(unsigned int uLineCount = 100);
 	~CBuffer();
 
-	size_type AddLine(const CString& sFormat, const CString& sText = "", const timeval* ts = 0);
+	size_type AddLine(const CString& sFormat, const CString& sText = "", const timeval* ts = nullptr);
 	/// Same as AddLine, but replaces a line whose format string starts with sMatch if there is one.
 	size_type UpdateLine(const CString& sMatch, const CString& sFormat, const CString& sText = "");
 	/// Same as UpdateLine, but does nothing if this exact line already exists.
diff --git a/include/znc/Chan.h b/include/znc/Chan.h
index 5605548e..b623a2ea 100644
--- a/include/znc/Chan.h
+++ b/include/znc/Chan.h
@@ -56,7 +56,7 @@ public:
 		M_Except     = 'e'
 	} EModes;
 
-	CChan(const CString& sName, CIRCNetwork* pNetwork, bool bInConfig, CConfig *pConfig = NULL);
+	CChan(const CString& sName, CIRCNetwork* pNetwork, bool bInConfig, CConfig *pConfig = nullptr);
 	~CChan();
 
 	CChan(const CChan&) = delete;
@@ -67,14 +67,14 @@ public:
 	void Clone(CChan& chan);
 	void Cycle() const;
 	void JoinUser(const CString& sKey = "");
-	void AttachUser(CClient* pClient = NULL);
+	void AttachUser(CClient* pClient = nullptr);
 	void DetachUser();
 
 	void OnWho(const CString& sNick, const CString& sIdent, const CString& sHost);
 
 	// Modes
 	void SetModes(const CString& s);
-	void ModeChange(const CString& sModes, const CNick* OpNick = NULL);
+	void ModeChange(const CString& sModes, const CNick* OpNick = nullptr);
 	bool AddMode(unsigned char uMode, const CString& sArg);
 	bool RemMode(unsigned char uMode);
 	CString GetModeString() const;
@@ -97,7 +97,7 @@ public:
 	unsigned int GetBufferCount() const { return m_Buffer.GetLineCount(); }
 	bool SetBufferCount(unsigned int u, bool bForce = false) { m_bHasBufferCountSet = true; return m_Buffer.SetLineCount(u, bForce); }
 	void InheritBufferCount(unsigned int u, bool bForce = false) { if (!m_bHasBufferCountSet) m_Buffer.SetLineCount(u, bForce); }
-	size_t AddBuffer(const CString& sFormat, const CString& sText = "", const timeval* ts = NULL) { return m_Buffer.AddLine(sFormat, sText, ts); }
+	size_t AddBuffer(const CString& sFormat, const CString& sText = "", const timeval* ts = nullptr) { return m_Buffer.AddLine(sFormat, sText, ts); }
 	void ClearBuffer() { m_Buffer.Clear(); }
 	void SendBuffer(CClient* pClient);
 	void SendBuffer(CClient* pClient, const CBuffer& Buffer);
diff --git a/include/znc/Client.h b/include/znc/Client.h
index 175192c6..d64e9fed 100644
--- a/include/znc/Client.h
+++ b/include/znc/Client.h
@@ -80,9 +80,9 @@ public:
 	CClientAuth(const CClientAuth&) = delete;
 	CClientAuth& operator=(const CClientAuth&) = delete;
 
-	void Invalidate() { m_pClient = NULL; CAuthBase::Invalidate(); }
-	void AcceptedLogin(CUser& User);
-	void RefusedLogin(const CString& sReason);
+	void Invalidate() override { m_pClient = nullptr; CAuthBase::Invalidate(); }
+	void AcceptedLogin(CUser& User) override;
+	void RefusedLogin(const CString& sReason) override;
 private:
 protected:
 	CClient* m_pClient;
@@ -91,8 +91,8 @@ protected:
 class CClient : public CIRCSocket {
 public:
 	CClient() : CIRCSocket() {
-		m_pUser = NULL;
-		m_pNetwork = NULL;
+		m_pUser = nullptr;
+		m_pNetwork = nullptr;
 		m_bGotPass = false;
 		m_bGotNick = false;
 		m_bGotUser = false;
@@ -137,7 +137,7 @@ public:
 	void UserPortCommand(CString& sLine);
 	void StatusCTCP(const CString& sCommand);
 	void BouncedOff();
-	bool IsAttached() const { return m_pUser != NULL; }
+	bool IsAttached() const { return m_pUser != nullptr; }
 
 	bool IsPlaybackActive() const { return m_bPlaybackActive; }
 	void SetPlaybackActive(bool bActive) { m_bPlaybackActive = bActive; }
@@ -152,15 +152,15 @@ public:
 
 	bool IsCapEnabled(const CString& sCap) const { return 1 == m_ssAcceptedCaps.count(sCap); }
 
-	virtual void ReadLine(const CString& sData);
+	void ReadLine(const CString& sData) override;
 	bool SendMotd();
 	void HelpUser(const CString& sFilter = "");
 	void AuthUser();
-	virtual void Connected();
-	virtual void Timeout();
-	virtual void Disconnected();
-	virtual void ConnectionRefused();
-	virtual void ReachedMaxBuffer();
+	void Connected() override;
+	void Timeout() override;
+	void Disconnected() override;
+	void ConnectionRefused() override;
+	void ReachedMaxBuffer() override;
 
 	void SetNick(const CString& s);
 	void SetAway(bool bAway) { m_bAway = bAway; }
diff --git a/include/znc/FileUtils.h b/include/znc/FileUtils.h
index ce997e48..4d0b3d11 100644
--- a/include/znc/FileUtils.h
+++ b/include/znc/FileUtils.h
@@ -188,7 +188,7 @@ public:
 
 		struct dirent * de;
 
-		while ((de = readdir(dir)) != 0) {
+		while ((de = readdir(dir)) != nullptr) {
 			if ((strcmp(de->d_name, ".") == 0) || (strcmp(de->d_name, "..") == 0)) {
 				continue;
 			}
@@ -249,7 +249,7 @@ public:
 
 	static CString GetCWD() {
 		CString sRet;
-		char * pszCurDir = getcwd(NULL, 0);
+		char * pszCurDir = getcwd(nullptr, 0);
 		if (pszCurDir) {
 			sRet = pszCurDir;
 			free(pszCurDir);
diff --git a/include/znc/HTTPSock.h b/include/znc/HTTPSock.h
index 6ec5cee2..52b5e09b 100644
--- a/include/znc/HTTPSock.h
+++ b/include/znc/HTTPSock.h
@@ -30,9 +30,9 @@ public:
 	virtual ~CHTTPSock();
 
 	// Csocket derived members
-	virtual void ReadData(const char* data, size_t len);
-	virtual void ReadLine(const CString& sData);
-	virtual void Connected();
+	void ReadData(const char* data, size_t len) override;
+	void ReadLine(const CString& sData) override;
+	void Connected() override;
 	virtual Csock* GetSockObj(const CString& sHost, unsigned short uPort) = 0;
 	// !Csocket derived members
 
diff --git a/include/znc/IRCNetwork.h b/include/znc/IRCNetwork.h
index 5f66a8fc..93ae384e 100644
--- a/include/znc/IRCNetwork.h
+++ b/include/znc/IRCNetwork.h
@@ -89,9 +89,9 @@ public:
 	const CModules& GetModules() const { return *m_pModules; }
 	// !Modules
 
-	bool PutUser(const CString& sLine, CClient* pClient = NULL, CClient* pSkipClient = NULL);
-	bool PutStatus(const CString& sLine, CClient* pClient = NULL, CClient* pSkipClient = NULL);
-	bool PutModule(const CString& sModule, const CString& sLine, CClient* pClient = NULL, CClient* pSkipClient = NULL);
+	bool PutUser(const CString& sLine, CClient* pClient = nullptr, CClient* pSkipClient = nullptr);
+	bool PutStatus(const CString& sLine, CClient* pClient = nullptr, CClient* pSkipClient = nullptr);
+	bool PutModule(const CString& sModule, const CString& sLine, CClient* pClient = nullptr, CClient* pSkipClient = nullptr);
 
 	const std::vector<CChan*>& GetChans() const;
 	CChan* FindChan(CString sName) const;
diff --git a/include/znc/IRCSock.h b/include/znc/IRCSock.h
index 098a8c1c..719e2bcd 100644
--- a/include/znc/IRCSock.h
+++ b/include/znc/IRCSock.h
@@ -59,13 +59,13 @@ public:
 	bool OnServerCapAvailable(const CString& sCap);
 	// !Message Handlers
 
-	virtual void ReadLine(const CString& sData);
-	virtual void Connected();
-	virtual void Disconnected();
-	virtual void ConnectionRefused();
-	virtual void SockError(int iErrno, const CString& sDescription);
-	virtual void Timeout();
-	virtual void ReachedMaxBuffer();
+	void ReadLine(const CString& sData) override;
+	void Connected() override;
+	void Disconnected() override;
+	void ConnectionRefused() override;
+	void SockError(int iErrno, const CString& sDescription) override;
+	void Timeout() override;
+	void ReachedMaxBuffer() override;
 
 	void PutIRC(const CString& sLine);
 	void PutIRCQuick(const CString& sLine); //!< Should be used for PONG only
diff --git a/include/znc/Listener.h b/include/znc/Listener.h
index dc021cce..c1e6fba3 100644
--- a/include/znc/Listener.h
+++ b/include/znc/Listener.h
@@ -38,7 +38,7 @@ public:
 		m_bSSL = bSSL;
 		m_eAddr = eAddr;
 		m_sURIPrefix = sURIPrefix;
-		m_pListener = NULL;
+		m_pListener = nullptr;
 		m_eAcceptType = eAccept;
 	}
 
@@ -80,9 +80,9 @@ public:
 	CRealListener(CListener& listener) : CZNCSock(), m_Listener(listener) {}
 	virtual ~CRealListener();
 
-	virtual bool ConnectionFrom(const CString& sHost, unsigned short uPort);
-	virtual Csock* GetSockObj(const CString& sHost, unsigned short uPort);
-	virtual void SockError(int iErrno, const CString& sDescription);
+	bool ConnectionFrom(const CString& sHost, unsigned short uPort) override;
+	Csock* GetSockObj(const CString& sHost, unsigned short uPort) override;
+	void SockError(int iErrno, const CString& sDescription) override;
 
 private:
 	CListener& m_Listener;
@@ -92,8 +92,8 @@ class CIncomingConnection : public CZNCSock {
 public:
 	CIncomingConnection(const CString& sHostname, unsigned short uPort, CListener::EAcceptType eAcceptType, const CString& sURIPrefix);
 	virtual ~CIncomingConnection() {}
-	virtual void ReadLine(const CString& sData);
-	virtual void ReachedMaxBuffer();
+	void ReadLine(const CString& sData) override;
+	void ReachedMaxBuffer() override;
 
 private:
 	CListener::EAcceptType m_eAcceptType;
diff --git a/include/znc/Modules.h b/include/znc/Modules.h
index 0a9ad3c3..6f1531c3 100644
--- a/include/znc/Modules.h
+++ b/include/znc/Modules.h
@@ -166,7 +166,7 @@ class CFPTimer : public CTimer {
 public:
 	CFPTimer(CModule* pModule, unsigned int uInterval, unsigned int uCycles, const CString& sLabel, const CString& sDescription)
 		: CTimer(pModule, uInterval, uCycles, sLabel, sDescription) {
-		m_pFBCallback = NULL;
+		m_pFBCallback = nullptr;
 	}
 
 	virtual ~CFPTimer() {}
@@ -174,7 +174,7 @@ public:
 	void SetFPCallback(FPTimer_t p) { m_pFBCallback = p; }
 
 protected:
-	virtual void RunJob() {
+	void RunJob() override {
 		if (m_pFBCallback) {
 			m_pFBCallback(m_pModule, this);
 		}
@@ -221,13 +221,13 @@ public:
 	} EModuleType;
 
 	CModInfo() {
-		m_fLoader = NULL;
+		m_fLoader = nullptr;
 		m_bHasArgs = false;
 	}
 	CModInfo(const CString& sName, const CString& sPath, EModuleType eType) {
 		m_sName = sName;
 		m_sPath = sPath;
-		m_fLoader = NULL;
+		m_fLoader = nullptr;
 		m_bHasArgs = false;
 	}
 	~CModInfo() {}
diff --git a/include/znc/Query.h b/include/znc/Query.h
index b1357b40..b3f06aa9 100644
--- a/include/znc/Query.h
+++ b/include/znc/Query.h
@@ -35,7 +35,7 @@ public:
 	const CBuffer& GetBuffer() const { return m_Buffer; }
 	unsigned int GetBufferCount() const { return m_Buffer.GetLineCount(); }
 	bool SetBufferCount(unsigned int u, bool bForce = false) { return m_Buffer.SetLineCount(u, bForce); }
-	size_t AddBuffer(const CString& sFormat, const CString& sText = "", const timeval* ts = NULL) { return m_Buffer.AddLine(sFormat, sText, ts); }
+	size_t AddBuffer(const CString& sFormat, const CString& sText = "", const timeval* ts = nullptr) { return m_Buffer.AddLine(sFormat, sText, ts); }
 	void ClearBuffer() { m_Buffer.Clear(); }
 	void SendBuffer(CClient* pClient);
 	void SendBuffer(CClient* pClient, const CBuffer& Buffer);
diff --git a/include/znc/Socket.h b/include/znc/Socket.h
index 34222da5..0d0037c7 100644
--- a/include/znc/Socket.h
+++ b/include/znc/Socket.h
@@ -67,7 +67,7 @@ public:
 	CSockManager();
 	virtual ~CSockManager();
 
-	bool ListenHost(u_short iPort, const CString& sSockName, const CString& sBindHost, bool bSSL = false, int iMaxConns = SOMAXCONN, CZNCSock *pcSock = NULL, u_int iTimeout = 0, EAddrType eAddr = ADDR_ALL) {
+	bool ListenHost(u_short iPort, const CString& sSockName, const CString& sBindHost, bool bSSL = false, int iMaxConns = SOMAXCONN, CZNCSock *pcSock = nullptr, u_int iTimeout = 0, EAddrType eAddr = ADDR_ALL) {
 		CSListener L(iPort, sBindHost);
 
 		L.SetSockName(sSockName);
@@ -92,11 +92,11 @@ public:
 		return Listen(L, pcSock);
 	}
 
-	bool ListenAll(u_short iPort, const CString& sSockName, bool bSSL = false, int iMaxConns = SOMAXCONN, CZNCSock *pcSock = NULL, u_int iTimeout = 0, EAddrType eAddr = ADDR_ALL) {
+	bool ListenAll(u_short iPort, const CString& sSockName, bool bSSL = false, int iMaxConns = SOMAXCONN, CZNCSock *pcSock = nullptr, u_int iTimeout = 0, EAddrType eAddr = ADDR_ALL) {
 		return ListenHost(iPort, sSockName, "", bSSL, iMaxConns, pcSock, iTimeout, eAddr);
 	}
 
-	u_short ListenRand(const CString& sSockName, const CString& sBindHost, bool bSSL = false, int iMaxConns = SOMAXCONN, CZNCSock *pcSock = NULL, u_int iTimeout = 0, EAddrType eAddr = ADDR_ALL) {
+	u_short ListenRand(const CString& sSockName, const CString& sBindHost, bool bSSL = false, int iMaxConns = SOMAXCONN, CZNCSock *pcSock = nullptr, u_int iTimeout = 0, EAddrType eAddr = ADDR_ALL) {
 		unsigned short uPort = 0;
 		CSListener L(0, sBindHost);
 
@@ -124,11 +124,11 @@ public:
 		return uPort;
 	}
 
-	u_short ListenAllRand(const CString& sSockName, bool bSSL = false, int iMaxConns = SOMAXCONN, CZNCSock *pcSock = NULL, u_int iTimeout = 0, EAddrType eAddr = ADDR_ALL) {
+	u_short ListenAllRand(const CString& sSockName, bool bSSL = false, int iMaxConns = SOMAXCONN, CZNCSock *pcSock = nullptr, u_int iTimeout = 0, EAddrType eAddr = ADDR_ALL) {
 		return(ListenRand(sSockName, "", bSSL, iMaxConns, pcSock, iTimeout, eAddr));
 	}
 
-	void Connect(const CString& sHostname, u_short iPort, const CString& sSockName, int iTimeout = 60, bool bSSL = false, const CString& sBindHost = "", CZNCSock *pcSock = NULL);
+	void Connect(const CString& sHostname, u_short iPort, const CString& sSockName, int iTimeout = 60, bool bSSL = false, const CString& sBindHost = "", CZNCSock *pcSock = nullptr);
 
 	unsigned int GetAnonConnectionCount(const CString &sIP) const;
 private:
@@ -161,8 +161,8 @@ private:
 		int           iRes;
 		addrinfo*     aiResult;
 
-		void runThread();
-		void runMain();
+		void runThread() override;
+		void runMain() override;
 	};
 	void StartTDNSThread(TDNSTask* task, bool bBind);
 	void SetTDNSThreadFinished(TDNSTask* task, bool bBind, addrinfo* aiResult);
@@ -204,11 +204,11 @@ public:
 	using Csock::Listen;
 
 	//! This defaults to closing the socket, feel free to override
-	virtual void ReachedMaxBuffer();
-	virtual void SockError(int iErrno, const CString& sDescription);
+	void ReachedMaxBuffer() override;
+	void SockError(int iErrno, const CString& sDescription) override;
 
 	//! This limits the global connections from this IP to defeat DoS attacks, feel free to override. The ACL used is provided by the main interface @see CZNC::AllowConnectionFrom
-	virtual bool ConnectionFrom(const CString& sHost, unsigned short uPort);
+	bool ConnectionFrom(const CString& sHost, unsigned short uPort) override;
 
 	//! Ease of use Connect, assigns to the manager and is subsequently tracked
 	bool Connect(const CString& sHostname, unsigned short uPort, bool bSSL = false, unsigned int uTimeout = 60);
diff --git a/include/znc/Template.h b/include/znc/Template.h
index c22a9c9e..26e11e09 100644
--- a/include/znc/Template.h
+++ b/include/znc/Template.h
@@ -128,7 +128,7 @@ public:
 		Init();
 	}
 
-	CTemplate(const std::shared_ptr<CTemplateOptions>& Options, CTemplate* pParent = NULL) : MCString(), m_spOptions(Options) {
+	CTemplate(const std::shared_ptr<CTemplateOptions>& Options, CTemplate* pParent = nullptr) : MCString(), m_spOptions(Options) {
 		Init();
 		m_pParent = pParent;
 	}
diff --git a/include/znc/Threads.h b/include/znc/Threads.h
index fd98f83c..8757ab5c 100644
--- a/include/znc/Threads.h
+++ b/include/znc/Threads.h
@@ -39,7 +39,7 @@ public:
 	friend class CConditionVariable;
 
 	CMutex() {
-		int i = pthread_mutex_init(&m_mutex, NULL);
+		int i = pthread_mutex_init(&m_mutex, nullptr);
 		if (i) {
 			CUtils::PrintError("Can't initialize mutex: " + CString(strerror(errno)));
 			exit(1);
@@ -124,7 +124,7 @@ private:
 class CConditionVariable {
 public:
 	CConditionVariable() {
-		int i = pthread_cond_init(&m_cond, NULL);
+		int i = pthread_cond_init(&m_cond, nullptr);
 		if (i) {
 			CUtils::PrintError("Can't initialize condition variable: "
 					+ CString(strerror(errno)));
@@ -188,8 +188,8 @@ public:
 		 */
 		int i = sigfillset(&sigmask);
 		i |= pthread_sigmask(SIG_SETMASK, &sigmask, &old_sigmask);
-		i |= pthread_create(&thr, NULL, func, arg);
-		i |= pthread_sigmask(SIG_SETMASK, &old_sigmask, NULL);
+		i |= pthread_create(&thr, nullptr, func, arg);
+		i |= pthread_sigmask(SIG_SETMASK, &old_sigmask, nullptr);
 		i |= pthread_detach(thr);
 		if (i) {
 			CUtils::PrintError("Can't start new thread: "
@@ -295,7 +295,7 @@ private:
 	static void *threadPoolFunc(void *arg) {
 		CThreadPool &pool = *reinterpret_cast<CThreadPool *>(arg);
 		pool.threadFunc();
-		return NULL;
+		return nullptr;
 	}
 
 	// mutex protecting all of these members
diff --git a/include/znc/User.h b/include/znc/User.h
index 4b27f86c..2fd3678a 100644
--- a/include/znc/User.h
+++ b/include/znc/User.h
@@ -83,12 +83,12 @@ public:
 	bool HasSpaceForNewNetwork() const;
 	// !Networks
 
-	bool PutUser(const CString& sLine, CClient* pClient = NULL, CClient* pSkipClient = NULL);
-	bool PutAllUser(const CString& sLine, CClient* pClient = NULL, CClient* pSkipClient = NULL);
-	bool PutStatus(const CString& sLine, CClient* pClient = NULL, CClient* pSkipClient = NULL);
-	bool PutStatusNotice(const CString& sLine, CClient* pClient = NULL, CClient* pSkipClient = NULL);
-	bool PutModule(const CString& sModule, const CString& sLine, CClient* pClient = NULL, CClient* pSkipClient = NULL);
-	bool PutModNotice(const CString& sModule, const CString& sLine, CClient* pClient = NULL, CClient* pSkipClient = NULL);
+	bool PutUser(const CString& sLine, CClient* pClient = nullptr, CClient* pSkipClient = nullptr);
+	bool PutAllUser(const CString& sLine, CClient* pClient = nullptr, CClient* pSkipClient = nullptr);
+	bool PutStatus(const CString& sLine, CClient* pClient = nullptr, CClient* pSkipClient = nullptr);
+	bool PutStatusNotice(const CString& sLine, CClient* pClient = nullptr, CClient* pSkipClient = nullptr);
+	bool PutModule(const CString& sModule, const CString& sLine, CClient* pClient = nullptr, CClient* pSkipClient = nullptr);
+	bool PutModNotice(const CString& sModule, const CString& sLine, CClient* pClient = nullptr, CClient* pSkipClient = nullptr);
 
 	bool IsUserAttached() const;
 	void UserConnected(CClient* pClient);
diff --git a/include/znc/Utils.h b/include/znc/Utils.h
index 2322a8aa..b1a314ed 100644
--- a/include/znc/Utils.h
+++ b/include/znc/Utils.h
@@ -65,13 +65,13 @@ public:
 	static CString GetPass(const CString& sPrompt);
 	static bool GetInput(const CString& sPrompt, CString& sRet, const CString& sDefault = "", const CString& sHint = "");
 	static bool GetBoolInput(const CString& sPrompt, bool bDefault);
-	static bool GetBoolInput(const CString& sPrompt, bool *pbDefault = NULL);
+	static bool GetBoolInput(const CString& sPrompt, bool *pbDefault = nullptr);
 	static bool GetNumInput(const CString& sPrompt, unsigned int& uRet, unsigned int uMin = 0, unsigned int uMax = ~0, unsigned int uDefault = ~0);
 
 	static unsigned long long GetMillTime() {
 		struct timeval tv;
 		unsigned long long iTime = 0;
-		gettimeofday(&tv, NULL);
+		gettimeofday(&tv, nullptr);
 		iTime = (unsigned long long) tv.tv_sec * 1000;
 		iTime += ((unsigned long long) tv.tv_usec / 1000);
 		return iTime;
@@ -318,7 +318,7 @@ public:
 		Cleanup();
 		iterator it = m_mItems.find(Item);
 		if (it == m_mItems.end())
-			return NULL;
+			return nullptr;
 		return &it->second.second;
 	}
 
diff --git a/include/znc/WebModules.h b/include/znc/WebModules.h
index bd860ef8..e3d407aa 100644
--- a/include/znc/WebModules.h
+++ b/include/znc/WebModules.h
@@ -36,7 +36,7 @@ public:
 	CZNCTagHandler(CWebSock& pWebSock);
 	virtual ~CZNCTagHandler() {}
 
-	virtual bool HandleTag(CTemplate& Tmpl, const CString& sName, const CString& sArgs, CString& sOutput);
+	bool HandleTag(CTemplate& Tmpl, const CString& sName, const CString& sArgs, CString& sOutput) override;
 private:
 	CWebSock& m_WebSock;
 };
@@ -54,7 +54,7 @@ public:
 	const CString& GetIP() const { return m_sIP; }
 	CUser* GetUser() const { return m_pUser; }
 	time_t GetLastActive() const { return m_tmLastActive; }
-	bool IsLoggedIn() const { return m_pUser != NULL; }
+	bool IsLoggedIn() const { return m_pUser != nullptr; }
 	bool IsAdmin() const;
 	void UpdateLastActive();
 
@@ -128,8 +128,8 @@ public:
 	bool OnLogin(const CString& sUser, const CString& sPass, bool bBasic) override;
 	void OnPageRequest(const CString& sURI) override;
 
-	EPageReqResult PrintTemplate(const CString& sPageName, CString& sPageRet, CModule* pModule = NULL);
-	EPageReqResult PrintStaticFile(const CString& sPath, CString& sPageRet, CModule* pModule = NULL);
+	EPageReqResult PrintTemplate(const CString& sPageName, CString& sPageRet, CModule* pModule = nullptr);
+	EPageReqResult PrintStaticFile(const CString& sPath, CString& sPageRet, CModule* pModule = nullptr);
 
 	CString FindTmpl(CModule* pModule, const CString& sName);
 
@@ -137,7 +137,7 @@ public:
 
 	std::shared_ptr<CWebSession> GetSession();
 
-	virtual Csock* GetSockObj(const CString& sHost, unsigned short uPort);
+	Csock* GetSockObj(const CString& sHost, unsigned short uPort) override;
 	static CString GetSkinPath(const CString& sSkinName);
 	void GetAvailSkins(VCString& vRet) const;
 	CString GetSkinName();
@@ -150,7 +150,7 @@ public:
 protected:
 	using CHTTPSock::PrintErrorPage;
 
-	bool AddModLoop(const CString& sLoopName, CModule& Module, CTemplate *pTemplate = NULL);
+	bool AddModLoop(const CString& sLoopName, CModule& Module, CTemplate *pTemplate = nullptr);
 	VCString GetDirs(CModule* pModule, bool bIsTemplate);
 	void SetPaths(CModule* pModule, bool bIsTemplate = false);
 	void SetVars();
diff --git a/include/znc/ZNCString.h b/include/znc/ZNCString.h
index 2b29f0fb..8b853002 100644
--- a/include/znc/ZNCString.h
+++ b/include/znc/ZNCString.h
@@ -564,7 +564,7 @@ public:
 
 private:
 protected:
-	unsigned char* strnchr(const unsigned char* src, unsigned char c, unsigned int iMaxBytes, unsigned char* pFill = NULL, unsigned int* piCount = NULL) const;
+	unsigned char* strnchr(const unsigned char* src, unsigned char c, unsigned int iMaxBytes, unsigned char* pFill = nullptr, unsigned int* piCount = nullptr) const;
 };
 
 /**
diff --git a/include/znc/znc.h b/include/znc/znc.h
index 7622f8d4..05fad412 100644
--- a/include/znc/znc.h
+++ b/include/znc/znc.h
@@ -74,7 +74,7 @@ public:
 	bool AddTrustedProxy(const CString& sHost);
 	bool RemTrustedProxy(const CString& sHost);
 	void Broadcast(const CString& sMessage, bool bAdminOnly = false,
-			CUser* pSkipUser = NULL, CClient* pSkipClient = NULL);
+			CUser* pSkipUser = nullptr, CClient* pSkipClient = nullptr);
 	void AddBytesRead(unsigned long long u) { m_uBytesRead += u; }
 	void AddBytesWritten(unsigned long long u) { m_uBytesWritten += u; }
 	unsigned long long BytesRead() const { return m_uBytesRead; }
diff --git a/modules/adminlog.cpp b/modules/adminlog.cpp
index 1a4d731c..d08369e0 100644
--- a/modules/adminlog.cpp
+++ b/modules/adminlog.cpp
@@ -35,7 +35,7 @@ public:
 		closelog();
 	}
 
-	virtual bool OnLoad(const CString & sArgs, CString & sMessage) override {
+	bool OnLoad(const CString & sArgs, CString & sMessage) override {
 		CString sTarget = GetNV("target");
 		if (sTarget.Equals("syslog"))
 			m_eLogMode = LOG_TO_SYSLOG;
@@ -52,15 +52,15 @@ public:
 		return true;
 	}
 
-	virtual void OnIRCConnected() override {
+	void OnIRCConnected() override {
 		Log("[" + GetUser()->GetUserName() + "/" + GetNetwork()->GetName() + "] connected to IRC: " + GetNetwork()->GetCurrentServer()->GetName());
 	}
 
-	virtual void OnIRCDisconnected() override {
+	void OnIRCDisconnected() override {
 		Log("[" + GetUser()->GetUserName() + "/" + GetNetwork()->GetName() + "] disconnected from IRC");
 	}
 
-	virtual EModRet OnRaw(CString& sLine) override {
+	EModRet OnRaw(CString& sLine) override {
 		if (sLine.StartsWith("ERROR ")) {
 			//ERROR :Closing Link: nick[24.24.24.24] (Excess Flood)
 			//ERROR :Closing Link: nick[24.24.24.24] Killer (Local kill by Killer (reason))
@@ -73,15 +73,15 @@ public:
 		return CONTINUE;
         }
 
-	virtual void OnClientLogin() override {
+	void OnClientLogin() override {
 		Log("[" + GetUser()->GetUserName() + "] connected to ZNC from " + GetClient()->GetRemoteIP());
 	}
 
-	virtual void OnClientDisconnect() override {
+	void OnClientDisconnect() override {
 		Log("[" + GetUser()->GetUserName() + "] disconnected from ZNC from " + GetClient()->GetRemoteIP());
 	}
 
-	virtual void OnFailedLogin(const CString& sUsername, const CString& sRemoteIP) override {
+	void OnFailedLogin(const CString& sUsername, const CString& sRemoteIP) override {
 		Log("[" + sUsername + "] failed to login from " + sRemoteIP, LOG_WARNING);
 	}
 
@@ -107,7 +107,7 @@ public:
 		}
 	}
 
-	virtual void OnModCommand(const CString& sCommand) override {
+	void OnModCommand(const CString& sCommand) override {
 		if (!GetUser()->IsAdmin()) {
 			PutModule("Access denied");
 		} else {
diff --git a/modules/alias.cpp b/modules/alias.cpp
index 7f837dc2..149f3256 100644
--- a/modules/alias.cpp
+++ b/modules/alias.cpp
@@ -299,7 +299,7 @@ public:
 		AddCommand("Info", static_cast<CModCommand::ModCmdFunc>(&CAliasMod::InfoCommand), "<name>", "Reports the actions performed by an alias.");
 	}
 
-	virtual EModRet OnUserRaw(CString& sLine) override
+	EModRet OnUserRaw(CString& sLine) override
 	{
 		CAlias current_alias;
 
diff --git a/modules/autoattach.cpp b/modules/autoattach.cpp
index e3e31124..fd6f055d 100644
--- a/modules/autoattach.cpp
+++ b/modules/autoattach.cpp
@@ -162,7 +162,7 @@ public:
 	virtual ~CChanAttach() {
 	}
 
-	virtual bool OnLoad(const CString& sArgs, CString& sMessage) override {
+	bool OnLoad(const CString& sArgs, CString& sMessage) override {
 		VCString vsChans;
 		sArgs.Split(" ", vsChans, false);
 
@@ -217,17 +217,17 @@ public:
 		}
 	}
 
-	virtual EModRet OnChanNotice(CNick& Nick, CChan& Channel, CString& sMessage) override {
+	EModRet OnChanNotice(CNick& Nick, CChan& Channel, CString& sMessage) override {
 		TryAttach(Nick, Channel, sMessage);
 		return CONTINUE;
 	}
 
-	virtual EModRet OnChanMsg(CNick& Nick, CChan& Channel, CString& sMessage) override {
+	EModRet OnChanMsg(CNick& Nick, CChan& Channel, CString& sMessage) override {
 		TryAttach(Nick, Channel, sMessage);
 		return CONTINUE;
 	}
 
-	virtual EModRet OnChanAction(CNick& Nick, CChan& Channel, CString& sMessage) override {
+	EModRet OnChanAction(CNick& Nick, CChan& Channel, CString& sMessage) override {
 		TryAttach(Nick, Channel, sMessage);
 		return CONTINUE;
 	}
diff --git a/modules/autocycle.cpp b/modules/autocycle.cpp
index 18dff944..b9b8cefb 100644
--- a/modules/autocycle.cpp
+++ b/modules/autocycle.cpp
@@ -31,7 +31,7 @@ public:
 
 	virtual ~CAutoCycleMod() {}
 
-	virtual bool OnLoad(const CString& sArgs, CString& sMessage) override {
+	bool OnLoad(const CString& sArgs, CString& sMessage) override {
 		VCString vsChans;
 		sArgs.Split(" ", vsChans, false);
 
@@ -96,16 +96,16 @@ public:
 		}
 	}
 
-	virtual void OnPart(const CNick& Nick, CChan& Channel, const CString& sMessage) override {
+	void OnPart(const CNick& Nick, CChan& Channel, const CString& sMessage) override {
 		AutoCycle(Channel);
 	}
 
-	virtual void OnQuit(const CNick& Nick, const CString& sMessage, const vector<CChan*>& vChans) override {
+	void OnQuit(const CNick& Nick, const CString& sMessage, const vector<CChan*>& vChans) override {
 		for (unsigned int i = 0; i < vChans.size(); i++)
 			AutoCycle(*vChans[i]);
 	}
 
-	virtual void OnKick(const CNick& Nick, const CString& sOpNick, CChan& Channel, const CString& sMessage) override {
+	void OnKick(const CNick& Nick, const CString& sOpNick, CChan& Channel, const CString& sMessage) override {
 		AutoCycle(Channel);
 	}
 
diff --git a/modules/autoop.cpp b/modules/autoop.cpp
index ef866968..77e590d2 100644
--- a/modules/autoop.cpp
+++ b/modules/autoop.cpp
@@ -37,7 +37,7 @@ public:
 
 private:
 protected:
-	virtual void RunJob() override;
+	void RunJob() override;
 
 	CAutoOpMod* m_pParent;
 };
@@ -160,7 +160,7 @@ public:
 		AddCommand("DelUser", static_cast<CModCommand::ModCmdFunc>(&CAutoOpMod::OnDelUserCommand), "<user>", "Removes a user");
 	}
 
-	virtual bool OnLoad(const CString& sArgs, CString& sMessage) override {
+	bool OnLoad(const CString& sArgs, CString& sMessage) override {
 		AddTimer(new CAutoOpTimer(this));
 
 		// Load the users
@@ -185,14 +185,14 @@ public:
 		m_msUsers.clear();
 	}
 
-	virtual void OnJoin(const CNick& Nick, CChan& Channel) override {
+	void OnJoin(const CNick& Nick, CChan& Channel) override {
 		// If we have ops in this chan
 		if (Channel.HasPerm(CChan::Op)) {
 			CheckAutoOp(Nick, Channel);
 		}
 	}
 
-	virtual void OnQuit(const CNick& Nick, const CString& sMessage, const vector<CChan*>& vChans) override {
+	void OnQuit(const CNick& Nick, const CString& sMessage, const vector<CChan*>& vChans) override {
 		MCString::iterator it = m_msQueue.find(Nick.GetNick().AsLower());
 
 		if (it != m_msQueue.end()) {
@@ -200,7 +200,7 @@ public:
 		}
 	}
 
-	virtual void OnNick(const CNick& OldNick, const CString& sNewNick, const vector<CChan*>& vChans) override {
+	void OnNick(const CNick& OldNick, const CString& sNewNick, const vector<CChan*>& vChans) override {
 		// Update the queue with nick changes
 		MCString::iterator it = m_msQueue.find(OldNick.GetNick().AsLower());
 
@@ -210,7 +210,7 @@ public:
 		}
 	}
 
-	virtual EModRet OnPrivNotice(CNick& Nick, CString& sMessage) override {
+	EModRet OnPrivNotice(CNick& Nick, CString& sMessage) override {
 		if (!sMessage.Token(0).Equals("!ZNCAO")) {
 			return CONTINUE;
 		}
@@ -226,7 +226,7 @@ public:
 		return HALTCORE;
 	}
 
-	virtual void OnOp2(const CNick* pOpNick, const CNick& Nick, CChan& Channel, bool bNoChange) override {
+	void OnOp2(const CNick* pOpNick, const CNick& Nick, CChan& Channel, bool bNoChange) override {
 		if (Nick.GetNick() == GetNetwork()->GetIRCNick().GetNick()) {
 			const map<CString,CNick>& msNicks = Channel.GetNicks();
 
diff --git a/modules/autoreply.cpp b/modules/autoreply.cpp
index 53dc873a..e869ceae 100644
--- a/modules/autoreply.cpp
+++ b/modules/autoreply.cpp
@@ -29,7 +29,7 @@ public:
 
 	virtual ~CAutoReplyMod() {}
 
-	virtual bool OnLoad(const CString& sArgs, CString& sMessage) override {
+	bool OnLoad(const CString& sArgs, CString& sMessage) override {
 		if (!sArgs.empty()) {
 			SetReply(sArgs);
 		}
@@ -68,7 +68,7 @@ public:
 		PutIRC("NOTICE " + sNick + " :" + GetReply());
 	}
 
-	virtual EModRet OnPrivMsg(CNick& Nick, CString& sMessage) override {
+	EModRet OnPrivMsg(CNick& Nick, CString& sMessage) override {
 		Handle(Nick.GetNick());
 		return CONTINUE;
 	}
diff --git a/modules/autovoice.cpp b/modules/autovoice.cpp
index e1eb2733..c47cf61a 100644
--- a/modules/autovoice.cpp
+++ b/modules/autovoice.cpp
@@ -124,7 +124,7 @@ public:
 		AddCommand("DelUser", static_cast<CModCommand::ModCmdFunc>(&CAutoVoiceMod::OnDelUserCommand), "<user>", "Removes a user");
 	}
 
-	virtual bool OnLoad(const CString& sArgs, CString& sMessage) override {
+	bool OnLoad(const CString& sArgs, CString& sMessage) override {
 		// Load the chans from the command line
 		unsigned int a = 0;
 		VCString vsChans;
@@ -159,7 +159,7 @@ public:
 		m_msUsers.clear();
 	}
 
-	virtual void OnJoin(const CNick& Nick, CChan& Channel) override {
+	void OnJoin(const CNick& Nick, CChan& Channel) override {
 		// If we have ops in this chan
 		if (Channel.HasPerm(CChan::Op) || Channel.HasPerm(CChan::HalfOp)) {
 			for (map<CString, CAutoVoiceUser*>::iterator it = m_msUsers.begin(); it != m_msUsers.end(); ++it) {
diff --git a/modules/awaynick.cpp b/modules/awaynick.cpp
index e9cdc8e0..5eba2d91 100644
--- a/modules/awaynick.cpp
+++ b/modules/awaynick.cpp
@@ -20,7 +20,7 @@ class CAwayNickMod : public CModule {
 public:
 	MODCONSTRUCTOR(CAwayNickMod) {}
 
-	virtual bool OnLoad(const CString&, CString& sMessage) override {
+	bool OnLoad(const CString&, CString& sMessage) override {
 		sMessage = "retired module - see http://wiki.znc.in/awaynick";
 		return false;
 	}
diff --git a/modules/awaystore.cpp b/modules/awaystore.cpp
index 12363363..116d8fda 100644
--- a/modules/awaystore.cpp
+++ b/modules/awaystore.cpp
@@ -46,7 +46,7 @@ public:
 	virtual ~CAwayJob() {}
 
 protected:
-	virtual void RunJob() override;
+	void RunJob() override;
 };
 
 class CAway : public CModule
@@ -233,7 +233,7 @@ public:
 			SaveBufferToDisk();
 	}
 
-	virtual bool OnLoad(const CString& sArgs, CString& sMessage) override
+	bool OnLoad(const CString& sArgs, CString& sMessage) override
 	{
 		CString sMyArgs = sArgs;
 		size_t uIndex = 0;
@@ -273,7 +273,7 @@ public:
 		return true;
 	}
 
-	virtual void OnIRCConnected() override
+	void OnIRCConnected() override
 	{
 		if (m_bIsAway)
 			Away(true); // reset away if we are reconnected
@@ -329,11 +329,11 @@ public:
 		}
 	}
 
-	virtual void OnClientLogin() override
+	void OnClientLogin() override
 	{
 		Back(true);
 	}
-	virtual void OnClientDisconnect() override
+	void OnClientDisconnect() override
 	{
 		Away();
 	}
@@ -390,14 +390,14 @@ public:
 		m_sReason = "";
 	}
 
-	virtual EModRet OnPrivMsg(CNick& Nick, CString& sMessage) override
+	EModRet OnPrivMsg(CNick& Nick, CString& sMessage) override
 	{
 		if (m_bIsAway)
 			AddMessage(time(NULL), Nick, sMessage);
 		return(CONTINUE);
 	}
 
-	virtual EModRet OnPrivAction(CNick& Nick, CString& sMessage) override
+	EModRet OnPrivAction(CNick& Nick, CString& sMessage) override
 	{
 		if (m_bIsAway) {
 			AddMessage(time(NULL), Nick, "* " + sMessage);
@@ -405,7 +405,7 @@ public:
 		return(CONTINUE);
 	}
 
-	virtual EModRet OnUserNotice(CString& sTarget, CString& sMessage) override
+	EModRet OnUserNotice(CString& sTarget, CString& sMessage) override
 	{
 		Ping();
 		if (m_bIsAway)
@@ -414,7 +414,7 @@ public:
 		return(CONTINUE);
 	}
 
-	virtual EModRet OnUserMsg(CString& sTarget, CString& sMessage) override
+	EModRet OnUserMsg(CString& sTarget, CString& sMessage) override
 	{
 		Ping();
 		if (m_bIsAway)
@@ -423,7 +423,7 @@ public:
 		return(CONTINUE);
 	}
 
-	virtual EModRet OnUserAction(CString& sTarget, CString& sMessage) override
+	EModRet OnUserAction(CString& sTarget, CString& sMessage) override
 	{
 		Ping();
 		if (m_bIsAway)
diff --git a/modules/block_motd.cpp b/modules/block_motd.cpp
index c615933c..b49e3218 100644
--- a/modules/block_motd.cpp
+++ b/modules/block_motd.cpp
@@ -24,7 +24,7 @@ public:
 	virtual ~CBlockMotd() {
 	}
 
-	virtual EModRet OnRaw(CString &sLine) override {
+	EModRet OnRaw(CString &sLine) override {
 		const CString sCmd = sLine.Token(1);
 
 		if (sCmd == "375" /* begin of MOTD */
diff --git a/modules/blockuser.cpp b/modules/blockuser.cpp
index c52c3fef..8e991de3 100644
--- a/modules/blockuser.cpp
+++ b/modules/blockuser.cpp
@@ -32,7 +32,7 @@ public:
 
 	virtual ~CBlockUser() {}
 
-	virtual bool OnLoad(const CString& sArgs, CString& sMessage) override {
+	bool OnLoad(const CString& sArgs, CString& sMessage) override {
 		VCString vArgs;
 		VCString::iterator it;
 		MCString::iterator it2;
@@ -56,7 +56,7 @@ public:
 		return true;
 	}
 
-	virtual EModRet OnLoginAttempt(std::shared_ptr<CAuthBase> Auth) override {
+	EModRet OnLoginAttempt(std::shared_ptr<CAuthBase> Auth) override {
 		if (IsBlocked(Auth->GetUsername())) {
 			Auth->RefuseLogin(MESSAGE);
 			return HALT;
diff --git a/modules/bouncedcc.cpp b/modules/bouncedcc.cpp
index 902e4fed..af21ee8b 100644
--- a/modules/bouncedcc.cpp
+++ b/modules/bouncedcc.cpp
@@ -34,15 +34,15 @@ public:
 	static unsigned short DCCRequest(const CString& sNick, unsigned long uLongIP, unsigned short uPort, const CString& sFileName, bool bIsChat, CBounceDCCMod* pMod, const CString& sRemoteIP);
 
 	void ReadLine(const CString& sData);
-	virtual void ReadData(const char* data, size_t len) override;
-	virtual void ReadPaused() override;
-	virtual void Timeout() override;
-	virtual void ConnectionRefused() override;
-	virtual void ReachedMaxBuffer() override;
-	virtual void SockError(int iErrno, const CString& sDescription) override;
-	virtual void Connected() override;
-	virtual void Disconnected() override;
-	virtual Csock* GetSockObj(const CString& sHost, unsigned short uPort) override;
+	void ReadData(const char* data, size_t len) override;
+	void ReadPaused() override;
+	void Timeout() override;
+	void ConnectionRefused() override;
+	void ReachedMaxBuffer() override;
+	void SockError(int iErrno, const CString& sDescription) override;
+	void Connected() override;
+	void Disconnected() override;
+	Csock* GetSockObj(const CString& sHost, unsigned short uPort) override;
 	void Shutdown();
 	void PutServ(const CString& sLine);
 	void PutPeer(const CString& sLine);
@@ -158,7 +158,7 @@ public:
 		return GetNV("UseClientIP").ToBool();
 	}
 
-	virtual EModRet OnUserCTCP(CString& sTarget, CString& sMessage) override {
+	EModRet OnUserCTCP(CString& sTarget, CString& sMessage) override {
 		if (sMessage.StartsWith("DCC ")) {
 			CString sType = sMessage.Token(1, false, " ", false, "\"", "\"", true);
 			CString sFile = sMessage.Token(2, false, " ", false, "\"", "\"", false);
@@ -212,7 +212,7 @@ public:
 		return CONTINUE;
 	}
 
-	virtual EModRet OnPrivCTCP(CNick& Nick, CString& sMessage) override {
+	EModRet OnPrivCTCP(CNick& Nick, CString& sMessage) override {
 		CIRCNetwork* pNetwork = GetNetwork();
 		if (sMessage.StartsWith("DCC ") && pNetwork->IsUserAttached()) {
 			// DCC CHAT chat 2453612361 44592
diff --git a/modules/buffextras.cpp b/modules/buffextras.cpp
index 70d013cd..f1dac15d 100644
--- a/modules/buffextras.cpp
+++ b/modules/buffextras.cpp
@@ -33,16 +33,16 @@ public:
 		Channel.AddBuffer(":" + GetModNick() + "!" + GetModName() + "@znc.in PRIVMSG " + _NAMEDFMT(Channel.GetName()) + " :{text}", sMessage);
 	}
 
-	virtual void OnRawMode2(const CNick* pOpNick, CChan& Channel, const CString& sModes, const CString& sArgs) override {
+	void OnRawMode2(const CNick* pOpNick, CChan& Channel, const CString& sModes, const CString& sArgs) override {
 		const CString sNickMask = pOpNick ? pOpNick->GetNickMask() : "Server";
 		AddBuffer(Channel, sNickMask + " set mode: " + sModes + " " + sArgs);
 	}
 
-	virtual void OnKick(const CNick& OpNick, const CString& sKickedNick, CChan& Channel, const CString& sMessage) override {
+	void OnKick(const CNick& OpNick, const CString& sKickedNick, CChan& Channel, const CString& sMessage) override {
 		AddBuffer(Channel, OpNick.GetNickMask() + " kicked " + sKickedNick + " Reason: [" + sMessage + "]");
 	}
 
-	virtual void OnQuit(const CNick& Nick, const CString& sMessage, const vector<CChan*>& vChans) override {
+	void OnQuit(const CNick& Nick, const CString& sMessage, const vector<CChan*>& vChans) override {
 		vector<CChan*>::const_iterator it;
 		CString sMsg = Nick.GetNickMask() + " quit with message: [" + sMessage + "]";
 		for (it = vChans.begin(); it != vChans.end(); ++it) {
@@ -50,15 +50,15 @@ public:
 		}
 	}
 
-	virtual void OnJoin(const CNick& Nick, CChan& Channel) override {
+	void OnJoin(const CNick& Nick, CChan& Channel) override {
 		AddBuffer(Channel, Nick.GetNickMask() + " joined");
 	}
 
-	virtual void OnPart(const CNick& Nick, CChan& Channel, const CString& sMessage) override {
+	void OnPart(const CNick& Nick, CChan& Channel, const CString& sMessage) override {
 		AddBuffer(Channel, Nick.GetNickMask() + " parted with message: [" + sMessage + "]");
 	}
 
-	virtual void OnNick(const CNick& OldNick, const CString& sNewNick, const vector<CChan*>& vChans) override {
+	void OnNick(const CNick& OldNick, const CString& sNewNick, const vector<CChan*>& vChans) override {
 		vector<CChan*>::const_iterator it;
 		CString sMsg = OldNick.GetNickMask() + " is now known as " + sNewNick;
 		for (it = vChans.begin(); it != vChans.end(); ++it) {
@@ -66,7 +66,7 @@ public:
 		}
 	}
 
-	virtual EModRet OnTopic(CNick& Nick, CChan& Channel, CString& sTopic) override {
+	EModRet OnTopic(CNick& Nick, CChan& Channel, CString& sTopic) override {
 		AddBuffer(Channel, Nick.GetNickMask() + " changed the topic to: " + sTopic);
 
 		return CONTINUE;
diff --git a/modules/cert.cpp b/modules/cert.cpp
index c3e98c00..826dbfbc 100644
--- a/modules/cert.cpp
+++ b/modules/cert.cpp
@@ -59,7 +59,7 @@ public:
 		return (CFile::Exists(PemFile()));
 	}
 
-	virtual EModRet OnIRCConnecting(CIRCSock *pIRCSock) override {
+	EModRet OnIRCConnecting(CIRCSock *pIRCSock) override {
 		if (HasPemFile()) {
 			pIRCSock->SetPemLocation(PemFile());
 		}
@@ -67,9 +67,9 @@ public:
 		return CONTINUE;
 	}
 
-	virtual CString GetWebMenuTitle() override { return "Certificate"; }
+	CString GetWebMenuTitle() override { return "Certificate"; }
 
-	virtual bool OnWebRequest(CWebSock& WebSock, const CString& sPageName, CTemplate& Tmpl) override {
+	bool OnWebRequest(CWebSock& WebSock, const CString& sPageName, CTemplate& Tmpl) override {
 		if (sPageName == "index") {
 			Tmpl["Cert"] = CString(HasPemFile());
 			return true;
diff --git a/modules/certauth.cpp b/modules/certauth.cpp
index 30448f0b..6f017ec4 100644
--- a/modules/certauth.cpp
+++ b/modules/certauth.cpp
@@ -39,7 +39,7 @@ public:
 
 	virtual ~CSSLClientCertMod() {}
 
-	virtual bool OnBoot() override {
+	bool OnBoot() override {
 		const vector<CListener*>& vListeners = CZNC::Get().GetListeners();
 		vector<CListener*>::const_iterator it;
 
@@ -65,11 +65,11 @@ public:
 		return true;
 	}
 
-	virtual void OnPostRehash() override {
+	void OnPostRehash() override {
 		OnBoot();
 	}
 
-	virtual bool OnLoad(const CString& sArgs, CString& sMessage) override {
+	bool OnLoad(const CString& sArgs, CString& sMessage) override {
 		OnBoot();
 
 		return true;
@@ -101,7 +101,7 @@ public:
 		return pair.second;
 	}
 
-	virtual EModRet OnLoginAttempt(std::shared_ptr<CAuthBase> Auth) override {
+	EModRet OnLoginAttempt(std::shared_ptr<CAuthBase> Auth) override {
 		const CString sUser = Auth->GetUsername();
 		Csock *pSock = Auth->GetSocket();
 		CUser *pUser = CZNC::Get().FindUser(sUser);
@@ -236,9 +236,9 @@ public:
 		}
 	}
 
-	virtual CString GetWebMenuTitle() override { return "certauth"; }
+	CString GetWebMenuTitle() override { return "certauth"; }
 
-	virtual bool OnWebRequest(CWebSock& WebSock, const CString& sPageName, CTemplate& Tmpl) override {
+	bool OnWebRequest(CWebSock& WebSock, const CString& sPageName, CTemplate& Tmpl) override {
 		CUser *pUser = WebSock.GetSession()->GetUser();
 
 		if (sPageName == "index") {
diff --git a/modules/chansaver.cpp b/modules/chansaver.cpp
index 9f54cad8..d0703ac5 100644
--- a/modules/chansaver.cpp
+++ b/modules/chansaver.cpp
@@ -62,13 +62,13 @@ public:
 		}
 	}
 
-	virtual void OnJoin(const CNick& Nick, CChan& Channel) override {
+	void OnJoin(const CNick& Nick, CChan& Channel) override {
 		if (!Channel.InConfig() && GetNetwork()->GetIRCNick().NickEquals(Nick.GetNick())) {
 			Channel.SetInConfig(true);
 		}
 	}
 
-	virtual void OnPart(const CNick& Nick, CChan& Channel, const CString& sMessage) override {
+	void OnPart(const CNick& Nick, CChan& Channel, const CString& sMessage) override {
 		if (Channel.InConfig() && GetNetwork()->GetIRCNick().NickEquals(Nick.GetNick())) {
 			Channel.SetInConfig(false);
 		}
diff --git a/modules/clearbufferonmsg.cpp b/modules/clearbufferonmsg.cpp
index 557e7680..9aa69326 100644
--- a/modules/clearbufferonmsg.cpp
+++ b/modules/clearbufferonmsg.cpp
@@ -69,43 +69,43 @@ public:
 		}
 	}
 
-	virtual EModRet OnUserMsg(CString& sTarget, CString& sMessage) override {
+	EModRet OnUserMsg(CString& sTarget, CString& sMessage) override {
 		if (m_bRules[RULE_MSG])
 			ClearAllBuffers();
 		return CONTINUE;
 	}
 
-	virtual EModRet OnUserCTCP(CString& sTarget, CString& sMessage) override {
+	EModRet OnUserCTCP(CString& sTarget, CString& sMessage) override {
 		if (m_bRules[RULE_CTCP])
 			ClearAllBuffers();
 		return CONTINUE;
 	}
 
-	virtual EModRet OnUserAction(CString& sTarget, CString& sMessage) override {
+	EModRet OnUserAction(CString& sTarget, CString& sMessage) override {
 		if (m_bRules[RULE_ACTION])
 			ClearAllBuffers();
 		return CONTINUE;
 	}
 
-	virtual EModRet OnUserNotice(CString& sTarget, CString& sMessage) override {
+	EModRet OnUserNotice(CString& sTarget, CString& sMessage) override {
 		if (m_bRules[RULE_NOTICE])
 			ClearAllBuffers();
 		return CONTINUE;
 	}
 
-	virtual EModRet OnUserPart(CString& sChannel, CString& sMessage) override {
+	EModRet OnUserPart(CString& sChannel, CString& sMessage) override {
 		if (m_bRules[RULE_PART])
 			ClearAllBuffers();
 		return CONTINUE;
 	}
 
-	virtual EModRet OnUserTopic(CString& sChannel, CString& sTopic) override {
+	EModRet OnUserTopic(CString& sChannel, CString& sTopic) override {
 		if (m_bRules[RULE_TOPIC])
 			ClearAllBuffers();
 		return CONTINUE;
 	}
 
-	virtual EModRet OnUserQuit(CString& sMessage) override {
+	EModRet OnUserQuit(CString& sMessage) override {
 		if (m_bRules[RULE_QUIT])
 			ClearAllBuffers();
 		return CONTINUE;
@@ -140,7 +140,7 @@ public:
 		}
 	}
 
-	virtual bool OnLoad(const CString& sArgs, CString& sMessage) override {
+	bool OnLoad(const CString& sArgs, CString& sMessage) override {
 		VCString vsOpts;
 
 		sArgs.Split(" ", vsOpts, false);
diff --git a/modules/crypt.cpp b/modules/crypt.cpp
index 3c88a67a..bf7c0aef 100644
--- a/modules/crypt.cpp
+++ b/modules/crypt.cpp
@@ -53,7 +53,7 @@ public:
 
 	virtual ~CCryptMod() {}
 
-	virtual EModRet OnUserMsg(CString& sTarget, CString& sMessage) override {
+	EModRet OnUserMsg(CString& sTarget, CString& sMessage) override {
 		sTarget.TrimLeft(NickPrefix());
 
 		if (sMessage.Left(2) == "``") {
@@ -84,12 +84,12 @@ public:
 		return CONTINUE;
 	}
 
-	virtual EModRet OnPrivMsg(CNick& Nick, CString& sMessage) override {
+	EModRet OnPrivMsg(CNick& Nick, CString& sMessage) override {
 		FilterIncoming(Nick.GetNick(), Nick, sMessage);
 		return CONTINUE;
 	}
 
-	virtual EModRet OnChanMsg(CNick& Nick, CChan& Channel, CString& sMessage) override {
+	EModRet OnChanMsg(CNick& Nick, CChan& Channel, CString& sMessage) override {
 		FilterIncoming(Channel.GetName(), Nick, sMessage);
 		return CONTINUE;
 	}
diff --git a/modules/cyrusauth.cpp b/modules/cyrusauth.cpp
index 6d4e61a1..6167bd51 100644
--- a/modules/cyrusauth.cpp
+++ b/modules/cyrusauth.cpp
@@ -51,7 +51,7 @@ public:
 		}
 	}
 
-	virtual bool OnLoad(const CString& sArgs, CString& sMessage) override {
+	bool OnLoad(const CString& sArgs, CString& sMessage) override {
 		VCString vsArgs;
 		VCString::const_iterator it;
 		sArgs.Split(" ", vsArgs, false);
@@ -87,7 +87,7 @@ public:
 		return true;
 	}
 
-	virtual EModRet OnLoginAttempt(std::shared_ptr<CAuthBase> Auth) override {
+	EModRet OnLoginAttempt(std::shared_ptr<CAuthBase> Auth) override {
 		const CString& sUsername = Auth->GetUsername();
 		const CString& sPassword = Auth->GetPassword();
 		CUser *pUser(CZNC::Get().FindUser(sUsername));
diff --git a/modules/dcc.cpp b/modules/dcc.cpp
index fbf9b859..dd928476 100644
--- a/modules/dcc.cpp
+++ b/modules/dcc.cpp
@@ -28,14 +28,14 @@ public:
 	CDCCSock(CDCCMod* pMod, const CString& sRemoteNick, const CString& sRemoteIP, unsigned short uRemotePort, const CString& sLocalFile, unsigned long uFileSize);
 	virtual ~CDCCSock();
 
-	virtual void ReadData(const char* data, size_t len) override;
-	virtual void ConnectionRefused() override;
-	virtual void SockError(int iErrno, const CString& sDescription) override;
-	virtual void Timeout() override;
-	virtual void Connected() override;
-	virtual void Disconnected() override;
+	void ReadData(const char* data, size_t len) override;
+	void ConnectionRefused() override;
+	void SockError(int iErrno, const CString& sDescription) override;
+	void Timeout() override;
+	void Connected() override;
+	void Disconnected() override;
 	void SendPacket();
-	virtual Csock* GetSockObj(const CString& sHost, unsigned short uPort) override;
+	Csock* GetSockObj(const CString& sHost, unsigned short uPort) override;
 	CFile* OpenFile(bool bWrite = true);
 	bool Seek(unsigned long int uPos);
 
@@ -86,7 +86,7 @@ public:
 	virtual ~CDCCMod() {}
 
 #ifndef MOD_DCC_ALLOW_EVERYONE
-	virtual bool OnLoad(const CString& sArgs, CString& sMessage) override {
+	bool OnLoad(const CString& sArgs, CString& sMessage) override {
 		if (!GetUser()->IsAdmin()) {
 			sMessage = "You must be admin to use the DCC module";
 			return false;
@@ -219,7 +219,7 @@ public:
 		}
 	}
 
-	virtual void OnModCTCP(const CString& sMessage) override {
+	void OnModCTCP(const CString& sMessage) override {
 		if (sMessage.StartsWith("DCC RESUME ")) {
 			CString sFile = sMessage.Token(2);
 			unsigned short uResumePort = sMessage.Token(3).ToUShort();
diff --git a/modules/fail2ban.cpp b/modules/fail2ban.cpp
index beb4f9ff..f2f483fc 100644
--- a/modules/fail2ban.cpp
+++ b/modules/fail2ban.cpp
@@ -21,7 +21,7 @@ public:
 	MODCONSTRUCTOR(CFailToBanMod) {}
 	virtual ~CFailToBanMod() {}
 
-	virtual bool OnLoad(const CString& sArgs, CString& sMessage) override {
+	bool OnLoad(const CString& sArgs, CString& sMessage) override {
 		CString sTimeout = sArgs.Token(0);
 		CString sAttempts = sArgs.Token(1);
 		unsigned int timeout = sTimeout.ToUInt();
@@ -46,7 +46,7 @@ public:
 		return true;
 	}
 
-	virtual void OnPostRehash() override {
+	void OnPostRehash() override {
 		m_Cache.Clear();
 	}
 
@@ -54,13 +54,13 @@ public:
 		m_Cache.AddItem(sHost, count, m_Cache.GetTTL());
 	}
 
-	virtual void OnModCommand(const CString& sCommand) override {
+	void OnModCommand(const CString& sCommand) override {
 		PutModule("This module can only be configured through its arguments.");
 		PutModule("The module argument is the number of minutes an IP");
 		PutModule("is blocked after a failed login.");
 	}
 
-	virtual void OnClientConnect(CZNCSock* pClient, const CString& sHost, unsigned short uPort) override {
+	void OnClientConnect(CZNCSock* pClient, const CString& sHost, unsigned short uPort) override {
 		unsigned int *pCount = m_Cache.GetItem(sHost);
 		if (sHost.empty() || pCount == NULL || *pCount < m_uiAllowedFailed) {
 			return;
@@ -73,7 +73,7 @@ public:
 		pClient->Close(Csock::CLT_AFTERWRITE);
 	}
 
-	virtual void OnFailedLogin(const CString& sUsername, const CString& sRemoteIP) override {
+	void OnFailedLogin(const CString& sUsername, const CString& sRemoteIP) override {
 		unsigned int *pCount = m_Cache.GetItem(sRemoteIP);
 		if (pCount)
 			Add(sRemoteIP, *pCount + 1);
@@ -81,7 +81,7 @@ public:
 			Add(sRemoteIP, 1);
 	}
 
-	virtual EModRet OnLoginAttempt(std::shared_ptr<CAuthBase> Auth) override {
+	EModRet OnLoginAttempt(std::shared_ptr<CAuthBase> Auth) override {
 		// e.g. webadmin ends up here
 		const CString& sRemoteIP = Auth->GetRemoteIP();
 
diff --git a/modules/identfile.cpp b/modules/identfile.cpp
index 0cdce902..b9f4f322 100644
--- a/modules/identfile.cpp
+++ b/modules/identfile.cpp
@@ -147,7 +147,7 @@ public:
 		}
 	}
 
-	virtual bool OnLoad(const CString& sArgs, CString& sMessage) override {
+	bool OnLoad(const CString& sArgs, CString& sMessage) override {
 		m_pISpoofLockFile = NULL;
 		m_pIRCSock = NULL;
 
@@ -162,7 +162,7 @@ public:
 		return true;
 	}
 
-	virtual EModRet OnIRCConnecting(CIRCSock *pIRCSock) override {
+	EModRet OnIRCConnecting(CIRCSock *pIRCSock) override {
 		if (m_pISpoofLockFile != NULL) {
 			DEBUG("Aborting connection, ident spoof lock file exists");
 			PutModule("Aborting connection, another user or network is currently connecting and using the ident spoof file");
@@ -179,19 +179,19 @@ public:
 		return CONTINUE;
 	}
 
-	virtual void OnIRCConnected() override {
+	void OnIRCConnected() override {
 		if (m_pIRCSock == GetNetwork()->GetIRCSock()) {
 			ReleaseISpoof();
 		}
 	}
 
-	virtual void OnIRCConnectionError(CIRCSock *pIRCSock) override {
+	void OnIRCConnectionError(CIRCSock *pIRCSock) override {
 		if (m_pIRCSock == pIRCSock) {
 			ReleaseISpoof();
 		}
 	}
 
-	virtual void OnIRCDisconnected() override {
+	void OnIRCDisconnected() override {
 		if (m_pIRCSock == GetNetwork()->GetIRCSock()) {
 			ReleaseISpoof();
 		}
diff --git a/modules/imapauth.cpp b/modules/imapauth.cpp
index 8061d27c..64011acb 100644
--- a/modules/imapauth.cpp
+++ b/modules/imapauth.cpp
@@ -36,7 +36,7 @@ public:
 		}
 	}
 
-	virtual void ReadLine(const CString& sLine) override;
+	void ReadLine(const CString& sLine) override;
 private:
 protected:
 	CIMAPAuthMod*              m_pIMAPMod;
@@ -57,11 +57,11 @@ public:
 
 	virtual ~CIMAPAuthMod() {}
 
-	virtual bool OnBoot() override {
+	bool OnBoot() override {
 		return true;
 	}
 
-	virtual bool OnLoad(const CString& sArgs, CString& sMessage) override {
+	bool OnLoad(const CString& sArgs, CString& sMessage) override {
 		if (sArgs.Trim_n().empty()) {
 			return true; // use defaults
 		}
@@ -84,7 +84,7 @@ public:
 		return true;
 	}
 
-	virtual EModRet OnLoginAttempt(std::shared_ptr<CAuthBase> Auth) override {
+	EModRet OnLoginAttempt(std::shared_ptr<CAuthBase> Auth) override {
 		CUser* pUser = CZNC::Get().FindUser(Auth->GetUsername());
 
 		if (!pUser) { // @todo Will want to do some sort of && !m_bAllowCreate in the future
@@ -104,7 +104,7 @@ public:
 		return HALT;
 	}
 
-	virtual void OnModCommand(const CString& sLine) override {
+	void OnModCommand(const CString& sLine) override {
 	}
 
 	void CacheLogin(const CString& sLogin) {
diff --git a/modules/keepnick.cpp b/modules/keepnick.cpp
index 0c03ead8..57fd95a2 100644
--- a/modules/keepnick.cpp
+++ b/modules/keepnick.cpp
@@ -138,7 +138,7 @@ public:
 		m_pTimer = NULL;
 	}
 
-	virtual EModRet OnUserRaw(CString& sLine) override {
+	EModRet OnUserRaw(CString& sLine) override {
 		// We dont care if we are not connected to IRC
 		if (!GetNetwork()->IsIRCConnected())
 			return CONTINUE;
@@ -164,7 +164,7 @@ public:
 		return CONTINUE;
 	}
 
-	virtual EModRet OnRaw(CString& sLine) override {
+	EModRet OnRaw(CString& sLine) override {
 		// Are we trying to get our primary nick and we caused this error?
 		// :irc.server.net 433 mynick badnick :Nickname is already in use.
 		if (m_pTimer && sLine.Token(1) == "433" && sLine.Token(3).Equals(GetNick()))
diff --git a/modules/kickrejoin.cpp b/modules/kickrejoin.cpp
index b43d5720..4741a53f 100644
--- a/modules/kickrejoin.cpp
+++ b/modules/kickrejoin.cpp
@@ -34,7 +34,7 @@ public:
 	virtual ~CRejoinJob() {}
 
 protected:
-	virtual void RunJob() override {
+	void RunJob() override {
 		CIRCNetwork* pNetwork = GetModule()->GetNetwork();
 		CChan* pChan = pNetwork->FindChan(GetName().Token(1, true));
 
@@ -57,7 +57,7 @@ public:
 	}
 	virtual ~CRejoinMod() {}
 
-	virtual bool OnLoad(const CString& sArgs, CString& sErrorMsg) override {
+	bool OnLoad(const CString& sArgs, CString& sErrorMsg) override {
 		if (sArgs.empty()) {
 			CString sDelay = GetNV("delay");
 
@@ -104,7 +104,7 @@ public:
 			PutModule("Rejoin delay disabled");
 	}
 
-	virtual void OnKick(const CNick& OpNick, const CString& sKickedNick, CChan& pChan, const CString& sMessage) override {
+	void OnKick(const CNick& OpNick, const CString& sKickedNick, CChan& pChan, const CString& sMessage) override {
 		if (GetNetwork()->GetCurNick().Equals(sKickedNick)) {
 			if (!delay) {
 				PutIRC("JOIN " + pChan.GetName() + " " + pChan.GetKey());
diff --git a/modules/lastseen.cpp b/modules/lastseen.cpp
index 44055421..af91b51e 100644
--- a/modules/lastseen.cpp
+++ b/modules/lastseen.cpp
@@ -77,25 +77,25 @@ public:
 
 	// Event stuff:
 
-	virtual void OnClientLogin() override {
+	void OnClientLogin() override {
 		SetTime(GetUser());
 	}
 
-	virtual void OnClientDisconnect() override {
+	void OnClientDisconnect() override {
 		SetTime(GetUser());
 	}
 
-	virtual EModRet OnDeleteUser(CUser& User) override {
+	EModRet OnDeleteUser(CUser& User) override {
 		DelNV(User.GetUserName());
 		return CONTINUE;
 	}
 
 	// Web stuff:
 
-	virtual bool WebRequiresAdmin() override { return true; }
-	virtual CString GetWebMenuTitle() override { return "Last Seen"; }
+	bool WebRequiresAdmin() override { return true; }
+	CString GetWebMenuTitle() override { return "Last Seen"; }
 
-	virtual bool OnWebRequest(CWebSock& WebSock, const CString& sPageName, CTemplate& Tmpl) override {
+	bool OnWebRequest(CWebSock& WebSock, const CString& sPageName, CTemplate& Tmpl) override {
 		if (sPageName == "index") {
 			CModules& GModules = CZNC::Get().GetModules();
 			Tmpl["WebAdminLoaded"] = CString(GModules.FindModule("webadmin") != NULL);
@@ -122,7 +122,7 @@ public:
 		return false;
 	}
 
-	virtual bool OnEmbeddedWebRequest(CWebSock& WebSock, const CString& sPageName, CTemplate& Tmpl) override {
+	bool OnEmbeddedWebRequest(CWebSock& WebSock, const CString& sPageName, CTemplate& Tmpl) override {
 		if (sPageName == "webadmin/user" && WebSock.GetSession()->IsAdmin()) {
 			CUser* pUser = CZNC::Get().FindUser(Tmpl["Username"]);
 			if (pUser) {
diff --git a/modules/listsockets.cpp b/modules/listsockets.cpp
index fd59d1f8..cab7d2da 100644
--- a/modules/listsockets.cpp
+++ b/modules/listsockets.cpp
@@ -69,7 +69,7 @@ public:
 		AddCommand("List", static_cast<CModCommand::ModCmdFunc>(&CListSockets::OnListCommand), "[-n]", "Show the list of active sockets. Pass -n to show IP addresses");
 	}
 
-	virtual bool OnLoad(const CString& sArgs, CString& sMessage) override
+	bool OnLoad(const CString& sArgs, CString& sMessage) override
 	{
 #ifndef MOD_LISTSOCKETS_ALLOW_EVERYONE
 		if (!GetUser()->IsAdmin()) {
@@ -99,10 +99,10 @@ public:
 		return ret;
 	}
 
-	virtual bool WebRequiresAdmin() override { return true; }
-	virtual CString GetWebMenuTitle() override { return "List sockets"; }
+	bool WebRequiresAdmin() override { return true; }
+	CString GetWebMenuTitle() override { return "List sockets"; }
 
-	virtual bool OnWebRequest(CWebSock& WebSock, const CString& sPageName, CTemplate& Tmpl) override {
+	bool OnWebRequest(CWebSock& WebSock, const CString& sPageName, CTemplate& Tmpl) override {
 		if (sPageName == "index") {
 			if (CZNC::Get().GetManager().empty()) {
 				return false;
diff --git a/modules/log.cpp b/modules/log.cpp
index 4a328cd0..2f3124a3 100644
--- a/modules/log.cpp
+++ b/modules/log.cpp
@@ -76,33 +76,33 @@ public:
 	void PutLog(const CString& sLine, const CNick& Nick);
 	CString GetServer();
 
-	virtual bool OnLoad(const CString& sArgs, CString& sMessage) override;
-	virtual void OnIRCConnected() override;
-	virtual void OnIRCDisconnected() override;
-	virtual EModRet OnBroadcast(CString& sMessage) override;
+	bool OnLoad(const CString& sArgs, CString& sMessage) override;
+	void OnIRCConnected() override;
+	void OnIRCDisconnected() override;
+	EModRet OnBroadcast(CString& sMessage) override;
 
-	virtual void OnRawMode2(const CNick* pOpNick, CChan& Channel, const CString& sModes, const CString& sArgs) override;
-	virtual void OnKick(const CNick& OpNick, const CString& sKickedNick, CChan& Channel, const CString& sMessage) override;
-	virtual void OnQuit(const CNick& Nick, const CString& sMessage, const vector<CChan*>& vChans) override;
-	virtual void OnJoin(const CNick& Nick, CChan& Channel) override;
-	virtual void OnPart(const CNick& Nick, CChan& Channel, const CString& sMessage) override;
-	virtual void OnNick(const CNick& OldNick, const CString& sNewNick, const vector<CChan*>& vChans) override;
-	virtual EModRet OnTopic(CNick& Nick, CChan& Channel, CString& sTopic) override;
+	void OnRawMode2(const CNick* pOpNick, CChan& Channel, const CString& sModes, const CString& sArgs) override;
+	void OnKick(const CNick& OpNick, const CString& sKickedNick, CChan& Channel, const CString& sMessage) override;
+	void OnQuit(const CNick& Nick, const CString& sMessage, const vector<CChan*>& vChans) override;
+	void OnJoin(const CNick& Nick, CChan& Channel) override;
+	void OnPart(const CNick& Nick, CChan& Channel, const CString& sMessage) override;
+	void OnNick(const CNick& OldNick, const CString& sNewNick, const vector<CChan*>& vChans) override;
+	EModRet OnTopic(CNick& Nick, CChan& Channel, CString& sTopic) override;
 
 	/* notices */
-	virtual EModRet OnUserNotice(CString& sTarget, CString& sMessage) override;
-	virtual EModRet OnPrivNotice(CNick& Nick, CString& sMessage) override;
-	virtual EModRet OnChanNotice(CNick& Nick, CChan& Channel, CString& sMessage) override;
+	EModRet OnUserNotice(CString& sTarget, CString& sMessage) override;
+	EModRet OnPrivNotice(CNick& Nick, CString& sMessage) override;
+	EModRet OnChanNotice(CNick& Nick, CChan& Channel, CString& sMessage) override;
 
 	/* actions */
-	virtual EModRet OnUserAction(CString& sTarget, CString& sMessage) override;
-	virtual EModRet OnPrivAction(CNick& Nick, CString& sMessage) override;
-	virtual EModRet OnChanAction(CNick& Nick, CChan& Channel, CString& sMessage) override;
+	EModRet OnUserAction(CString& sTarget, CString& sMessage) override;
+	EModRet OnPrivAction(CNick& Nick, CString& sMessage) override;
+	EModRet OnChanAction(CNick& Nick, CChan& Channel, CString& sMessage) override;
 
 	/* msgs */
-	virtual EModRet OnUserMsg(CString& sTarget, CString& sMessage) override;
-	virtual EModRet OnPrivMsg(CNick& Nick, CString& sMessage) override;
-	virtual EModRet OnChanMsg(CNick& Nick, CChan& Channel, CString& sMessage) override;
+	EModRet OnUserMsg(CString& sTarget, CString& sMessage) override;
+	EModRet OnPrivMsg(CNick& Nick, CString& sMessage) override;
+	EModRet OnChanMsg(CNick& Nick, CChan& Channel, CString& sMessage) override;
 
 private:
 	CString                 m_sLogPath;
diff --git a/modules/missingmotd.cpp b/modules/missingmotd.cpp
index 67a4dba3..e7e0fe33 100644
--- a/modules/missingmotd.cpp
+++ b/modules/missingmotd.cpp
@@ -20,7 +20,7 @@ class CMissingMotd : public CModule {
 public:
 	MODCONSTRUCTOR(CMissingMotd) {}
 
-	virtual void OnClientLogin() override {
+	void OnClientLogin() override {
 		PutUser(":irc.znc.in 422 :MOTD File is missing");
 	}
 };
diff --git a/modules/modperl.cpp b/modules/modperl.cpp
index fc08b57e..74a9e42a 100644
--- a/modules/modperl.cpp
+++ b/modules/modperl.cpp
@@ -133,7 +133,7 @@ public:
 		return result;
 	}
 
-	virtual EModRet OnModuleUnloading(CModule* pModule, bool& bSuccess, CString& sRetMsg) override {
+	EModRet OnModuleUnloading(CModule* pModule, bool& bSuccess, CString& sRetMsg) override {
 		CPerlModule* pMod = AsPerlModule(pModule);
 		if (pMod) {
 			EModRet result = HALT;
@@ -208,7 +208,7 @@ public:
 		return result;
 	}
 
-	virtual void OnGetAvailableMods(set<CModInfo>& ssMods, CModInfo::EModuleType eType) override {
+	void OnGetAvailableMods(set<CModInfo>& ssMods, CModInfo::EModuleType eType) override {
 
 		unsigned int a = 0;
 		CDir Dir;
diff --git a/modules/modperl/module.h b/modules/modperl/module.h
index acab1885..88094db3 100644
--- a/modules/modperl/module.h
+++ b/modules/modperl/module.h
@@ -38,74 +38,74 @@ public:
 		return sv_2mortal(newSVsv(m_perlObj));
 	}
 
-	virtual bool OnBoot() override;
-	virtual bool WebRequiresLogin() override;
-	virtual bool WebRequiresAdmin() override;
-	virtual CString GetWebMenuTitle() override;
-	virtual bool OnWebPreRequest(CWebSock& WebSock, const CString& sPageName) override;
-	virtual bool OnWebRequest(CWebSock& WebSock, const CString& sPageName, CTemplate& Tmpl) override;
-	virtual VWebSubPages& GetSubPages() override;
-	virtual void OnPreRehash() override;
-	virtual void OnPostRehash() override;
-	virtual void OnIRCDisconnected() override;
-	virtual void OnIRCConnected() override;
-	virtual EModRet OnIRCConnecting(CIRCSock *pIRCSock) override;
-	virtual void OnIRCConnectionError(CIRCSock *pIRCSock) override;
-	virtual EModRet OnIRCRegistration(CString& sPass, CString& sNick, CString& sIdent, CString& sRealName) override;
-	virtual EModRet OnBroadcast(CString& sMessage) override;
-	virtual void OnChanPermission2(const CNick* pOpNick, const CNick& Nick, CChan& Channel, unsigned char uMode, bool bAdded, bool bNoChange) override;
-	virtual void OnOp2(const CNick* pOpNick, const CNick& Nick, CChan& Channel, bool bNoChange) override;
-	virtual void OnDeop2(const CNick* pOpNick, const CNick& Nick, CChan& Channel, bool bNoChange) override;
-	virtual void OnVoice2(const CNick* pOpNick, const CNick& Nick, CChan& Channel, bool bNoChange) override;
-	virtual void OnDevoice2(const CNick* pOpNick, const CNick& Nick, CChan& Channel, bool bNoChange) override;
-	virtual void OnMode2(const CNick* pOpNick, CChan& Channel, char uMode, const CString& sArg, bool bAdded, bool bNoChange) override;
-	virtual void OnRawMode2(const CNick* pOpNick, CChan& Channel, const CString& sModes, const CString& sArgs) override;
-	virtual EModRet OnRaw(CString& sLine) override;
-	virtual EModRet OnStatusCommand(CString& sCommand) override;
-	virtual void OnModCommand(const CString& sCommand) override;
-	virtual void OnModNotice(const CString& sMessage) override;
-	virtual void OnModCTCP(const CString& sMessage) override;
-	virtual void OnQuit(const CNick& Nick, const CString& sMessage, const std::vector<CChan*>& vChans) override;
-	virtual void OnNick(const CNick& Nick, const CString& sNewNick, const std::vector<CChan*>& vChans) override;
-	virtual void OnKick(const CNick& OpNick, const CString& sKickedNick, CChan& Channel, const CString& sMessage) override;
-	virtual EModRet OnJoining(CChan& Channel) override;
-	virtual void OnJoin(const CNick& Nick, CChan& Channel) override;
-	virtual void OnPart(const CNick& Nick, CChan& Channel, const CString& sMessage) override;
-	virtual EModRet OnChanBufferStarting(CChan& Chan, CClient& Client) override;
-	virtual EModRet OnChanBufferEnding(CChan& Chan, CClient& Client) override;
-	virtual EModRet OnChanBufferPlayLine(CChan& Chan, CClient& Client, CString& sLine) override;
-	virtual EModRet OnPrivBufferPlayLine(CClient& Client, CString& sLine) override;
-	virtual void OnClientLogin() override;
-	virtual void OnClientDisconnect() override;
-	virtual EModRet OnUserRaw(CString& sLine) override;
-	virtual EModRet OnUserCTCPReply(CString& sTarget, CString& sMessage) override;
-	virtual EModRet OnUserCTCP(CString& sTarget, CString& sMessage) override;
-	virtual EModRet OnUserAction(CString& sTarget, CString& sMessage) override;
-	virtual EModRet OnUserMsg(CString& sTarget, CString& sMessage) override;
-	virtual EModRet OnUserNotice(CString& sTarget, CString& sMessage) override;
-	virtual EModRet OnUserJoin(CString& sChannel, CString& sKey) override;
-	virtual EModRet OnUserPart(CString& sChannel, CString& sMessage) override;
-	virtual EModRet OnUserTopic(CString& sChannel, CString& sTopic) override;
-	virtual EModRet OnUserQuit(CString& sMessage) override;
-	virtual EModRet OnUserTopicRequest(CString& sChannel) override;
-	virtual EModRet OnCTCPReply(CNick& Nick, CString& sMessage) override;
-	virtual EModRet OnPrivCTCP(CNick& Nick, CString& sMessage) override;
-	virtual EModRet OnChanCTCP(CNick& Nick, CChan& Channel, CString& sMessage) override;
-	virtual EModRet OnPrivAction(CNick& Nick, CString& sMessage) override;
-	virtual EModRet OnChanAction(CNick& Nick, CChan& Channel, CString& sMessage) override;
-	virtual EModRet OnPrivMsg(CNick& Nick, CString& sMessage) override;
-	virtual EModRet OnChanMsg(CNick& Nick, CChan& Channel, CString& sMessage) override;
-	virtual EModRet OnPrivNotice(CNick& Nick, CString& sMessage) override;
-	virtual EModRet OnChanNotice(CNick& Nick, CChan& Channel, CString& sMessage) override;
-	virtual EModRet OnTopic(CNick& Nick, CChan& Channel, CString& sTopic) override;
-	virtual bool OnServerCapAvailable(const CString& sCap) override;
-	virtual void OnServerCapResult(const CString& sCap, bool bSuccess) override;
-	virtual EModRet OnTimerAutoJoin(CChan& Channel) override;
-	virtual bool OnEmbeddedWebRequest(CWebSock&, const CString&, CTemplate&) override;
-	virtual EModRet OnAddNetwork(CIRCNetwork& Network, CString& sErrorRet) override;
-	virtual EModRet OnDeleteNetwork(CIRCNetwork& Network) override;
-	virtual EModRet OnSendToClient(CString& sLine, CClient& Client) override;
-	virtual EModRet OnSendToIRC(CString& sLine) override;
+	bool OnBoot() override;
+	bool WebRequiresLogin() override;
+	bool WebRequiresAdmin() override;
+	CString GetWebMenuTitle() override;
+	bool OnWebPreRequest(CWebSock& WebSock, const CString& sPageName) override;
+	bool OnWebRequest(CWebSock& WebSock, const CString& sPageName, CTemplate& Tmpl) override;
+	VWebSubPages& GetSubPages() override;
+	void OnPreRehash() override;
+	void OnPostRehash() override;
+	void OnIRCDisconnected() override;
+	void OnIRCConnected() override;
+	EModRet OnIRCConnecting(CIRCSock *pIRCSock) override;
+	void OnIRCConnectionError(CIRCSock *pIRCSock) override;
+	EModRet OnIRCRegistration(CString& sPass, CString& sNick, CString& sIdent, CString& sRealName) override;
+	EModRet OnBroadcast(CString& sMessage) override;
+	void OnChanPermission2(const CNick* pOpNick, const CNick& Nick, CChan& Channel, unsigned char uMode, bool bAdded, bool bNoChange) override;
+	void OnOp2(const CNick* pOpNick, const CNick& Nick, CChan& Channel, bool bNoChange) override;
+	void OnDeop2(const CNick* pOpNick, const CNick& Nick, CChan& Channel, bool bNoChange) override;
+	void OnVoice2(const CNick* pOpNick, const CNick& Nick, CChan& Channel, bool bNoChange) override;
+	void OnDevoice2(const CNick* pOpNick, const CNick& Nick, CChan& Channel, bool bNoChange) override;
+	void OnMode2(const CNick* pOpNick, CChan& Channel, char uMode, const CString& sArg, bool bAdded, bool bNoChange) override;
+	void OnRawMode2(const CNick* pOpNick, CChan& Channel, const CString& sModes, const CString& sArgs) override;
+	EModRet OnRaw(CString& sLine) override;
+	EModRet OnStatusCommand(CString& sCommand) override;
+	void OnModCommand(const CString& sCommand) override;
+	void OnModNotice(const CString& sMessage) override;
+	void OnModCTCP(const CString& sMessage) override;
+	void OnQuit(const CNick& Nick, const CString& sMessage, const std::vector<CChan*>& vChans) override;
+	void OnNick(const CNick& Nick, const CString& sNewNick, const std::vector<CChan*>& vChans) override;
+	void OnKick(const CNick& OpNick, const CString& sKickedNick, CChan& Channel, const CString& sMessage) override;
+	EModRet OnJoining(CChan& Channel) override;
+	void OnJoin(const CNick& Nick, CChan& Channel) override;
+	void OnPart(const CNick& Nick, CChan& Channel, const CString& sMessage) override;
+	EModRet OnChanBufferStarting(CChan& Chan, CClient& Client) override;
+	EModRet OnChanBufferEnding(CChan& Chan, CClient& Client) override;
+	EModRet OnChanBufferPlayLine(CChan& Chan, CClient& Client, CString& sLine) override;
+	EModRet OnPrivBufferPlayLine(CClient& Client, CString& sLine) override;
+	void OnClientLogin() override;
+	void OnClientDisconnect() override;
+	EModRet OnUserRaw(CString& sLine) override;
+	EModRet OnUserCTCPReply(CString& sTarget, CString& sMessage) override;
+	EModRet OnUserCTCP(CString& sTarget, CString& sMessage) override;
+	EModRet OnUserAction(CString& sTarget, CString& sMessage) override;
+	EModRet OnUserMsg(CString& sTarget, CString& sMessage) override;
+	EModRet OnUserNotice(CString& sTarget, CString& sMessage) override;
+	EModRet OnUserJoin(CString& sChannel, CString& sKey) override;
+	EModRet OnUserPart(CString& sChannel, CString& sMessage) override;
+	EModRet OnUserTopic(CString& sChannel, CString& sTopic) override;
+	EModRet OnUserQuit(CString& sMessage) override;
+	EModRet OnUserTopicRequest(CString& sChannel) override;
+	EModRet OnCTCPReply(CNick& Nick, CString& sMessage) override;
+	EModRet OnPrivCTCP(CNick& Nick, CString& sMessage) override;
+	EModRet OnChanCTCP(CNick& Nick, CChan& Channel, CString& sMessage) override;
+	EModRet OnPrivAction(CNick& Nick, CString& sMessage) override;
+	EModRet OnChanAction(CNick& Nick, CChan& Channel, CString& sMessage) override;
+	EModRet OnPrivMsg(CNick& Nick, CString& sMessage) override;
+	EModRet OnChanMsg(CNick& Nick, CChan& Channel, CString& sMessage) override;
+	EModRet OnPrivNotice(CNick& Nick, CString& sMessage) override;
+	EModRet OnChanNotice(CNick& Nick, CChan& Channel, CString& sMessage) override;
+	EModRet OnTopic(CNick& Nick, CChan& Channel, CString& sTopic) override;
+	bool OnServerCapAvailable(const CString& sCap) override;
+	void OnServerCapResult(const CString& sCap, bool bSuccess) override;
+	EModRet OnTimerAutoJoin(CChan& Channel) override;
+	bool OnEmbeddedWebRequest(CWebSock&, const CString&, CTemplate&) override;
+	EModRet OnAddNetwork(CIRCNetwork& Network, CString& sErrorRet) override;
+	EModRet OnDeleteNetwork(CIRCNetwork& Network) override;
+	EModRet OnSendToClient(CString& sLine, CClient& Client) override;
+	EModRet OnSendToIRC(CString& sLine) override;
 };
 
 static inline CPerlModule* AsPerlModule(CModule* p) {
@@ -125,7 +125,7 @@ public:
 					: CTimer (pModule, uInterval, uCycles, sLabel, sDescription), m_perlObj(newSVsv(perlObj)) {
 		pModule->AddTimer(this);
 	}
-	virtual void RunJob() override;
+	void RunJob() override;
 	SV* GetPerlObj() {
 		return sv_2mortal(newSVsv(m_perlObj));
 	}
@@ -145,13 +145,13 @@ public:
 		return sv_2mortal(newSVsv(m_perlObj));
 	}
 	~CPerlSocket();
-	virtual void Connected() override;
-	virtual void Disconnected() override;
-	virtual void Timeout() override;
-	virtual void ConnectionRefused() override;
-	virtual void ReadData(const char *data, size_t len) override;
-	virtual void ReadLine(const CString& sLine) override;
-	virtual Csock* GetSockObj(const CString& sHost, unsigned short uPort) override;
+	void Connected() override;
+	void Disconnected() override;
+	void Timeout() override;
+	void ConnectionRefused() override;
+	void ReadData(const char *data, size_t len) override;
+	void ReadLine(const CString& sLine) override;
+	Csock* GetSockObj(const CString& sHost, unsigned short uPort) override;
 };
 
 inline CPerlSocket* CreatePerlSocket(CPerlModule* pModule, SV* perlObj) {
diff --git a/modules/modpython.cpp b/modules/modpython.cpp
index 004a321e..ed263192 100644
--- a/modules/modpython.cpp
+++ b/modules/modpython.cpp
@@ -194,7 +194,7 @@ public:
 		return HALT;
 	}
 
-	virtual EModRet OnModuleUnloading(CModule* pModule, bool& bSuccess, CString& sRetMsg) override {
+	EModRet OnModuleUnloading(CModule* pModule, bool& bSuccess, CString& sRetMsg) override {
 		CPyModule* pMod = AsPyModule(pModule);
 		if (pMod) {
 			CString sModName = pMod->GetModName();
@@ -309,7 +309,7 @@ public:
 		}
 	}
 
-	virtual void OnGetAvailableMods(set<CModInfo>& ssMods, CModInfo::EModuleType eType) override {
+	void OnGetAvailableMods(set<CModInfo>& ssMods, CModInfo::EModuleType eType) override {
 		CDir Dir;
 		CModules::ModDirList dirs = CModules::GetModDirs();
 
diff --git a/modules/modpython/module.h b/modules/modpython/module.h
index 56be98f4..2c741880 100644
--- a/modules/modpython/module.h
+++ b/modules/modpython/module.h
@@ -54,91 +54,91 @@ public:
 		return m_pModPython;
 	}
 
-	virtual bool OnBoot() override;
-	virtual bool WebRequiresLogin() override;
-	virtual bool WebRequiresAdmin() override;
-	virtual CString GetWebMenuTitle() override;
-	virtual bool OnWebPreRequest(CWebSock& WebSock, const CString& sPageName) override;
-	virtual bool OnWebRequest(CWebSock& WebSock, const CString& sPageName, CTemplate& Tmpl) override;
-	virtual VWebSubPages& GetSubPages() override;
-	virtual void OnPreRehash() override;
-	virtual void OnPostRehash() override;
-	virtual void OnIRCDisconnected() override;
-	virtual void OnIRCConnected() override;
-	virtual EModRet OnIRCConnecting(CIRCSock *pIRCSock) override;
-	virtual void OnIRCConnectionError(CIRCSock *pIRCSock) override;
-	virtual EModRet OnIRCRegistration(CString& sPass, CString& sNick, CString& sIdent, CString& sRealName) override;
-	virtual EModRet OnBroadcast(CString& sMessage) override;
-	virtual void OnChanPermission2(const CNick* pOpNick, const CNick& Nick, CChan& Channel, unsigned char uMode, bool bAdded, bool bNoChange) override;
-	virtual void OnOp2(const CNick* pOpNick, const CNick& Nick, CChan& Channel, bool bNoChange) override;
-	virtual void OnDeop2(const CNick* pOpNick, const CNick& Nick, CChan& Channel, bool bNoChange) override;
-	virtual void OnVoice2(const CNick* pOpNick, const CNick& Nick, CChan& Channel, bool bNoChange) override;
-	virtual void OnDevoice2(const CNick* pOpNick, const CNick& Nick, CChan& Channel, bool bNoChange) override;
-	virtual void OnMode2(const CNick* pOpNick, CChan& Channel, char uMode, const CString& sArg, bool bAdded, bool bNoChange) override;
-	virtual void OnRawMode2(const CNick* pOpNick, CChan& Channel, const CString& sModes, const CString& sArgs) override;
-	virtual EModRet OnRaw(CString& sLine) override;
-	virtual EModRet OnStatusCommand(CString& sCommand) override;
-	virtual void OnModCommand(const CString& sCommand) override;
-	virtual void OnModNotice(const CString& sMessage) override;
-	virtual void OnModCTCP(const CString& sMessage) override;
-	virtual void OnQuit(const CNick& Nick, const CString& sMessage, const std::vector<CChan*>& vChans) override;
-	virtual void OnNick(const CNick& Nick, const CString& sNewNick, const std::vector<CChan*>& vChans) override;
-	virtual void OnKick(const CNick& OpNick, const CString& sKickedNick, CChan& Channel, const CString& sMessage) override;
-	virtual EModRet OnJoining(CChan& Channel) override;
-	virtual void OnJoin(const CNick& Nick, CChan& Channel) override;
-	virtual void OnPart(const CNick& Nick, CChan& Channel, const CString& sMessage) override;
-	virtual EModRet OnChanBufferStarting(CChan& Chan, CClient& Client) override;
-	virtual EModRet OnChanBufferEnding(CChan& Chan, CClient& Client) override;
-	virtual EModRet OnChanBufferPlayLine(CChan& Chan, CClient& Client, CString& sLine) override;
-	virtual EModRet OnPrivBufferPlayLine(CClient& Client, CString& sLine) override;
-	virtual void OnClientLogin() override;
-	virtual void OnClientDisconnect() override;
-	virtual EModRet OnUserRaw(CString& sLine) override;
-	virtual EModRet OnUserCTCPReply(CString& sTarget, CString& sMessage) override;
-	virtual EModRet OnUserCTCP(CString& sTarget, CString& sMessage) override;
-	virtual EModRet OnUserAction(CString& sTarget, CString& sMessage) override;
-	virtual EModRet OnUserMsg(CString& sTarget, CString& sMessage) override;
-	virtual EModRet OnUserNotice(CString& sTarget, CString& sMessage) override;
-	virtual EModRet OnUserJoin(CString& sChannel, CString& sKey) override;
-	virtual EModRet OnUserPart(CString& sChannel, CString& sMessage) override;
-	virtual EModRet OnUserTopic(CString& sChannel, CString& sTopic) override;
-	virtual EModRet OnUserTopicRequest(CString& sChannel) override;
-	virtual EModRet OnUserQuit(CString& sMessage) override;
-	virtual EModRet OnCTCPReply(CNick& Nick, CString& sMessage) override;
-	virtual EModRet OnPrivCTCP(CNick& Nick, CString& sMessage) override;
-	virtual EModRet OnChanCTCP(CNick& Nick, CChan& Channel, CString& sMessage) override;
-	virtual EModRet OnPrivAction(CNick& Nick, CString& sMessage) override;
-	virtual EModRet OnChanAction(CNick& Nick, CChan& Channel, CString& sMessage) override;
-	virtual EModRet OnPrivMsg(CNick& Nick, CString& sMessage) override;
-	virtual EModRet OnChanMsg(CNick& Nick, CChan& Channel, CString& sMessage) override;
-	virtual EModRet OnPrivNotice(CNick& Nick, CString& sMessage) override;
-	virtual EModRet OnChanNotice(CNick& Nick, CChan& Channel, CString& sMessage) override;
-	virtual EModRet OnTopic(CNick& Nick, CChan& Channel, CString& sTopic) override;
-	virtual bool OnServerCapAvailable(const CString& sCap) override;
-	virtual void OnServerCapResult(const CString& sCap, bool bSuccess) override;
-	virtual EModRet OnTimerAutoJoin(CChan& Channel) override;
-	virtual bool OnEmbeddedWebRequest(CWebSock&, const CString&, CTemplate&) override;
-	virtual EModRet OnAddNetwork(CIRCNetwork& Network, CString& sErrorRet) override;
-	virtual EModRet OnDeleteNetwork(CIRCNetwork& Network) override;
-	virtual EModRet OnSendToClient(CString& sLine, CClient& Client) override;
-	virtual EModRet OnSendToIRC(CString& sLine) override;
+	bool OnBoot() override;
+	bool WebRequiresLogin() override;
+	bool WebRequiresAdmin() override;
+	CString GetWebMenuTitle() override;
+	bool OnWebPreRequest(CWebSock& WebSock, const CString& sPageName) override;
+	bool OnWebRequest(CWebSock& WebSock, const CString& sPageName, CTemplate& Tmpl) override;
+	VWebSubPages& GetSubPages() override;
+	void OnPreRehash() override;
+	void OnPostRehash() override;
+	void OnIRCDisconnected() override;
+	void OnIRCConnected() override;
+	EModRet OnIRCConnecting(CIRCSock *pIRCSock) override;
+	void OnIRCConnectionError(CIRCSock *pIRCSock) override;
+	EModRet OnIRCRegistration(CString& sPass, CString& sNick, CString& sIdent, CString& sRealName) override;
+	EModRet OnBroadcast(CString& sMessage) override;
+	void OnChanPermission2(const CNick* pOpNick, const CNick& Nick, CChan& Channel, unsigned char uMode, bool bAdded, bool bNoChange) override;
+	void OnOp2(const CNick* pOpNick, const CNick& Nick, CChan& Channel, bool bNoChange) override;
+	void OnDeop2(const CNick* pOpNick, const CNick& Nick, CChan& Channel, bool bNoChange) override;
+	void OnVoice2(const CNick* pOpNick, const CNick& Nick, CChan& Channel, bool bNoChange) override;
+	void OnDevoice2(const CNick* pOpNick, const CNick& Nick, CChan& Channel, bool bNoChange) override;
+	void OnMode2(const CNick* pOpNick, CChan& Channel, char uMode, const CString& sArg, bool bAdded, bool bNoChange) override;
+	void OnRawMode2(const CNick* pOpNick, CChan& Channel, const CString& sModes, const CString& sArgs) override;
+	EModRet OnRaw(CString& sLine) override;
+	EModRet OnStatusCommand(CString& sCommand) override;
+	void OnModCommand(const CString& sCommand) override;
+	void OnModNotice(const CString& sMessage) override;
+	void OnModCTCP(const CString& sMessage) override;
+	void OnQuit(const CNick& Nick, const CString& sMessage, const std::vector<CChan*>& vChans) override;
+	void OnNick(const CNick& Nick, const CString& sNewNick, const std::vector<CChan*>& vChans) override;
+	void OnKick(const CNick& OpNick, const CString& sKickedNick, CChan& Channel, const CString& sMessage) override;
+	EModRet OnJoining(CChan& Channel) override;
+	void OnJoin(const CNick& Nick, CChan& Channel) override;
+	void OnPart(const CNick& Nick, CChan& Channel, const CString& sMessage) override;
+	EModRet OnChanBufferStarting(CChan& Chan, CClient& Client) override;
+	EModRet OnChanBufferEnding(CChan& Chan, CClient& Client) override;
+	EModRet OnChanBufferPlayLine(CChan& Chan, CClient& Client, CString& sLine) override;
+	EModRet OnPrivBufferPlayLine(CClient& Client, CString& sLine) override;
+	void OnClientLogin() override;
+	void OnClientDisconnect() override;
+	EModRet OnUserRaw(CString& sLine) override;
+	EModRet OnUserCTCPReply(CString& sTarget, CString& sMessage) override;
+	EModRet OnUserCTCP(CString& sTarget, CString& sMessage) override;
+	EModRet OnUserAction(CString& sTarget, CString& sMessage) override;
+	EModRet OnUserMsg(CString& sTarget, CString& sMessage) override;
+	EModRet OnUserNotice(CString& sTarget, CString& sMessage) override;
+	EModRet OnUserJoin(CString& sChannel, CString& sKey) override;
+	EModRet OnUserPart(CString& sChannel, CString& sMessage) override;
+	EModRet OnUserTopic(CString& sChannel, CString& sTopic) override;
+	EModRet OnUserTopicRequest(CString& sChannel) override;
+	EModRet OnUserQuit(CString& sMessage) override;
+	EModRet OnCTCPReply(CNick& Nick, CString& sMessage) override;
+	EModRet OnPrivCTCP(CNick& Nick, CString& sMessage) override;
+	EModRet OnChanCTCP(CNick& Nick, CChan& Channel, CString& sMessage) override;
+	EModRet OnPrivAction(CNick& Nick, CString& sMessage) override;
+	EModRet OnChanAction(CNick& Nick, CChan& Channel, CString& sMessage) override;
+	EModRet OnPrivMsg(CNick& Nick, CString& sMessage) override;
+	EModRet OnChanMsg(CNick& Nick, CChan& Channel, CString& sMessage) override;
+	EModRet OnPrivNotice(CNick& Nick, CString& sMessage) override;
+	EModRet OnChanNotice(CNick& Nick, CChan& Channel, CString& sMessage) override;
+	EModRet OnTopic(CNick& Nick, CChan& Channel, CString& sTopic) override;
+	bool OnServerCapAvailable(const CString& sCap) override;
+	void OnServerCapResult(const CString& sCap, bool bSuccess) override;
+	EModRet OnTimerAutoJoin(CChan& Channel) override;
+	bool OnEmbeddedWebRequest(CWebSock&, const CString&, CTemplate&) override;
+	EModRet OnAddNetwork(CIRCNetwork& Network, CString& sErrorRet) override;
+	EModRet OnDeleteNetwork(CIRCNetwork& Network) override;
+	EModRet OnSendToClient(CString& sLine, CClient& Client) override;
+	EModRet OnSendToIRC(CString& sLine) override;
 
 	// Global Modules
-	virtual EModRet OnAddUser(CUser& User, CString& sErrorRet) override;
-	virtual EModRet OnDeleteUser(CUser& User) override;
-	virtual void OnClientConnect(CZNCSock* pSock, const CString& sHost, unsigned short uPort) override;
-	virtual void OnFailedLogin(const CString& sUsername, const CString& sRemoteIP) override;
-	virtual EModRet OnUnknownUserRaw(CClient* pClient, CString& sLine) override;
-	virtual bool IsClientCapSupported(CClient* pClient, const CString& sCap, bool bState) override;
-	virtual void OnClientCapRequest(CClient* pClient, const CString& sCap, bool bState) override;
+	EModRet OnAddUser(CUser& User, CString& sErrorRet) override;
+	EModRet OnDeleteUser(CUser& User) override;
+	void OnClientConnect(CZNCSock* pSock, const CString& sHost, unsigned short uPort) override;
+	void OnFailedLogin(const CString& sUsername, const CString& sRemoteIP) override;
+	EModRet OnUnknownUserRaw(CClient* pClient, CString& sLine) override;
+	bool IsClientCapSupported(CClient* pClient, const CString& sCap, bool bState) override;
+	void OnClientCapRequest(CClient* pClient, const CString& sCap, bool bState) override;
 	virtual EModRet OnModuleLoading(const CString& sModName, const CString& sArgs,
 			CModInfo::EModuleType eType, bool& bSuccess, CString& sRetMsg) override;
-	virtual EModRet OnModuleUnloading(CModule* pModule, bool& bSuccess, CString& sRetMsg) override;
+	EModRet OnModuleUnloading(CModule* pModule, bool& bSuccess, CString& sRetMsg) override;
 	virtual EModRet OnGetModInfo(CModInfo& ModInfo, const CString& sModule,
 			bool& bSuccess, CString& sRetMsg) override;
-	virtual void OnGetAvailableMods(std::set<CModInfo>& ssMods, CModInfo::EModuleType eType) override;
-	virtual void OnClientCapLs(CClient* pClient, SCString& ssCaps) override;
-	virtual EModRet OnLoginAttempt(std::shared_ptr<CAuthBase> Auth) override;
+	void OnGetAvailableMods(std::set<CModInfo>& ssMods, CModInfo::EModuleType eType) override;
+	void OnClientCapLs(CClient* pClient, SCString& ssCaps) override;
+	EModRet OnLoginAttempt(std::shared_ptr<CAuthBase> Auth) override;
 };
 
 static inline CPyModule* AsPyModule(CModule* p) {
@@ -159,7 +159,7 @@ public:
 		pModule->AddTimer(this);
 		m_pModPython = pModule->GetModPython();
 	}
-	virtual void RunJob() override;
+	void RunJob() override;
 	PyObject* GetPyObj() { return m_pyObj; }
 	PyObject* GetNewPyObj() {
 		Py_INCREF(m_pyObj);
@@ -187,13 +187,13 @@ public:
 		return m_pyObj;
 	}
 	~CPySocket();
-	virtual void Connected() override;
-	virtual void Disconnected() override;
-	virtual void Timeout() override;
-	virtual void ConnectionRefused() override;
-	virtual void ReadData(const char *data, size_t len) override;
-	virtual void ReadLine(const CString& sLine) override;
-	virtual Csock* GetSockObj(const CString& sHost, unsigned short uPort) override;
+	void Connected() override;
+	void Disconnected() override;
+	void Timeout() override;
+	void ConnectionRefused() override;
+	void ReadData(const char *data, size_t len) override;
+	void ReadLine(const CString& sLine) override;
+	Csock* GetSockObj(const CString& sHost, unsigned short uPort) override;
 };
 
 inline CPySocket* CreatePySocket(CPyModule* pModule, PyObject* pyObj) {
diff --git a/modules/modtcl.cpp b/modules/modtcl.cpp
index 3c0ecbde..ebd72954 100644
--- a/modules/modtcl.cpp
+++ b/modules/modtcl.cpp
@@ -43,7 +43,7 @@ public:
 	CModTclTimer(CModule* pModule, unsigned int uInterval, unsigned int uCycles, const CString& sLabel, const CString& sDescription) : CTimer(pModule, uInterval, uCycles, sLabel, sDescription), m_pParent(NULL) {}
 	virtual ~CModTclTimer() {}
 protected:
-	virtual void RunJob() override;
+	void RunJob() override;
 	CModTcl* m_pParent;
 };
 
@@ -53,7 +53,7 @@ public:
 	CModTclStartTimer(CModule* pModule, unsigned int uInterval, unsigned int uCycles, const CString& sLabel, const CString& sDescription) : CTimer(pModule, uInterval, uCycles, sLabel, sDescription), m_pParent(NULL) {}
 	virtual ~CModTclStartTimer() {}
 protected:
-	virtual void RunJob() override;
+	void RunJob() override;
 	CModTcl* m_pParent;
 };
 
@@ -70,7 +70,7 @@ public:
 		}
 	}
 
-	virtual bool OnLoad(const CString& sArgs, CString& sErrorMsg) override {
+	bool OnLoad(const CString& sArgs, CString& sErrorMsg) override {
 #ifndef MOD_MODTCL_ALLOW_EVERYONE
 		if (!GetUser()->IsAdmin()) {
 			sErrorMsg = "You must be admin to use the modtcl module";
@@ -124,7 +124,7 @@ public:
 		AddTimer(new CModTclTimer(this, 1, 0, "ModTclUpdate", "Timer for modtcl to process pending events and idle callbacks."));
 	}
 
-	virtual void OnModCommand(const CString& sCommand) override {
+	void OnModCommand(const CString& sCommand) override {
 		CString sResult;
 		VCString vsResult;
 		CString sCmd = sCommand;
@@ -161,29 +161,29 @@ public:
 		return sLine;
 	}
 
-	virtual void OnPreRehash() override {
+	void OnPreRehash() override {
 		if (interp)
 			Tcl_Eval(interp,"Binds::ProcessEvnt prerehash");
 	}
 
-	virtual void OnPostRehash() override {
+	void OnPostRehash() override {
 		if (interp) {
 			Tcl_Eval(interp,"rehash");
 			Tcl_Eval(interp,"Binds::ProcessEvnt rehash");
 		}
 	}
 
-	virtual void OnIRCConnected() override {
+	void OnIRCConnected() override {
 		if (interp)
 			Tcl_Eval(interp, "Binds::ProcessEvnt init-server");
 	}
 
-	virtual void OnIRCDisconnected() override {
+	void OnIRCDisconnected() override {
 		if (interp)
 			Tcl_Eval(interp, "Binds::ProcessEvnt disconnect-server");
 	}
 
-	virtual EModRet OnChanMsg(CNick& Nick, CChan& Channel, CString& sMessage) override {
+	EModRet OnChanMsg(CNick& Nick, CChan& Channel, CString& sMessage) override {
 		CString sMes = TclEscape(sMessage);
 		CString sNick = TclEscape(CString(Nick.GetNick()));
 		CString sHost = TclEscape(CString(Nick.GetIdent() + "@" + Nick.GetHost()));
@@ -197,7 +197,7 @@ public:
 		return CONTINUE;
 	}
 
-	virtual EModRet OnPrivMsg(CNick& Nick, CString& sMessage) override {
+	EModRet OnPrivMsg(CNick& Nick, CString& sMessage) override {
 		CString sMes = TclEscape(sMessage);
 		CString sNick = TclEscape(CString(Nick.GetNick()));
 		CString sHost = TclEscape(CString(Nick.GetIdent() + "@" + Nick.GetHost()));
@@ -210,7 +210,7 @@ public:
 		return CONTINUE;
 	}
 
-	virtual void OnNick(const CNick& OldNick, const CString& sNewNick, const vector<CChan*>& vChans) override {
+	void OnNick(const CNick& OldNick, const CString& sNewNick, const vector<CChan*>& vChans) override {
 		CString sOldNick = TclEscape(CString(OldNick.GetNick()));
 		CString sNewNickTmp = TclEscape(sNewNick);
 		CString sHost = TclEscape(CString(OldNick.GetIdent() + "@" + OldNick.GetHost()));
@@ -227,7 +227,7 @@ public:
 		}
 	}
 
-	virtual void OnKick(const CNick& OpNick, const CString& sKickedNick, CChan& Channel, const CString& sMessage) override {
+	void OnKick(const CNick& OpNick, const CString& sKickedNick, CChan& Channel, const CString& sMessage) override {
 		CString sOpNick = TclEscape(CString(OpNick.GetNick()));
 		CString sNick = TclEscape(sKickedNick);
 		CString sOpHost = TclEscape(CString(OpNick.GetIdent() + "@" + OpNick.GetHost()));
diff --git a/modules/modules_online.cpp b/modules/modules_online.cpp
index 4865cdf5..199404b5 100644
--- a/modules/modules_online.cpp
+++ b/modules/modules_online.cpp
@@ -37,7 +37,7 @@ public:
 		return false;
 	}
 
-	virtual EModRet OnUserRaw(CString& sLine) override {
+	EModRet OnUserRaw(CString& sLine) override {
 		//Handle ISON
 		if (sLine.Token(0).Equals("ison")) {
 			VCString vsNicks;
@@ -83,7 +83,7 @@ public:
 		return CONTINUE;
 	}
 
-	virtual EModRet OnRaw(CString& sLine) override {
+	EModRet OnRaw(CString& sLine) override {
 		//Handle 303 reply if m_Requests is not empty
 		if (sLine.Token(1) == "303" && !m_ISONRequests.empty()) {
 			VCString::iterator it = m_ISONRequests.begin();
diff --git a/modules/nickserv.cpp b/modules/nickserv.cpp
index 0ed7b135..a7e9f978 100644
--- a/modules/nickserv.cpp
+++ b/modules/nickserv.cpp
@@ -77,7 +77,7 @@ public:
 
 	virtual ~CNickServ() {}
 
-	virtual bool OnLoad(const CString& sArgs, CString& sMessage) override {
+	bool OnLoad(const CString& sArgs, CString& sMessage) override {
 		if (!sArgs.empty() && sArgs != "<hidden>") {
 			SetNV("Password", sArgs);
 			SetArgs("<hidden>");
@@ -111,12 +111,12 @@ public:
 		}
 	}
 
-	virtual EModRet OnPrivMsg(CNick& Nick, CString& sMessage) override {
+	EModRet OnPrivMsg(CNick& Nick, CString& sMessage) override {
 		HandleMessage(Nick, sMessage);
 		return CONTINUE;
 	}
 
-	virtual EModRet OnPrivNotice(CNick& Nick, CString& sMessage) override {
+	EModRet OnPrivNotice(CNick& Nick, CString& sMessage) override {
 		HandleMessage(Nick, sMessage);
 		return CONTINUE;
 	}
diff --git a/modules/notes.cpp b/modules/notes.cpp
index b4a720c1..10c33ec8 100644
--- a/modules/notes.cpp
+++ b/modules/notes.cpp
@@ -84,20 +84,20 @@ public:
 
 	virtual ~CNotesMod() {}
 
-	virtual bool OnLoad(const CString& sArgs, CString& sMessage) override {
+	bool OnLoad(const CString& sArgs, CString& sMessage) override {
 		bShowNotesOnLogin = !sArgs.Equals("-disableNotesOnLogin");
 		return true;
 	}
 
-	virtual CString GetWebMenuTitle() override { return "Notes"; }
+	CString GetWebMenuTitle() override { return "Notes"; }
 
-	virtual void OnClientLogin() override {
+	void OnClientLogin() override {
 		if (bShowNotesOnLogin) {
 			ListNotes(true);
 		}
 	}
 
-	virtual EModRet OnUserRaw(CString& sLine) override {
+	EModRet OnUserRaw(CString& sLine) override {
 		if (sLine.Left(1) != "#") {
 			return CONTINUE;
 		}
@@ -188,7 +188,7 @@ public:
 		}
 	}
 
-	virtual bool OnWebRequest(CWebSock& WebSock, const CString& sPageName, CTemplate& Tmpl) override {
+	bool OnWebRequest(CWebSock& WebSock, const CString& sPageName, CTemplate& Tmpl) override {
 		if (sPageName == "index") {
 			for (MCString::iterator it = BeginNV(); it != EndNV(); ++it) {
 				CTemplate& Row = Tmpl.AddRow("NotesLoop");
diff --git a/modules/notify_connect.cpp b/modules/notify_connect.cpp
index af75be77..b9ece199 100644
--- a/modules/notify_connect.cpp
+++ b/modules/notify_connect.cpp
@@ -21,11 +21,11 @@ class CNotifyConnectMod : public CModule {
 public:
 	MODCONSTRUCTOR(CNotifyConnectMod) {}
 
-	virtual void OnClientLogin() override {
+	void OnClientLogin() override {
 		SendAdmins(GetUser()->GetUserName() + " attached (from " + GetClient()->GetRemoteIP() + ")");
 	}
 
-	virtual void OnClientDisconnect() override {
+	void OnClientDisconnect() override {
 		SendAdmins(GetUser()->GetUserName() + " detached (from " + GetClient()->GetRemoteIP() + ")");
 	}
 
diff --git a/modules/partyline.cpp b/modules/partyline.cpp
index 7eac1107..5ec57d08 100644
--- a/modules/partyline.cpp
+++ b/modules/partyline.cpp
@@ -102,14 +102,14 @@ public:
 		}
 	}
 
-	virtual bool OnBoot() override {
+	bool OnBoot() override {
 		// The config is now read completely, so all Users are set up
 		Load();
 
 		return true;
 	}
 
-	virtual bool OnLoad(const CString& sArgs, CString& sMessage) override {
+	bool OnLoad(const CString& sArgs, CString& sMessage) override {
 		const map<CString, CUser*>& msUsers = CZNC::Get().GetUserMap();
 
 		for (map<CString, CUser*>::const_iterator it = msUsers.begin(); it != msUsers.end(); ++it) {
@@ -175,7 +175,7 @@ public:
 			DelNV("topic:" + pChannel->GetName());
 	}
 
-	virtual EModRet OnDeleteUser(CUser& User) override {
+	EModRet OnDeleteUser(CUser& User) override {
 		// Loop through each chan
 		for (set<CPartylineChannel*>::iterator it = m_ssChannels.begin(); it != m_ssChannels.end();) {
 			CPartylineChannel *pChan = *it;
@@ -188,7 +188,7 @@ public:
 		return CONTINUE;
 	}
 
-	virtual EModRet OnRaw(CString& sLine) override {
+	EModRet OnRaw(CString& sLine) override {
 		if (sLine.Token(1) == "005") {
 			CString::size_type uPos = sLine.AsUpper().find("CHANTYPES=");
 			if (uPos != CString::npos) {
@@ -205,11 +205,11 @@ public:
 		return CONTINUE;
 	}
 
-	virtual void OnIRCDisconnected() override {
+	void OnIRCDisconnected() override {
 		m_spInjectedPrefixes.erase(GetNetwork());
 	}
 
-	virtual void OnClientLogin() override {
+	void OnClientLogin() override {
 		CUser* pUser = GetUser();
 		CClient* pClient = GetClient();
 		CIRCNetwork* pNetwork = GetNetwork();
@@ -254,7 +254,7 @@ public:
 		}
 	}
 
-	virtual void OnClientDisconnect() override {
+	void OnClientDisconnect() override {
 		CUser* pUser = GetUser();
 		if (!pUser->IsUserAttached() && !pUser->IsBeingDeleted()) {
 			for (set<CPartylineChannel*>::iterator it = m_ssChannels.begin(); it != m_ssChannels.end(); ++it) {
@@ -267,7 +267,7 @@ public:
 		}
 	}
 
-	virtual EModRet OnUserRaw(CString& sLine) override {
+	EModRet OnUserRaw(CString& sLine) override {
 		if (sLine.StartsWith("WHO " CHAN_PREFIX_1)) {
 			return HALT;
 		} else if (sLine.StartsWith("MODE " CHAN_PREFIX_1)) {
@@ -310,7 +310,7 @@ public:
 		return CONTINUE;
 	}
 
-	virtual EModRet OnUserPart(CString& sChannel, CString& sMessage) override {
+	EModRet OnUserPart(CString& sChannel, CString& sMessage) override {
 		if (sChannel.Left(1) != CHAN_PREFIX_1) {
 			return CONTINUE;
 		}
@@ -385,7 +385,7 @@ public:
 		}
 	}
 
-	virtual EModRet OnUserJoin(CString& sChannel, CString& sKey) override {
+	EModRet OnUserJoin(CString& sChannel, CString& sKey) override {
 		if (sChannel.Left(1) != CHAN_PREFIX_1) {
 			return CONTINUE;
 		}
@@ -495,23 +495,23 @@ public:
 		return HALT;
 	}
 
-	virtual EModRet OnUserMsg(CString& sTarget, CString& sMessage) override {
+	EModRet OnUserMsg(CString& sTarget, CString& sMessage) override {
 		return HandleMessage("PRIVMSG", sTarget, sMessage);
 	}
 
-	virtual EModRet OnUserNotice(CString& sTarget, CString& sMessage) override {
+	EModRet OnUserNotice(CString& sTarget, CString& sMessage) override {
 		return HandleMessage("NOTICE", sTarget, sMessage);
 	}
 
-	virtual EModRet OnUserAction(CString& sTarget, CString& sMessage) override {
+	EModRet OnUserAction(CString& sTarget, CString& sMessage) override {
 		return HandleMessage("PRIVMSG", sTarget, "\001ACTION " + sMessage + "\001");
 	}
 
-	virtual EModRet OnUserCTCP(CString& sTarget, CString& sMessage) override {
+	EModRet OnUserCTCP(CString& sTarget, CString& sMessage) override {
 		return HandleMessage("PRIVMSG", sTarget, "\001" + sMessage + "\001");
 	}
 
-	virtual EModRet OnUserCTCPReply(CString& sTarget, CString& sMessage) override {
+	EModRet OnUserCTCPReply(CString& sTarget, CString& sMessage) override {
 		return HandleMessage("NOTICE", sTarget, "\001" + sMessage + "\001");
 	}
 
diff --git a/modules/perform.cpp b/modules/perform.cpp
index fbf7cbaa..0a0cfc90 100644
--- a/modules/perform.cpp
+++ b/modules/perform.cpp
@@ -121,21 +121,21 @@ public:
 		return sPerf;
 	}
 
-	virtual bool OnLoad(const CString& sArgs, CString& sMessage) override {
+	bool OnLoad(const CString& sArgs, CString& sMessage) override {
 		GetNV("Perform").Split("\n", m_vPerform, false);
 
 		return true;
 	}
 
-	virtual void OnIRCConnected() override {
+	void OnIRCConnected() override {
 		for (VCString::const_iterator it = m_vPerform.begin(); it != m_vPerform.end(); ++it) {
 			PutIRC(ExpandString(*it));
 		}
 	}
 
-	virtual CString GetWebMenuTitle() override { return "Perform"; }
+	CString GetWebMenuTitle() override { return "Perform"; }
 
-	virtual bool OnWebRequest(CWebSock& WebSock, const CString& sPageName, CTemplate& Tmpl) override {
+	bool OnWebRequest(CWebSock& WebSock, const CString& sPageName, CTemplate& Tmpl) override {
 		if (sPageName != "index") {
 			// only accept requests to index
 			return false;
diff --git a/modules/q.cpp b/modules/q.cpp
index a64e756b..edb16dca 100644
--- a/modules/q.cpp
+++ b/modules/q.cpp
@@ -30,7 +30,7 @@ public:
 	MODCONSTRUCTOR(CQModule) {}
 	virtual ~CQModule() {}
 
-	virtual bool OnLoad(const CString& sArgs, CString& sMessage) override {
+	bool OnLoad(const CString& sArgs, CString& sMessage) override {
 		if (!sArgs.empty()) {
 			SetUsername(sArgs.Token(0));
 			SetPassword(sArgs.Token(1));
@@ -82,7 +82,7 @@ public:
 		return true;
 	}
 
-	virtual void OnIRCDisconnected() override {
+	void OnIRCDisconnected() override {
 		m_bCloaked = false;
 		m_bAuthed  = false;
 		m_bRequestedWhoami    = false;
@@ -90,13 +90,13 @@ public:
 		m_bCatchResponse = false;
 	}
 
-	virtual void OnIRCConnected() override {
+	void OnIRCConnected() override {
 		if (m_bUseCloakedHost)
 			Cloak();
 		WhoAmI();
 	}
 
-	virtual void OnModCommand(const CString& sLine) override {
+	void OnModCommand(const CString& sLine) override {
 		CString sCommand = sLine.Token(0).AsLower();
 
 		if (sCommand == "help") {
@@ -252,7 +252,7 @@ public:
 		}
 	}
 
-	virtual EModRet OnRaw(CString& sLine) override {
+	EModRet OnRaw(CString& sLine) override {
 		// use OnRaw because OnUserMode is not defined (yet?)
 		if (sLine.Token(1) == "396" && sLine.Token(3).find("users.quakenet.org") != CString::npos) {
 			m_bCloaked = true;
@@ -267,15 +267,15 @@ public:
 		return CONTINUE;
 	}
 
-	virtual EModRet OnPrivMsg(CNick& Nick, CString& sMessage) override {
+	EModRet OnPrivMsg(CNick& Nick, CString& sMessage) override {
 		return HandleMessage(Nick, sMessage);
 	}
 
-	virtual EModRet OnPrivNotice(CNick& Nick, CString& sMessage) override {
+	EModRet OnPrivNotice(CNick& Nick, CString& sMessage) override {
 		return HandleMessage(Nick, sMessage);
 	}
 
-	virtual EModRet OnJoining(CChan& Channel) override {
+	EModRet OnJoining(CChan& Channel) override {
 		// Halt if are not already cloaked, but the user requres that we delay
 		// channel join till after we are cloaked.
 		if (!m_bCloaked && m_bUseCloakedHost && m_bJoinAfterCloaked)
@@ -284,22 +284,22 @@ public:
 		return CONTINUE;
 	}
 
-	virtual void OnJoin(const CNick& Nick, CChan& Channel) override {
+	void OnJoin(const CNick& Nick, CChan& Channel) override {
 		if (m_bRequestPerms && IsSelf(Nick))
 			HandleNeed(Channel, "ov");
 	}
 
-	virtual void OnDeop2(const CNick* pOpNick, const CNick& Nick, CChan& Channel, bool bNoChange) override {
+	void OnDeop2(const CNick* pOpNick, const CNick& Nick, CChan& Channel, bool bNoChange) override {
 		if (m_bRequestPerms && IsSelf(Nick) && (!pOpNick || !IsSelf(*pOpNick)))
 			HandleNeed(Channel, "o");
 	}
 
-	virtual void OnDevoice2(const CNick* pOpNick, const CNick& Nick, CChan& Channel, bool bNoChange) override {
+	void OnDevoice2(const CNick* pOpNick, const CNick& Nick, CChan& Channel, bool bNoChange) override {
 		if (m_bRequestPerms && IsSelf(Nick) && (!pOpNick || !IsSelf(*pOpNick)))
 			HandleNeed(Channel, "v");
 	}
 
-	virtual EModRet OnInvite(const CNick& Nick, const CString& sChan) override {
+	EModRet OnInvite(const CNick& Nick, const CString& sChan) override {
 		if (!Nick.NickEquals("Q") || !Nick.GetHost().Equals("CServe.quakenet.org"))
 			return CONTINUE;
 		if (m_bJoinOnInvite)
@@ -307,9 +307,9 @@ public:
 		return CONTINUE;
 	}
 
-	virtual CString GetWebMenuTitle() override { return "Q"; }
+	CString GetWebMenuTitle() override { return "Q"; }
 
-	virtual bool OnWebRequest(CWebSock& WebSock, const CString& sPageName, CTemplate& Tmpl) override {
+	bool OnWebRequest(CWebSock& WebSock, const CString& sPageName, CTemplate& Tmpl) override {
 		if (sPageName == "index") {
 			bool bSubmitted = (WebSock.GetParam("submitted").ToInt() != 0);
 
diff --git a/modules/raw.cpp b/modules/raw.cpp
index 9ebb3ca6..0b5fdc06 100644
--- a/modules/raw.cpp
+++ b/modules/raw.cpp
@@ -21,16 +21,16 @@ public:
 	MODCONSTRUCTOR(CRawMod) {}
 	virtual ~CRawMod() {}
 
-	virtual EModRet OnRaw(CString& sLine) override {
+	EModRet OnRaw(CString& sLine) override {
 		PutModule("IRC -> [" + sLine + "]");
 		return CONTINUE;
 	}
 
-	virtual void OnModCommand(const CString& sCommand) override {
+	void OnModCommand(const CString& sCommand) override {
 		PutIRC(sCommand);
 	}
 
-	virtual EModRet OnUserRaw(CString& sLine) override {
+	EModRet OnUserRaw(CString& sLine) override {
 		PutModule("YOU -> [" + sLine + "]");
 		return CONTINUE;
 	}
diff --git a/modules/route_replies.cpp b/modules/route_replies.cpp
index 6d44a67b..45a883c6 100644
--- a/modules/route_replies.cpp
+++ b/modules/route_replies.cpp
@@ -198,7 +198,7 @@ public:
 	virtual ~CRouteTimeout() {}
 
 protected:
-	virtual void RunJob() override;
+	void RunJob() override;
 };
 
 struct queued_req {
@@ -236,7 +236,7 @@ public:
 		}
 	}
 
-	virtual void OnIRCConnected() override
+	void OnIRCConnected() override
 	{
 		m_pDoing = NULL;
 		m_pReplies = NULL;
@@ -246,12 +246,12 @@ public:
 		RemTimer("RouteTimeout");
 	}
 
-	virtual void OnIRCDisconnected() override
+	void OnIRCDisconnected() override
 	{
 		OnIRCConnected(); // Let's keep it in one place
 	}
 
-	virtual void OnClientDisconnect() override
+	void OnClientDisconnect() override
 	{
 		requestQueue::iterator it;
 
@@ -271,7 +271,7 @@ public:
 		SendRequest();
 	}
 
-	virtual EModRet OnRaw(CString& sLine) override
+	EModRet OnRaw(CString& sLine) override
 	{
 		CString sCmd = sLine.Token(1).AsUpper();
 		size_t i = 0;
@@ -307,7 +307,7 @@ public:
 		return CONTINUE;
 	}
 
-	virtual EModRet OnUserRaw(CString& sLine) override
+	EModRet OnUserRaw(CString& sLine) override
 	{
 		CString sCmd = sLine.Token(0).AsUpper();
 
diff --git a/modules/sample.cpp b/modules/sample.cpp
index 9b50aebb..2d47602b 100644
--- a/modules/sample.cpp
+++ b/modules/sample.cpp
@@ -33,7 +33,7 @@ public:
 		}
 	}
 
-	virtual void runThread() override {
+	void runThread() override {
 		// Cannot safely use GetModule() in here, because this runs in its
 		// own thread and such an access would require synchronisation
 		// between this thread and the main thread!
@@ -46,7 +46,7 @@ public:
 		}
 	}
 
-	virtual void runMain() override {
+	void runMain() override {
 		GetModule()->PutModule("Sample job done");
 	}
 };
@@ -60,7 +60,7 @@ public:
 
 private:
 protected:
-	virtual void RunJob() override {
+	void RunJob() override {
 		GetModule()->PutModule("TEST!!!!");
 	}
 };
@@ -69,7 +69,7 @@ class CSampleMod : public CModule {
 public:
 	MODCONSTRUCTOR(CSampleMod) {}
 
-	virtual bool OnLoad(const CString& sArgs, CString& sMessage) override {
+	bool OnLoad(const CString& sArgs, CString& sMessage) override {
 		PutModule("I'm being loaded with the arguments: [" + sArgs + "]");
 		//AddTimer(new CSampleTimer(this, 300, 0, "Sample", "Sample timer for sample things."));
 		//AddTimer(new CSampleTimer(this, 5, 20, "Another", "Another sample timer."));
@@ -84,86 +84,86 @@ public:
 		PutModule("I'm being unloaded!");
 	}
 
-	virtual bool OnBoot() override {
+	bool OnBoot() override {
 		// This is called when the app starts up (only modules that are loaded in the config will get this event)
 		return true;
 	}
 
-	virtual void OnIRCConnected() override {
+	void OnIRCConnected() override {
 		PutModule("You got connected BoyOh.");
 	}
 
-	virtual void OnIRCDisconnected() override {
+	void OnIRCDisconnected() override {
 		PutModule("You got disconnected BoyOh.");
 	}
 
-	virtual EModRet OnIRCRegistration(CString& sPass, CString& sNick, CString& sIdent, CString& sRealName) override {
+	EModRet OnIRCRegistration(CString& sPass, CString& sNick, CString& sIdent, CString& sRealName) override {
 		sRealName += " - ZNC";
 		return CONTINUE;
 	}
 
-	virtual EModRet OnBroadcast(CString& sMessage) override {
+	EModRet OnBroadcast(CString& sMessage) override {
 		PutModule("------ [" + sMessage + "]");
 		sMessage = "======== [" + sMessage + "] ========";
 		return CONTINUE;
 	}
 
-	virtual void OnChanPermission(const CNick& OpNick, const CNick& Nick, CChan& Channel, unsigned char uMode, bool bAdded, bool bNoChange) override {
+	void OnChanPermission(const CNick& OpNick, const CNick& Nick, CChan& Channel, unsigned char uMode, bool bAdded, bool bNoChange) override {
 		PutModule(((bNoChange) ? "[0] [" : "[1] [") + OpNick.GetNick() + "] set mode [" + Channel.GetName() + ((bAdded) ? "] +" : "] -") + CString(uMode) + " " + Nick.GetNick());
 	}
 
-	virtual void OnOp(const CNick& OpNick, const CNick& Nick, CChan& Channel, bool bNoChange) override {
+	void OnOp(const CNick& OpNick, const CNick& Nick, CChan& Channel, bool bNoChange) override {
 		PutModule(((bNoChange) ? "[0] [" : "[1] [") + OpNick.GetNick() + "] opped [" + Nick.GetNick() + "] on [" + Channel.GetName() + "]");
 	}
 
-	virtual void OnDeop(const CNick& OpNick, const CNick& Nick, CChan& Channel, bool bNoChange) override {
+	void OnDeop(const CNick& OpNick, const CNick& Nick, CChan& Channel, bool bNoChange) override {
 		PutModule(((bNoChange) ? "[0] [" : "[1] [") + OpNick.GetNick() + "] deopped [" + Nick.GetNick() + "] on [" + Channel.GetName() + "]");
 	}
 
-	virtual void OnVoice(const CNick& OpNick, const CNick& Nick, CChan& Channel, bool bNoChange) override {
+	void OnVoice(const CNick& OpNick, const CNick& Nick, CChan& Channel, bool bNoChange) override {
 		PutModule(((bNoChange) ? "[0] [" : "[1] [") + OpNick.GetNick() + "] voiced [" + Nick.GetNick() + "] on [" + Channel.GetName() + "]");
 	}
 
-	virtual void OnDevoice(const CNick& OpNick, const CNick& Nick, CChan& Channel, bool bNoChange) override {
+	void OnDevoice(const CNick& OpNick, const CNick& Nick, CChan& Channel, bool bNoChange) override {
 		PutModule(((bNoChange) ? "[0] [" : "[1] [") + OpNick.GetNick() + "] devoiced [" + Nick.GetNick() + "] on [" + Channel.GetName() + "]");
 	}
 
-	virtual void OnRawMode(const CNick& OpNick, CChan& Channel, const CString& sModes, const CString& sArgs) override {
+	void OnRawMode(const CNick& OpNick, CChan& Channel, const CString& sModes, const CString& sArgs) override {
 		PutModule("* " + OpNick.GetNick() + " sets mode: " + sModes + " " + sArgs + " (" + Channel.GetName() + ")");
 	}
 
-	virtual EModRet OnRaw(CString& sLine) override {
+	EModRet OnRaw(CString& sLine) override {
 		// PutModule("OnRaw() [" + sLine + "]");
 		return CONTINUE;
 	}
 
-	virtual EModRet OnUserRaw(CString& sLine) override {
+	EModRet OnUserRaw(CString& sLine) override {
 		// PutModule("UserRaw() [" + sLine + "]");
 		return CONTINUE;
 	}
 
-	virtual void OnKick(const CNick& OpNick, const CString& sKickedNick, CChan& Channel, const CString& sMessage) override {
+	void OnKick(const CNick& OpNick, const CString& sKickedNick, CChan& Channel, const CString& sMessage) override {
 		PutModule("[" + OpNick.GetNick() + "] kicked [" + sKickedNick + "] from [" + Channel.GetName() + "] with the msg [" + sMessage + "]");
 	}
 
-	virtual void OnQuit(const CNick& Nick, const CString& sMessage, const vector<CChan*>& vChans) override {
+	void OnQuit(const CNick& Nick, const CString& sMessage, const vector<CChan*>& vChans) override {
 		PutModule("* Quits: " + Nick.GetNick() + " (" + Nick.GetIdent() + "!" + Nick.GetHost() + ") (" + sMessage + ")");
 	}
 
-	virtual EModRet OnTimerAutoJoin(CChan& Channel) override {
+	EModRet OnTimerAutoJoin(CChan& Channel) override {
 		PutModule("Attempting to join " + Channel.GetName());
 		return CONTINUE;
 	}
 
-	virtual void OnJoin(const CNick& Nick, CChan& Channel) override {
+	void OnJoin(const CNick& Nick, CChan& Channel) override {
 		PutModule("* Joins: " + Nick.GetNick() + " (" + Nick.GetIdent() + "!" + Nick.GetHost() + ")");
 	}
 
-	virtual void OnPart(const CNick& Nick, CChan& Channel, const CString& sMessage) override {
+	void OnPart(const CNick& Nick, CChan& Channel, const CString& sMessage) override {
 		PutModule("* Parts: " + Nick.GetNick() + " (" + Nick.GetIdent() + "!" + Nick.GetHost() + ")");
 	}
 
-	virtual EModRet OnInvite(const CNick& Nick, const CString& sChan) override {
+	EModRet OnInvite(const CNick& Nick, const CString& sChan) override {
 		if (sChan.Equals("#test")) {
 			PutModule(Nick.GetNick() + " invited us to " + sChan + ", ignoring invites to " + sChan);
 			return HALT;
@@ -173,91 +173,91 @@ public:
 		return CONTINUE;
 	}
 
-	virtual void OnNick(const CNick& OldNick, const CString& sNewNick, const vector<CChan*>& vChans) override {
+	void OnNick(const CNick& OldNick, const CString& sNewNick, const vector<CChan*>& vChans) override {
 		PutModule("* " + OldNick.GetNick() + " is now known as " + sNewNick);
 	}
 
-	virtual EModRet OnUserCTCPReply(CString& sTarget, CString& sMessage) override {
+	EModRet OnUserCTCPReply(CString& sTarget, CString& sMessage) override {
 		PutModule("[" + sTarget + "] userctcpreply [" + sMessage + "]");
 		sMessage = "\037" + sMessage + "\037";
 
 		return CONTINUE;
 	}
 
-	virtual EModRet OnCTCPReply(CNick& Nick, CString& sMessage) override {
+	EModRet OnCTCPReply(CNick& Nick, CString& sMessage) override {
 		PutModule("[" + Nick.GetNick() + "] ctcpreply [" + sMessage + "]");
 
 		return CONTINUE;
 	}
 
-	virtual EModRet OnUserCTCP(CString& sTarget, CString& sMessage) override {
+	EModRet OnUserCTCP(CString& sTarget, CString& sMessage) override {
 		PutModule("[" + sTarget + "] userctcp [" + sMessage + "]");
 
 		return CONTINUE;
 	}
 
-	virtual EModRet OnPrivCTCP(CNick& Nick, CString& sMessage) override {
+	EModRet OnPrivCTCP(CNick& Nick, CString& sMessage) override {
 		PutModule("[" + Nick.GetNick() + "] privctcp [" + sMessage + "]");
 		sMessage = "\002" + sMessage + "\002";
 
 		return CONTINUE;
 	}
 
-	virtual EModRet OnChanCTCP(CNick& Nick, CChan& Channel, CString& sMessage) override {
+	EModRet OnChanCTCP(CNick& Nick, CChan& Channel, CString& sMessage) override {
 		PutModule("[" + Nick.GetNick() + "] chanctcp [" + sMessage + "] to [" + Channel.GetName() + "]");
 		sMessage = "\00311,5 " + sMessage + " \003";
 
 		return CONTINUE;
 	}
 
-	virtual EModRet OnUserNotice(CString& sTarget, CString& sMessage) override {
+	EModRet OnUserNotice(CString& sTarget, CString& sMessage) override {
 		PutModule("[" + sTarget + "] usernotice [" + sMessage + "]");
 		sMessage = "\037" + sMessage + "\037";
 
 		return CONTINUE;
 	}
 
-	virtual EModRet OnPrivNotice(CNick& Nick, CString& sMessage) override {
+	EModRet OnPrivNotice(CNick& Nick, CString& sMessage) override {
 		PutModule("[" + Nick.GetNick() + "] privnotice [" + sMessage + "]");
 		sMessage = "\002" + sMessage + "\002";
 
 		return CONTINUE;
 	}
 
-	virtual EModRet OnChanNotice(CNick& Nick, CChan& Channel, CString& sMessage) override {
+	EModRet OnChanNotice(CNick& Nick, CChan& Channel, CString& sMessage) override {
 		PutModule("[" + Nick.GetNick() + "] channotice [" + sMessage + "] to [" + Channel.GetName() + "]");
 		sMessage = "\00311,5 " + sMessage + " \003";
 
 		return CONTINUE;
 	}
 
-	virtual EModRet OnTopic(CNick& Nick, CChan& Channel, CString& sTopic) override {
+	EModRet OnTopic(CNick& Nick, CChan& Channel, CString& sTopic) override {
 		PutModule("* " + Nick.GetNick() + " changes topic on " + Channel.GetName() + " to '" + sTopic + "'");
 
 		return CONTINUE;
 	}
 
-	virtual EModRet OnUserTopic(CString& sTarget, CString& sTopic) override {
+	EModRet OnUserTopic(CString& sTarget, CString& sTopic) override {
 		PutModule("* " + GetClient()->GetNick() + " changed topic on " + sTarget + " to '" + sTopic + "'");
 
 		return CONTINUE;
 	}
 
-	virtual EModRet OnUserMsg(CString& sTarget, CString& sMessage) override {
+	EModRet OnUserMsg(CString& sTarget, CString& sMessage) override {
 		PutModule("[" + sTarget + "] usermsg [" + sMessage + "]");
 		sMessage = "Sample: \0034" + sMessage + "\003";
 
 		return CONTINUE;
 	}
 
-	virtual EModRet OnPrivMsg(CNick& Nick, CString& sMessage) override {
+	EModRet OnPrivMsg(CNick& Nick, CString& sMessage) override {
 		PutModule("[" + Nick.GetNick() + "] privmsg [" + sMessage + "]");
 		sMessage = "\002" + sMessage + "\002";
 
 		return CONTINUE;
 	}
 
-	virtual EModRet OnChanMsg(CNick& Nick, CChan& Channel, CString& sMessage) override {
+	EModRet OnChanMsg(CNick& Nick, CChan& Channel, CString& sMessage) override {
 		if (sMessage == "!ping") {
 			PutIRC("PRIVMSG " + Channel.GetName() + " :PONG?");
 		}
@@ -269,13 +269,13 @@ public:
 		return CONTINUE;
 	}
 
-	virtual void OnModCommand(const CString& sCommand) override {
+	void OnModCommand(const CString& sCommand) override {
 		if (sCommand.Equals("TIMERS")) {
 			ListTimers();
 		}
 	}
 
-	virtual EModRet OnStatusCommand(CString& sCommand) override {
+	EModRet OnStatusCommand(CString& sCommand) override {
 		if (sCommand.Equals("SAMPLE")) {
 			PutModule("Hi, I'm your friendly sample module.");
 			return HALT;
diff --git a/modules/sasl.cpp b/modules/sasl.cpp
index b068a42f..6e331df2 100644
--- a/modules/sasl.cpp
+++ b/modules/sasl.cpp
@@ -188,11 +188,11 @@ public:
 		}
 	}
 
-	virtual bool OnServerCapAvailable(const CString& sCap) override {
+	bool OnServerCapAvailable(const CString& sCap) override {
 		return sCap.Equals("sasl");
 	}
 
-	virtual void OnServerCapResult(const CString& sCap, bool bSuccess) override {
+	void OnServerCapResult(const CString& sCap, bool bSuccess) override {
 		if (sCap.Equals("sasl")) {
 			if (bSuccess) {
 				GetMechanismsString().Split(" ", m_Mechanisms);
@@ -212,7 +212,7 @@ public:
 		}
 	}
 
-	virtual EModRet OnRaw(CString &sLine) override {
+	EModRet OnRaw(CString &sLine) override {
 		if (sLine.Token(0).Equals("AUTHENTICATE")) {
 			Authenticate(sLine.Token(1, true));
 		} else if (sLine.Token(1).Equals("903")) {
@@ -246,14 +246,14 @@ public:
 		return HALT;
 	}
 
-	virtual void OnIRCConnected() override {
+	void OnIRCConnected() override {
 		/* Just incase something slipped through, perhaps the server doesn't
 		 * respond to our CAP negotiation. */
 
 		CheckRequireAuth();
 	}
 
-	virtual void OnIRCDisconnected() override {
+	void OnIRCDisconnected() override {
 		m_bAuthenticated = false;
 	}
 private:
diff --git a/modules/savebuff.cpp b/modules/savebuff.cpp
index af20a0af..c2bd3f4e 100644
--- a/modules/savebuff.cpp
+++ b/modules/savebuff.cpp
@@ -52,7 +52,7 @@ public:
 	virtual ~CSaveBuffJob() {}
 
 protected:
-	virtual void RunJob() override;
+	void RunJob() override;
 };
 
 class CSaveBuff : public CModule
@@ -75,7 +75,7 @@ public:
 		}
 	}
 
-	virtual bool OnLoad(const CString& sArgs, CString& sMessage) override
+	bool OnLoad(const CString& sArgs, CString& sMessage) override
 	{
 		if( sArgs == CRYPT_ASK_PASS )
 		{
@@ -98,7 +98,7 @@ public:
 		return( !m_bBootError );
 	}
 
-	virtual bool OnBoot() override
+	bool OnBoot() override
 	{
 		CDir saveDir(GetSavePath());
 		for (CFile* pFile : saveDir) {
@@ -335,11 +335,11 @@ public:
 		chan.AddBuffer(sLine);
 	}
 
-	virtual void OnRawMode(const CNick& cOpNick, CChan& cChannel, const CString& sModes, const CString& sArgs) override
+	void OnRawMode(const CNick& cOpNick, CChan& cChannel, const CString& sModes, const CString& sArgs) override
 	{
 		AddBuffer(cChannel, SpoofChanMsg(cChannel.GetName(), cOpNick.GetNickMask() + " MODE " + sModes + " " + sArgs));
 	}
-	virtual void OnQuit(const CNick& cNick, const CString& sMessage, const vector<CChan*>& vChans) override
+	void OnQuit(const CNick& cNick, const CString& sMessage, const vector<CChan*>& vChans) override
 	{
 		for (size_t a = 0; a < vChans.size(); a++)
 		{
@@ -349,18 +349,18 @@ public:
 			SaveBuffersToDisk(); // need to force a save here to see this!
 	}
 
-	virtual void OnNick(const CNick& cNick, const CString& sNewNick, const vector<CChan*>& vChans) override
+	void OnNick(const CNick& cNick, const CString& sNewNick, const vector<CChan*>& vChans) override
 	{
 		for (size_t a = 0; a < vChans.size(); a++)
 		{
 			AddBuffer(*vChans[a], SpoofChanMsg(vChans[a]->GetName(), cNick.GetNickMask() + " NICK " + sNewNick));
 		}
 	}
-	virtual void OnKick(const CNick& cNick, const CString& sOpNick, CChan& cChannel, const CString& sMessage) override
+	void OnKick(const CNick& cNick, const CString& sOpNick, CChan& cChannel, const CString& sMessage) override
 	{
 		AddBuffer(cChannel, SpoofChanMsg(cChannel.GetName(), sOpNick + " KICK " + cNick.GetNickMask() + " " + sMessage));
 	}
-	virtual void OnJoin(const CNick& cNick, CChan& cChannel) override
+	void OnJoin(const CNick& cNick, CChan& cChannel) override
 	{
 		if (cNick.NickEquals(GetUser()->GetNick()) && cChannel.GetBuffer().empty())
 		{
@@ -370,7 +370,7 @@ public:
 		}
 		AddBuffer(cChannel, SpoofChanMsg(cChannel.GetName(), cNick.GetNickMask() + " JOIN"));
 	}
-	virtual void OnPart(const CNick& cNick, CChan& cChannel) override
+	void OnPart(const CNick& cNick, CChan& cChannel) override
 	{
 		AddBuffer(cChannel, SpoofChanMsg(cChannel.GetName(), cNick.GetNickMask() + " PART"));
 		if (cNick.NickEquals(GetUser()->GetNick()))
diff --git a/modules/schat.cpp b/modules/schat.cpp
index 1a04c147..e56a83cc 100644
--- a/modules/schat.cpp
+++ b/modules/schat.cpp
@@ -47,7 +47,7 @@ public:
 	}
 
 protected:
-	virtual void RunJob() override;
+	void RunJob() override;
 	CString m_sNick;
 };
 
@@ -59,27 +59,27 @@ public:
 			u_short iPort, int iTimeout = 60);
 	~CSChatSock() {}
 
-	virtual Csock *GetSockObj(const CS_STRING & sHostname, u_short iPort) override
+	Csock *GetSockObj(const CS_STRING & sHostname, u_short iPort) override
 	{
 		CSChatSock *p = new CSChatSock(m_pModule, m_sChatNick, sHostname, iPort);
 		return(p);
 	}
 
-	virtual bool ConnectionFrom(const CS_STRING & sHost, u_short iPort) override
+	bool ConnectionFrom(const CS_STRING & sHost, u_short iPort) override
 	{
 		Close(); // close the listener after the first connection
 		return(true);
 	}
 
-	virtual void Connected() override;
-	virtual void Timeout() override;
+	void Connected() override;
+	void Timeout() override;
 
 	const CString & GetChatNick() const { return(m_sChatNick); }
 
 	void PutQuery(const CString& sText);
 
-	virtual void ReadLine(const CS_STRING & sLine) override;
-	virtual void Disconnected() override;
+	void ReadLine(const CS_STRING & sLine) override;
+	void Disconnected() override;
 
 	void AddLine(const CString & sLine)
 	{
@@ -116,7 +116,7 @@ public:
 	MODCONSTRUCTOR(CSChat) {}
 	virtual ~CSChat() {}
 
-	virtual bool OnLoad(const CString & sArgs, CString & sMessage) override
+	bool OnLoad(const CString & sArgs, CString & sMessage) override
 	{
 		m_sPemFile = sArgs;
 
@@ -132,7 +132,7 @@ public:
 		return true;
 	}
 
-	virtual void OnClientLogin() override
+	void OnClientLogin() override
 	{
 		set<CSocket*>::const_iterator it;
 		for (it = BeginSockets(); it != EndSockets(); ++it) {
@@ -145,7 +145,7 @@ public:
 		}
 	}
 
-	virtual EModRet OnUserRaw(CString & sLine) override
+	EModRet OnUserRaw(CString & sLine) override
 	{
 		if (sLine.StartsWith("schat ")) {
 			OnModCommand("chat " + sLine.substr(6));
@@ -160,7 +160,7 @@ public:
 		return(CONTINUE);
 	}
 
-	virtual void OnModCommand(const CString& sCommand) override
+	void OnModCommand(const CString& sCommand) override
 	{
 		CString sCom = sCommand.Token(0);
 		CString sArgs = sCommand.Token(1, true);
@@ -319,7 +319,7 @@ public:
 			PutModule("Unknown command [" + sCom + "] [" + sArgs + "]");
 	}
 
-	virtual EModRet OnPrivCTCP(CNick& Nick, CString& sMessage) override
+	EModRet OnPrivCTCP(CNick& Nick, CString& sMessage) override
 	{
 		if (sMessage.StartsWith("DCC SCHAT ")) {
 			// chat ip port
@@ -357,7 +357,7 @@ public:
 		RemTimer("Remove " + sNick); // delete any associated timer to this nick
 	}
 
-	virtual EModRet OnUserMsg(CString& sTarget, CString& sMessage) override
+	EModRet OnUserMsg(CString& sTarget, CString& sMessage) override
 	{
 		if (sTarget.Left(3) == "(s)") {
 			CString sSockName = GetModName().AsUpper() + "::" + sTarget;
diff --git a/modules/send_raw.cpp b/modules/send_raw.cpp
index 493fd0d3..de038f87 100644
--- a/modules/send_raw.cpp
+++ b/modules/send_raw.cpp
@@ -63,7 +63,7 @@ class CSendRaw_Mod: public CModule {
 public:
 	virtual ~CSendRaw_Mod() {}
 
-	virtual bool OnLoad(const CString& sArgs, CString& sErrorMsg) override {
+	bool OnLoad(const CString& sArgs, CString& sErrorMsg) override {
 		if (!GetUser()->IsAdmin()) {
 			sErrorMsg = "You must have admin privileges to load this module";
 			return false;
@@ -72,10 +72,10 @@ public:
 		return true;
 	}
 
-	virtual CString GetWebMenuTitle() override { return "Send Raw"; }
-	virtual bool WebRequiresAdmin() override { return true; }
+	CString GetWebMenuTitle() override { return "Send Raw"; }
+	bool WebRequiresAdmin() override { return true; }
 
-	virtual bool OnWebRequest(CWebSock& WebSock, const CString& sPageName, CTemplate& Tmpl) override {
+	bool OnWebRequest(CWebSock& WebSock, const CString& sPageName, CTemplate& Tmpl) override {
 		if (sPageName == "index") {
 			if (WebSock.IsPost()) {
 				CUser *pUser = CZNC::Get().FindUser(WebSock.GetParam("network").Token(0, false, "/"));
diff --git a/modules/shell.cpp b/modules/shell.cpp
index 11f061fc..06f69cfc 100644
--- a/modules/shell.cpp
+++ b/modules/shell.cpp
@@ -44,8 +44,8 @@ public:
 		SetWSock(open("/dev/null", O_WRONLY));
 	}
 	// These next two function's bodies are at the bottom of the file since they reference CShellMod
-	virtual void ReadLine(const CString& sData) override;
-	virtual void Disconnected() override;
+	void ReadLine(const CString& sData) override;
+	void Disconnected() override;
 
 	CShellMod* m_pParent;
 
@@ -67,7 +67,7 @@ public:
 		}
 	}
 
-	virtual bool OnLoad(const CString& sArgs, CString& sMessage) override
+	bool OnLoad(const CString& sArgs, CString& sMessage) override
 	{
 #ifndef MOD_SHELL_ALLOW_EVERYONE
 		if (!GetUser()->IsAdmin()) {
@@ -79,7 +79,7 @@ public:
 		return true;
 	}
 
-	virtual void OnModCommand(const CString& sLine) override {
+	void OnModCommand(const CString& sLine) override {
 		CString sCommand = sLine.Token(0);
 		if (sCommand.Equals("cd")) {
 			CString sArg = sLine.Token(1, true);
diff --git a/modules/simple_away.cpp b/modules/simple_away.cpp
index 45c9deaa..c07bd14f 100644
--- a/modules/simple_away.cpp
+++ b/modules/simple_away.cpp
@@ -31,7 +31,7 @@ public:
 	virtual ~CSimpleAwayJob() {}
 
 protected:
-	virtual void RunJob() override;
+	void RunJob() override;
 };
 
 class CSimpleAway : public CModule {
@@ -57,7 +57,7 @@ public:
 
 	virtual ~CSimpleAway() {}
 
-	virtual bool OnLoad(const CString& sArgs, CString& sMessage) override {
+	bool OnLoad(const CString& sArgs, CString& sMessage) override {
 		CString sReasonArg;
 
 		// Load AwayWait
@@ -91,18 +91,18 @@ public:
 		return true;
 	}
 
-	virtual void OnIRCConnected() override {
+	void OnIRCConnected() override {
 		if (GetNetwork()->IsUserAttached())
 			SetBack();
 		else
 			SetAway(false);
 	}
 
-	virtual void OnClientLogin() override {
+	void OnClientLogin() override {
 		SetBack();
 	}
 
-	virtual void OnClientDisconnect() override {
+	void OnClientDisconnect() override {
 		/* There might still be other clients */
 		if (!GetNetwork()->IsUserAttached())
 			SetAway();
@@ -140,7 +140,7 @@ public:
 		PutModule("Timer disabled");
 	}
 
-	virtual EModRet OnUserRaw(CString &sLine) override {
+	EModRet OnUserRaw(CString &sLine) override {
 		if (!sLine.Token(0).Equals("AWAY"))
 			return CONTINUE;
 
diff --git a/modules/stickychan.cpp b/modules/stickychan.cpp
index 5824e5b8..9c901863 100644
--- a/modules/stickychan.cpp
+++ b/modules/stickychan.cpp
@@ -32,9 +32,9 @@ public:
 	{
 	}
 
-	virtual bool OnLoad(const CString& sArgs, CString& sMessage) override;
+	bool OnLoad(const CString& sArgs, CString& sMessage) override;
 
-	virtual EModRet OnUserPart(CString& sChannel, CString& sMessage) override
+	EModRet OnUserPart(CString& sChannel, CString& sMessage) override
 	{
 		for (MCString::iterator it = BeginNV(); it != EndNV(); ++it)
 		{
@@ -116,9 +116,9 @@ public:
 		}
 	}
 
-	virtual CString GetWebMenuTitle() override { return "Sticky Chans"; }
+	CString GetWebMenuTitle() override { return "Sticky Chans"; }
 
-	virtual bool OnWebRequest(CWebSock& WebSock, const CString& sPageName, CTemplate& Tmpl) override {
+	bool OnWebRequest(CWebSock& WebSock, const CString& sPageName, CTemplate& Tmpl) override {
 		if (sPageName == "index") {
 			bool bSubmitted = (WebSock.GetParam("submitted").ToInt() != 0);
 
@@ -154,7 +154,7 @@ public:
 		return false;
 	}
 
-	virtual bool OnEmbeddedWebRequest(CWebSock& WebSock, const CString& sPageName, CTemplate& Tmpl) override {
+	bool OnEmbeddedWebRequest(CWebSock& WebSock, const CString& sPageName, CTemplate& Tmpl) override {
 		if (sPageName == "webadmin/channel") {
 			CString sChan = Tmpl["ChanName"];
 			bool bStick = FindNV(sChan) != EndNV();
diff --git a/modules/watch.cpp b/modules/watch.cpp
index be2d80f4..d49984a3 100644
--- a/modules/watch.cpp
+++ b/modules/watch.cpp
@@ -177,12 +177,12 @@ public:
 
 	virtual ~CWatcherMod() {}
 
-	virtual void OnRawMode(const CNick& OpNick, CChan& Channel, const CString& sModes, const CString& sArgs) override {
+	void OnRawMode(const CNick& OpNick, CChan& Channel, const CString& sModes, const CString& sArgs) override {
 		Process(OpNick, "* " + OpNick.GetNick() + " sets mode: " + sModes + " " +
 			sArgs + " on " + Channel.GetName(), Channel.GetName());
 	}
 
-	virtual void OnClientLogin() override {
+	void OnClientLogin() override {
 		MCString msParams;
 		msParams["target"] = GetNetwork()->GetCurNick();
 
@@ -193,67 +193,67 @@ public:
 		m_Buffer.Clear();
 	}
 
-	virtual void OnKick(const CNick& OpNick, const CString& sKickedNick, CChan& Channel, const CString& sMessage) override {
+	void OnKick(const CNick& OpNick, const CString& sKickedNick, CChan& Channel, const CString& sMessage) override {
 		Process(OpNick, "* " + OpNick.GetNick() + " kicked " + sKickedNick + " from " +
 			Channel.GetName() + " because [" + sMessage + "]", Channel.GetName());
 	}
 
-	virtual void OnQuit(const CNick& Nick, const CString& sMessage, const vector<CChan*>& vChans) override {
+	void OnQuit(const CNick& Nick, const CString& sMessage, const vector<CChan*>& vChans) override {
 		Process(Nick, "* Quits: " + Nick.GetNick() + " (" + Nick.GetIdent() + "@" + Nick.GetHost() + ") "
 			"(" + sMessage + ")", "");
 	}
 
-	virtual void OnJoin(const CNick& Nick, CChan& Channel) override {
+	void OnJoin(const CNick& Nick, CChan& Channel) override {
 		Process(Nick, "* " + Nick.GetNick() + " (" + Nick.GetIdent() + "@" + Nick.GetHost() + ") joins " +
 			Channel.GetName(), Channel.GetName());
 	}
 
-	virtual void OnPart(const CNick& Nick, CChan& Channel, const CString& sMessage) override {
+	void OnPart(const CNick& Nick, CChan& Channel, const CString& sMessage) override {
 		Process(Nick, "* " + Nick.GetNick() + " (" + Nick.GetIdent() + "@" + Nick.GetHost() + ") parts " +
 			Channel.GetName() + "(" + sMessage + ")", Channel.GetName());
 	}
 
-	virtual void OnNick(const CNick& OldNick, const CString& sNewNick, const vector<CChan*>& vChans) override {
+	void OnNick(const CNick& OldNick, const CString& sNewNick, const vector<CChan*>& vChans) override {
 		Process(OldNick, "* " + OldNick.GetNick() + " is now known as " + sNewNick, "");
 	}
 
-	virtual EModRet OnCTCPReply(CNick& Nick, CString& sMessage) override {
+	EModRet OnCTCPReply(CNick& Nick, CString& sMessage) override {
 		Process(Nick, "* CTCP: " + Nick.GetNick() + " reply [" + sMessage + "]", "priv");
 		return CONTINUE;
 	}
 
-	virtual EModRet OnPrivCTCP(CNick& Nick, CString& sMessage) override {
+	EModRet OnPrivCTCP(CNick& Nick, CString& sMessage) override {
 		Process(Nick, "* CTCP: " + Nick.GetNick() + " [" + sMessage + "]", "priv");
 		return CONTINUE;
 	}
 
-	virtual EModRet OnChanCTCP(CNick& Nick, CChan& Channel, CString& sMessage) override {
+	EModRet OnChanCTCP(CNick& Nick, CChan& Channel, CString& sMessage) override {
 		Process(Nick, "* CTCP: " + Nick.GetNick() + " [" + sMessage + "] to "
 			"[" + Channel.GetName() + "]", Channel.GetName());
 		return CONTINUE;
 	}
 
-	virtual EModRet OnPrivNotice(CNick& Nick, CString& sMessage) override {
+	EModRet OnPrivNotice(CNick& Nick, CString& sMessage) override {
 		Process(Nick, "-" + Nick.GetNick() + "- " + sMessage, "priv");
 		return CONTINUE;
 	}
 
-	virtual EModRet OnChanNotice(CNick& Nick, CChan& Channel, CString& sMessage) override {
+	EModRet OnChanNotice(CNick& Nick, CChan& Channel, CString& sMessage) override {
 		Process(Nick, "-" + Nick.GetNick() + ":" + Channel.GetName() + "- " + sMessage, Channel.GetName());
 		return CONTINUE;
 	}
 
-	virtual EModRet OnPrivMsg(CNick& Nick, CString& sMessage) override {
+	EModRet OnPrivMsg(CNick& Nick, CString& sMessage) override {
 		Process(Nick, "<" + Nick.GetNick() + "> " + sMessage, "priv");
 		return CONTINUE;
 	}
 
-	virtual EModRet OnChanMsg(CNick& Nick, CChan& Channel, CString& sMessage) override {
+	EModRet OnChanMsg(CNick& Nick, CChan& Channel, CString& sMessage) override {
 		Process(Nick, "<" + Nick.GetNick() + ":" + Channel.GetName() + "> " + sMessage, Channel.GetName());
 		return CONTINUE;
 	}
 
-	virtual void OnModCommand(const CString& sCommand) override {
+	void OnModCommand(const CString& sCommand) override {
 		CString sCmdName = sCommand.Token(0);
 		if (sCmdName.Equals("ADD") || sCmdName.Equals("WATCH")) {
 			Watch(sCommand.Token(1), sCommand.Token(2), sCommand.Token(3, true));
diff --git a/modules/webadmin.cpp b/modules/webadmin.cpp
index aa5f5ea1..69588ead 100644
--- a/modules/webadmin.cpp
+++ b/modules/webadmin.cpp
@@ -85,7 +85,7 @@ public:
 	virtual ~CWebAdminMod() {
 	}
 
-	virtual bool OnLoad(const CString& sArgStr, CString& sMessage) override {
+	bool OnLoad(const CString& sArgStr, CString& sMessage) override {
 		if (sArgStr.empty() || CModInfo::GlobalModule != GetType())
 			return true;
 
@@ -418,8 +418,8 @@ public:
 		return pNetwork;
 	}
 
-	virtual CString GetWebMenuTitle() override { return "webadmin"; }
-	virtual bool OnWebRequest(CWebSock& WebSock, const CString& sPageName, CTemplate& Tmpl) override {
+	CString GetWebMenuTitle() override { return "webadmin"; }
+	bool OnWebRequest(CWebSock& WebSock, const CString& sPageName, CTemplate& Tmpl) override {
 		std::shared_ptr<CWebSession> spSession = WebSock.GetSession();
 
 		if (sPageName == "settings") {
diff --git a/src/Buffer.cpp b/src/Buffer.cpp
index 10df96ea..69c35e50 100644
--- a/src/Buffer.cpp
+++ b/src/Buffer.cpp
@@ -20,7 +20,7 @@
 CBufLine::CBufLine(const CString& sFormat, const CString& sText, const timeval* ts) {
 	m_sFormat = sFormat;
 	m_sText = sText;
-	if (ts == NULL)
+	if (ts == nullptr)
 		UpdateTime();
 	else
 		m_time = *ts;
@@ -29,10 +29,10 @@ CBufLine::CBufLine(const CString& sFormat, const CString& sText, const timeval*
 CBufLine::~CBufLine() {}
 
 void CBufLine::UpdateTime() {
-	if (0 == gettimeofday(&m_time, NULL)) {
+	if (0 == gettimeofday(&m_time, nullptr)) {
 		return;
 	}
-	m_time.tv_sec = time(NULL);
+	m_time.tv_sec = time(nullptr);
 	m_time.tv_usec = 0;
 }
 
diff --git a/src/Chan.cpp b/src/Chan.cpp
index a35afe38..63f12d83 100644
--- a/src/Chan.cpp
+++ b/src/Chan.cpp
@@ -293,7 +293,7 @@ void CChan::ModeChange(const CString& sModes, const CNick* pOpNick) {
 			pOpNick = OpNick;
 	}
 
-	NETWORKMODULECALL(OnRawMode2(pOpNick, *this, sModeArg, sArgs), m_pNetwork->GetUser(), m_pNetwork, NULL, NOTHING);
+	NETWORKMODULECALL(OnRawMode2(pOpNick, *this, sModeArg, sArgs), m_pNetwork->GetUser(), m_pNetwork, nullptr, NOTHING);
 
 	for (unsigned int a = 0; a < sModeArg.size(); a++) {
 		const unsigned char& uMode = sModeArg[a];
@@ -325,19 +325,19 @@ void CChan::ModeChange(const CString& sModes, const CNick* pOpNick) {
 						}
 					}
 
-					NETWORKMODULECALL(OnChanPermission2(pOpNick, *pNick, *this, uMode, bAdd, bNoChange), m_pNetwork->GetUser(), m_pNetwork, NULL, NOTHING);
+					NETWORKMODULECALL(OnChanPermission2(pOpNick, *pNick, *this, uMode, bAdd, bNoChange), m_pNetwork->GetUser(), m_pNetwork, nullptr, NOTHING);
 
 					if (uMode == CChan::M_Op) {
 						if (bAdd) {
-							NETWORKMODULECALL(OnOp2(pOpNick, *pNick, *this, bNoChange), m_pNetwork->GetUser(), m_pNetwork, NULL, NOTHING);
+							NETWORKMODULECALL(OnOp2(pOpNick, *pNick, *this, bNoChange), m_pNetwork->GetUser(), m_pNetwork, nullptr, NOTHING);
 						} else {
-							NETWORKMODULECALL(OnDeop2(pOpNick, *pNick, *this, bNoChange), m_pNetwork->GetUser(), m_pNetwork, NULL, NOTHING);
+							NETWORKMODULECALL(OnDeop2(pOpNick, *pNick, *this, bNoChange), m_pNetwork->GetUser(), m_pNetwork, nullptr, NOTHING);
 						}
 					} else if (uMode == CChan::M_Voice) {
 						if (bAdd) {
-							NETWORKMODULECALL(OnVoice2(pOpNick, *pNick, *this, bNoChange), m_pNetwork->GetUser(), m_pNetwork, NULL, NOTHING);
+							NETWORKMODULECALL(OnVoice2(pOpNick, *pNick, *this, bNoChange), m_pNetwork->GetUser(), m_pNetwork, nullptr, NOTHING);
 						} else {
-							NETWORKMODULECALL(OnDevoice2(pOpNick, *pNick, *this, bNoChange), m_pNetwork->GetUser(), m_pNetwork, NULL, NOTHING);
+							NETWORKMODULECALL(OnDevoice2(pOpNick, *pNick, *this, bNoChange), m_pNetwork->GetUser(), m_pNetwork, nullptr, NOTHING);
 						}
 					}
 				}
@@ -372,7 +372,7 @@ void CChan::ModeChange(const CString& sModes, const CNick* pOpNick) {
 			} else {
 				bNoChange = !HasMode(uMode);
 			}
-			NETWORKMODULECALL(OnMode2(pOpNick, *this, uMode, sArg, bAdd, bNoChange), m_pNetwork->GetUser(), m_pNetwork, NULL, NOTHING);
+			NETWORKMODULECALL(OnMode2(pOpNick, *this, uMode, sArg, bAdd, bNoChange), m_pNetwork->GetUser(), m_pNetwork, nullptr, NOTHING);
 
 			if (!bList) {
 				(bAdd) ? AddMode(uMode, sArg) : RemMode(uMode);
@@ -566,12 +566,12 @@ bool CChan::ChangeNick(const CString& sOldNick, const CString& sNewNick) {
 
 const CNick* CChan::FindNick(const CString& sNick) const {
 	map<CString,CNick>::const_iterator it = m_msNicks.find(sNick);
-	return (it != m_msNicks.end()) ? &it->second : NULL;
+	return (it != m_msNicks.end()) ? &it->second : nullptr;
 }
 
 CNick* CChan::FindNick(const CString& sNick) {
 	map<CString,CNick>::iterator it = m_msNicks.find(sNick);
-	return (it != m_msNicks.end()) ? &it->second : NULL;
+	return (it != m_msNicks.end()) ? &it->second : nullptr;
 }
 
 void CChan::SendBuffer(CClient* pClient) {
@@ -606,7 +606,7 @@ void CChan::SendBuffer(CClient* pClient, const CBuffer& Buffer) {
 				pUseClient->SetPlaybackActive(true);
 
 				bool bSkipStatusMsg = pUseClient->HasServerTime();
-				NETWORKMODULECALL(OnChanBufferStarting(*this, *pUseClient), m_pNetwork->GetUser(), m_pNetwork, NULL, &bSkipStatusMsg);
+				NETWORKMODULECALL(OnChanBufferStarting(*this, *pUseClient), m_pNetwork->GetUser(), m_pNetwork, nullptr, &bSkipStatusMsg);
 
 				if (!bSkipStatusMsg) {
 					m_pNetwork->PutUser(":***!znc@znc.in PRIVMSG " + GetName() + " :Buffer Playback...", pUseClient);
@@ -629,13 +629,13 @@ void CChan::SendBuffer(CClient* pClient, const CBuffer& Buffer) {
 						CUtils::SetMessageTags(sLine, msBatchTags);
 					}
 					bool bNotShowThisLine = false;
-					NETWORKMODULECALL(OnChanBufferPlayLine2(*this, *pUseClient, sLine, BufLine.GetTime()), m_pNetwork->GetUser(), m_pNetwork, NULL, &bNotShowThisLine);
+					NETWORKMODULECALL(OnChanBufferPlayLine2(*this, *pUseClient, sLine, BufLine.GetTime()), m_pNetwork->GetUser(), m_pNetwork, nullptr, &bNotShowThisLine);
 					if (bNotShowThisLine) continue;
 					m_pNetwork->PutUser(sLine, pUseClient);
 				}
 
 				bSkipStatusMsg = pUseClient->HasServerTime();
-				NETWORKMODULECALL(OnChanBufferEnding(*this, *pUseClient), m_pNetwork->GetUser(), m_pNetwork, NULL, &bSkipStatusMsg);
+				NETWORKMODULECALL(OnChanBufferEnding(*this, *pUseClient), m_pNetwork->GetUser(), m_pNetwork, nullptr, &bSkipStatusMsg);
 				if (!bSkipStatusMsg) {
 					m_pNetwork->PutUser(":***!znc@znc.in PRIVMSG " + GetName() + " :Playback Complete.", pUseClient);
 				}
diff --git a/src/Client.cpp b/src/Client.cpp
index c648c7bc..1a09cdd3 100644
--- a/src/Client.cpp
+++ b/src/Client.cpp
@@ -72,7 +72,7 @@ CClient::~CClient() {
 		CClientAuth* pAuth = (CClientAuth*) &(*m_spAuth);
 		pAuth->Invalidate();
 	}
-	if (m_pUser != NULL) {
+	if (m_pUser != nullptr) {
 		m_pUser->AddBytesRead(GetBytesRead());
 		m_pUser->AddBytesWritten(GetBytesWritten());
 	}
@@ -576,7 +576,7 @@ const CIRCSock* CClient::GetIRCSock() const {
 		return m_pNetwork->GetIRCSock();
 	}
 
-	return NULL;
+	return nullptr;
 }
 
 CIRCSock* CClient::GetIRCSock() {
@@ -584,7 +584,7 @@ CIRCSock* CClient::GetIRCSock() {
 		return m_pNetwork->GetIRCSock();
 	}
 
-	return NULL;
+	return nullptr;
 }
 
 void CClient::StatusCTCP(const CString& sLine) {
@@ -642,7 +642,7 @@ CString CAuthBase::GetRemoteIP() const {
 }
 
 void CAuthBase::Invalidate() {
-	m_pSock = NULL;
+	m_pSock = nullptr;
 }
 
 void CAuthBase::AcceptLogin(CUser& User) {
@@ -737,7 +737,7 @@ void CClient::ConnectionRefused() {
 void CClient::Disconnected() {
 	DEBUG(GetSockName() << " == Disconnected()");
 	CIRCNetwork* pNetwork = m_pNetwork;
-	SetNetwork(NULL, true, false);
+	SetNetwork(nullptr, true, false);
 
 	if (m_pUser) {
 		NETWORKMODULECALL(OnClientDisconnect(), m_pUser, pNetwork, this, NOTHING);
diff --git a/src/ClientCommand.cpp b/src/ClientCommand.cpp
index a9e92677..78f67115 100644
--- a/src/ClientCommand.cpp
+++ b/src/ClientCommand.cpp
@@ -312,7 +312,7 @@ void CClient::UserCommand(CString& sLine) {
 
 		CString sArgs = sLine.Token(1, true);
 		sArgs.Trim();
-		CServer *pServer = NULL;
+		CServer *pServer = nullptr;
 
 		if (!sArgs.empty()) {
 			pServer = m_pNetwork->FindServer(sArgs);
@@ -539,7 +539,7 @@ void CClient::UserCommand(CString& sLine) {
 		}
 
 		if (m_pNetwork && m_pNetwork->GetName().Equals(sNetwork)) {
-			SetNetwork(NULL);
+			SetNetwork(nullptr);
 		}
 
 		if (m_pUser->DeleteNetwork(sNetwork)) {
@@ -659,7 +659,7 @@ void CClient::UserCommand(CString& sLine) {
 		pNewNetwork->Clone(*pOldNetwork, false);
 
 		if (m_pNetwork && m_pNetwork->GetName().Equals(sOldNetwork) && m_pUser == pOldUser) {
-			SetNetwork(NULL);
+			SetNetwork(nullptr);
 		}
 
 		if (pOldUser->DeleteNetwork(sOldNetwork)) {
@@ -1003,10 +1003,10 @@ void CClient::UserCommand(CString& sLine) {
 
 		switch (eType) {
 		case CModInfo::GlobalModule:
-			b = CZNC::Get().GetModules().LoadModule(sMod, sArgs, eType, NULL, NULL, sModRet);
+			b = CZNC::Get().GetModules().LoadModule(sMod, sArgs, eType, nullptr, nullptr, sModRet);
 			break;
 		case CModInfo::UserModule:
-			b = m_pUser->GetModules().LoadModule(sMod, sArgs, eType, m_pUser, NULL, sModRet);
+			b = m_pUser->GetModules().LoadModule(sMod, sArgs, eType, m_pUser, nullptr, sModRet);
 			break;
 		case CModInfo::NetworkModule:
 				b = m_pNetwork->GetModules().LoadModule(sMod, sArgs, eType, m_pUser, m_pNetwork, sModRet);
@@ -1142,10 +1142,10 @@ void CClient::UserCommand(CString& sLine) {
 
 		switch (eType) {
 		case CModInfo::GlobalModule:
-			CZNC::Get().GetModules().ReloadModule(sMod, sArgs, NULL, NULL, sModRet);
+			CZNC::Get().GetModules().ReloadModule(sMod, sArgs, nullptr, nullptr, sModRet);
 			break;
 		case CModInfo::UserModule:
-			m_pUser->GetModules().ReloadModule(sMod, sArgs, m_pUser, NULL, sModRet);
+			m_pUser->GetModules().ReloadModule(sMod, sArgs, m_pUser, nullptr, sModRet);
 			break;
 		case CModInfo::NetworkModule:
 			m_pNetwork->GetModules().ReloadModule(sMod, sArgs, m_pUser, m_pNetwork, sModRet);
diff --git a/src/Config.cpp b/src/Config.cpp
index 680566da..8dcade20 100644
--- a/src/Config.cpp
+++ b/src/Config.cpp
@@ -31,7 +31,7 @@ struct ConfigStackEntry {
 };
 
 CConfigEntry::CConfigEntry()
-	: m_pSubConfig(NULL) {
+	: m_pSubConfig(nullptr) {
 }
 
 CConfigEntry::CConfigEntry(const CConfig& Config)
@@ -39,7 +39,7 @@ CConfigEntry::CConfigEntry(const CConfig& Config)
 }
 
 CConfigEntry::CConfigEntry(const CConfigEntry& other)
-	: m_pSubConfig(NULL) {
+	: m_pSubConfig(nullptr) {
 	if (other.m_pSubConfig)
 		m_pSubConfig = new CConfig(*other.m_pSubConfig);
 }
@@ -54,7 +54,7 @@ CConfigEntry& CConfigEntry::operator=(const CConfigEntry& other) {
 	if (other.m_pSubConfig)
 		m_pSubConfig = new CConfig(*other.m_pSubConfig);
 	else
-		m_pSubConfig = NULL;
+		m_pSubConfig = nullptr;
 	return *this;
 }
 
diff --git a/src/FileUtils.cpp b/src/FileUtils.cpp
index b1aa3112..f406688b 100644
--- a/src/FileUtils.cpp
+++ b/src/FileUtils.cpp
@@ -648,7 +648,7 @@ int CExecSock::popen2(int & iReadFD, int & iWriteFD, const CString & sCommand) {
 			"sh",
 			"-c",
 			sCommand.c_str(),
-			NULL
+			nullptr
 		};
 		execvp("sh", (char * const *) pArgv);
 		// if execvp returns, there was an error
@@ -668,9 +668,9 @@ int CExecSock::popen2(int & iReadFD, int & iWriteFD, const CString & sCommand) {
 void CExecSock::close2(int iPid, int iReadFD, int iWriteFD) {
 	close(iReadFD);
 	close(iWriteFD);
-	time_t iNow = time(NULL);
-	while (waitpid(iPid, NULL, WNOHANG) == 0) {
-		if ((time(NULL) - iNow) > 5)
+	time_t iNow = time(nullptr);
+	while (waitpid(iPid, nullptr, WNOHANG) == 0) {
+		if ((time(nullptr) - iNow) > 5)
 			break;  // giveup
 		usleep(100);
 	}
diff --git a/src/IRCNetwork.cpp b/src/IRCNetwork.cpp
index 372e8a30..16aa53c6 100644
--- a/src/IRCNetwork.cpp
+++ b/src/IRCNetwork.cpp
@@ -38,7 +38,7 @@ public:
 	virtual ~CIRCNetworkPingTimer() {}
 
 protected:
-	virtual void RunJob() {
+	void RunJob() override {
 		CIRCSock* pIRCSock = m_pNetwork->GetIRCSock();
 
 		if (pIRCSock && pIRCSock->GetTimeSinceLastDataTransaction() >= CIRCNetwork::PING_FREQUENCY) {
@@ -74,7 +74,7 @@ public:
 	}
 
 protected:
-	virtual void RunJob() {
+	void RunJob() override {
 		if (m_bDelayed) {
 			m_bDelayed = false;
 			Start(CIRCNetwork::JOIN_FREQUENCY);
@@ -109,13 +109,13 @@ bool CIRCNetwork::IsValidNetwork(const CString& sNetwork) {
 }
 
 CIRCNetwork::CIRCNetwork(CUser *pUser, const CString& sName) {
-	m_pUser = NULL;
+	m_pUser = nullptr;
 	SetUser(pUser);
 	m_sName = sName;
 
 	m_pModules = new CModules;
 
-	m_pIRCSock = NULL;
+	m_pIRCSock = nullptr;
 	m_uServerIdx = 0;
 
 	m_sChanPrefixes = "";
@@ -143,12 +143,12 @@ CIRCNetwork::CIRCNetwork(CUser *pUser, const CString& sName) {
 }
 
 CIRCNetwork::CIRCNetwork(CUser *pUser, const CIRCNetwork &Network) {
-	m_pUser = NULL;
+	m_pUser = nullptr;
 	SetUser(pUser);
 
 	m_pModules = new CModules;
 
-	m_pIRCSock = NULL;
+	m_pIRCSock = nullptr;
 	m_uServerIdx = 0;
 
 	m_sChanPrefixes = "";
@@ -278,7 +278,7 @@ void CIRCNetwork::Clone(const CIRCNetwork& Network, bool bCloneName) {
 CIRCNetwork::~CIRCNetwork() {
 	if (m_pIRCSock) {
 		CZNC::Get().GetManager().DelSockByAddr(m_pIRCSock);
-		m_pIRCSock = NULL;
+		m_pIRCSock = nullptr;
 	}
 
 	// Delete clients
@@ -292,7 +292,7 @@ CIRCNetwork::~CIRCNetwork() {
 
 	// Delete modules (this unloads all modules)
 	delete m_pModules;
-	m_pModules = NULL;
+	m_pModules = nullptr;
 
 	// Delete Channels
 	for (vector<CChan*>::const_iterator it = m_vChans.begin(); it != m_vChans.end(); ++it) {
@@ -306,7 +306,7 @@ CIRCNetwork::~CIRCNetwork() {
 	}
 	m_vQueries.clear();
 
-	SetUser(NULL);
+	SetUser(nullptr);
 
 	// Make sure we are not in the connection queue
 	CZNC::Get().GetConnectionQueue().remove(this);
@@ -617,7 +617,7 @@ void CIRCNetwork::ClientConnected(CClient *pClient) {
 		}
  	}
 
-	if (GetIRCSock() != NULL) {
+	if (GetIRCSock() != nullptr) {
 		CString sUserMode("");
 		const set<unsigned char>& scUserModes = GetIRCSock()->GetUserModes();
 		for (set<unsigned char>::const_iterator it = scUserModes.begin();
@@ -658,7 +658,7 @@ void CIRCNetwork::ClientConnected(CClient *pClient) {
 		const CBufLine& BufLine = m_NoticeBuffer.GetBufLine(uIdx);
 		CString sLine = BufLine.GetLine(*pClient, msParams);
 		bool bContinue = false;
-		NETWORKMODULECALL(OnPrivBufferPlayLine2(*pClient, sLine, BufLine.GetTime()), m_pUser, this, NULL, &bContinue);
+		NETWORKMODULECALL(OnPrivBufferPlayLine2(*pClient, sLine, BufLine.GetTime()), m_pUser, this, nullptr, &bContinue);
 		if (bContinue) continue;
 		pClient->PutClient(sLine);
 	}
@@ -703,7 +703,7 @@ std::vector<CClient*> CIRCNetwork::FindClients(const CString& sIdentifier) const
 void CIRCNetwork::SetUser(CUser *pUser) {
 	for (unsigned int a = 0; a < m_vClients.size(); a++) {
 		m_vClients[a]->PutStatus("This network is being deleted or moved to another user.");
-		m_vClients[a]->SetNetwork(NULL);
+		m_vClients[a]->SetNetwork(nullptr);
 	}
 
 	m_vClients.clear();
@@ -738,7 +738,7 @@ bool CIRCNetwork::PutUser(const CString& sLine, CClient* pClient, CClient* pSkip
 		}
 	}
 
-	return (pClient == NULL);
+	return (pClient == nullptr);
 }
 
 bool CIRCNetwork::PutStatus(const CString& sLine, CClient* pClient, CClient* pSkipClient) {
@@ -752,7 +752,7 @@ bool CIRCNetwork::PutStatus(const CString& sLine, CClient* pClient, CClient* pSk
 		}
 	}
 
-	return (pClient == NULL);
+	return (pClient == nullptr);
 }
 
 bool CIRCNetwork::PutModule(const CString& sModule, const CString& sLine, CClient* pClient, CClient* pSkipClient) {
@@ -766,7 +766,7 @@ bool CIRCNetwork::PutModule(const CString& sModule, const CString& sLine, CClien
 		}
 	}
 
-	return (pClient == NULL);
+	return (pClient == nullptr);
 }
 
 // Channels
@@ -786,7 +786,7 @@ CChan* CIRCNetwork::FindChan(CString sName) const {
 		}
 	}
 
-	return NULL;
+	return nullptr;
 }
 
 std::vector<CChan*> CIRCNetwork::FindChans(const CString& sWild) const {
@@ -907,7 +907,7 @@ void CIRCNetwork::JoinChans(set<CChan*>& sChans) {
 
 bool CIRCNetwork::JoinChan(CChan* pChan) {
 	bool bReturn = false;
-	NETWORKMODULECALL(OnJoining(*pChan), m_pUser, this, NULL, &bReturn);
+	NETWORKMODULECALL(OnJoining(*pChan), m_pUser, this, nullptr, &bReturn);
 
 	if (bReturn)
 		return false;
@@ -918,7 +918,7 @@ bool CIRCNetwork::JoinChan(CChan* pChan) {
 	} else {
 		pChan->IncJoinTries();
 		bool bFailed = false;
-		NETWORKMODULECALL(OnTimerAutoJoin(*pChan), m_pUser, this, NULL, &bFailed);
+		NETWORKMODULECALL(OnTimerAutoJoin(*pChan), m_pUser, this, nullptr, &bFailed);
 		if (bFailed) return false;
 		return true;
 	}
@@ -946,7 +946,7 @@ CQuery* CIRCNetwork::FindQuery(const CString& sName) const {
 		}
 	}
 
-	return NULL;
+	return nullptr;
 }
 
 std::vector<CQuery*> CIRCNetwork::FindQueries(const CString& sWild) const {
@@ -962,7 +962,7 @@ std::vector<CQuery*> CIRCNetwork::FindQueries(const CString& sWild) const {
 
 CQuery* CIRCNetwork::AddQuery(const CString& sName) {
 	if (sName.empty()) {
-		return NULL;
+		return nullptr;
 	}
 
 	CQuery* pQuery = FindQuery(sName);
@@ -1005,7 +1005,7 @@ CServer* CIRCNetwork::FindServer(const CString& sName) const {
 		}
 	}
 
-	return NULL;
+	return nullptr;
 }
 
 bool CIRCNetwork::DelServer(const CString& sName, unsigned short uPort, const CString& sPass) {
@@ -1129,7 +1129,7 @@ bool CIRCNetwork::AddServer(const CString& sName, unsigned short uPort, const CS
 
 CServer* CIRCNetwork::GetNextServer() {
 	if (m_vServers.empty()) {
-		return NULL;
+		return nullptr;
 	}
 
 	if (m_uServerIdx >= m_vServers.size()) {
@@ -1143,7 +1143,7 @@ CServer* CIRCNetwork::GetCurrentServer() const {
 	size_t uIdx = (m_uServerIdx) ? m_uServerIdx -1 : 0;
 
 	if (uIdx >= m_vServers.size()) {
-		return NULL;
+		return nullptr;
 	}
 
 	return m_vServers[uIdx];
@@ -1223,7 +1223,7 @@ bool CIRCNetwork::Connect() {
 	DEBUG("Connecting user/network [" << m_pUser->GetUserName() << "/" << m_sName << "]");
 
 	bool bAbort = false;
-	NETWORKMODULECALL(OnIRCConnecting(pIRCSock), m_pUser, this, NULL, &bAbort);
+	NETWORKMODULECALL(OnIRCConnecting(pIRCSock), m_pUser, this, nullptr, &bAbort);
 	if (bAbort) {
 		DEBUG("Some module aborted the connection attempt");
 		PutStatus("Some module aborted the connection attempt");
@@ -1256,7 +1256,7 @@ void CIRCNetwork::IRCConnected() {
 }
 
 void CIRCNetwork::IRCDisconnected() {
-	m_pIRCSock = NULL;
+	m_pIRCSock = nullptr;
 
 	SetIRCServer("");
 	m_bIRCAway = false;
@@ -1281,7 +1281,7 @@ void CIRCNetwork::SetIRCConnectEnabled(bool b) {
 
 void CIRCNetwork::CheckIRCConnect() {
 	// Do we want to connect?
-	if (GetIRCConnectEnabled() && GetIRCSock() == NULL)
+	if (GetIRCConnectEnabled() && GetIRCSock() == nullptr)
 		CZNC::Get().AddNetworkToQueue(this);
 }
 
diff --git a/src/IRCSock.cpp b/src/IRCSock.cpp
index a51db0f4..39d0e94e 100644
--- a/src/IRCSock.cpp
+++ b/src/IRCSock.cpp
@@ -42,7 +42,7 @@ class CIRCFloodTimer : public CCron {
 			m_pSock = pSock;
 			StartMaxCycles(m_pSock->m_fFloodRate, 0);
 		}
-		virtual void RunJob() {
+		void RunJob() override {
 			if (m_pSock->m_iSendsAllowed < m_pSock->m_uFloodBurst) {
 				m_pSock->m_iSendsAllowed++;
 			}
@@ -736,7 +736,7 @@ void CIRCSock::ReadLine(const CString& sData) {
 				if (bReturn) return;
 
 				pChan->SetTopicOwner(Nick.GetNick());
-				pChan->SetTopicDate((unsigned long) time(NULL));
+				pChan->SetTopicDate((unsigned long) time(nullptr));
 				pChan->SetTopic(sTopic);
 
 				if (pChan->IsDetached()) {
@@ -954,7 +954,7 @@ bool CIRCSock::OnGeneralCTCP(CNick& Nick, CString& sMessage) {
 	}
 
 	if (!sReply.empty()) {
-		time_t now = time(NULL);
+		time_t now = time(nullptr);
 		// If the last CTCP is older than m_uCTCPFloodTime, reset the counter
 		if (m_lastCTCP + m_uCTCPFloodTime < now)
 			m_uNumCTCP = 0;
diff --git a/src/Listener.cpp b/src/Listener.cpp
index 4fc9eddb..bb067d16 100644
--- a/src/Listener.cpp
+++ b/src/Listener.cpp
@@ -46,7 +46,7 @@ bool CListener::Listen() {
 }
 
 void CListener::ResetRealListener() {
-	m_pListener = NULL;
+	m_pListener = nullptr;
 }
 
 CRealListener::~CRealListener() {
@@ -114,7 +114,7 @@ void CIncomingConnection::ReadLine(const CString& sLine) {
 		|| (m_eAcceptType == CListener::ACCEPT_HTTP);
 	bool bAcceptIRC = (m_eAcceptType == CListener::ACCEPT_ALL)
 		|| (m_eAcceptType == CListener::ACCEPT_IRC);
-	Csock *pSock = NULL;
+	Csock *pSock = nullptr;
 
 	if (!bIsHTTP) {
 		// Let's assume it's an IRC connection
diff --git a/src/Modules.cpp b/src/Modules.cpp
index 5d995d31..388bd02b 100644
--- a/src/Modules.cpp
+++ b/src/Modules.cpp
@@ -131,7 +131,7 @@ CModule::CModule(ModHandle pDLL, CUser* pUser, CIRCNetwork* pNetwork, const CStr
 	m_pManager = &(CZNC::Get().GetManager());;
 	m_pUser = pUser;
 	m_pNetwork = pNetwork;
-	m_pClient = NULL;
+	m_pClient = nullptr;
 	m_sModName = sModName;
 	m_sDataDir = sDataDir;
 
@@ -320,7 +320,7 @@ bool CModule::UnlinkTimer(CTimer* pTimer) {
 
 CTimer* CModule::FindTimer(const CString& sLabel) {
 	if (sLabel.empty()) {
-		return NULL;
+		return nullptr;
 	}
 
 	for (CTimer* pTimer : m_sTimers) {
@@ -329,7 +329,7 @@ CTimer* CModule::FindTimer(const CString& sLabel) {
 		}
 	}
 
-	return NULL;
+	return nullptr;
 }
 
 void CModule::ListTimers() {
@@ -399,7 +399,7 @@ CSocket* CModule::FindSocket(const CString& sSockName) {
 		}
 	}
 
-	return NULL;
+	return nullptr;
 }
 
 void CModule::ListSockets() {
@@ -449,7 +449,7 @@ void CModule::AddJob(CModuleJob *pJob)
 
 void CModule::CancelJob(CModuleJob *pJob)
 {
-	if (pJob == NULL)
+	if (pJob == nullptr)
 		return;
 	// Destructor calls UnlinkJob and removes the job from m_sJobs
 	CThreadPool::Get().cancelJob(pJob);
@@ -482,11 +482,11 @@ bool CModule::UnlinkJob(CModuleJob *pJob)
 
 bool CModule::AddCommand(const CModCommand& Command)
 {
-	if (Command.GetFunction() == NULL)
+	if (Command.GetFunction() == nullptr)
 		return false;
 	if (Command.GetCommand().find(' ') != CString::npos)
 		return false;
-	if (FindCommand(Command.GetCommand()) != NULL)
+	if (FindCommand(Command.GetCommand()) != nullptr)
 		return false;
 
 	m_mCommands[Command.GetCommand()] = Command;
@@ -521,7 +521,7 @@ const CModCommand* CModule::FindCommand(const CString& sCmd) const
 			continue;
 		return &it.second;
 	}
-	return NULL;
+	return nullptr;
 }
 
 bool CModule::HandleCommand(const CString& sLine) {
@@ -748,9 +748,9 @@ void CModule::OnGetAvailableMods(set<CModInfo>& ssMods, CModInfo::EModuleType eT
 
 
 CModules::CModules() {
-	m_pUser = NULL;
-	m_pNetwork = NULL;
-	m_pClient = NULL;
+	m_pUser = nullptr;
+	m_pNetwork = nullptr;
+	m_pClient = nullptr;
 }
 
 CModules::~CModules() {
@@ -973,20 +973,20 @@ CModule* CModules::FindModule(const CString& sModule) const {
 		}
 	}
 
-	return NULL;
+	return nullptr;
 }
 
 bool CModules::LoadModule(const CString& sModule, const CString& sArgs, CModInfo::EModuleType eType, CUser* pUser, CIRCNetwork *pNetwork, CString& sRetMsg) {
 	sRetMsg = "";
 
-	if (FindModule(sModule) != NULL) {
+	if (FindModule(sModule) != nullptr) {
 		sRetMsg = "Module [" + sModule + "] already loaded.";
 		return false;
 	}
 
 	bool bSuccess;
 	bool bHandled = false;
-	_GLOBALMODULECALL(OnModuleLoading(sModule, sArgs, eType, bSuccess, sRetMsg), pUser, pNetwork, NULL, &bHandled);
+	_GLOBALMODULECALL(OnModuleLoading(sModule, sArgs, eType, bSuccess, sRetMsg), pUser, pNetwork, nullptr, &bHandled);
 	if (bHandled) return bSuccess;
 
 	CString sModPath, sDataPath;
@@ -1076,7 +1076,7 @@ bool CModules::UnloadModule(const CString& sModule, CString& sRetMsg) {
 
 	bool bSuccess;
 	bool bHandled = false;
-	_GLOBALMODULECALL(OnModuleUnloading(pModule, bSuccess, sRetMsg), pModule->GetUser(), pModule->GetNetwork(), NULL, &bHandled);
+	_GLOBALMODULECALL(OnModuleUnloading(pModule, bSuccess, sRetMsg), pModule->GetUser(), pModule->GetNetwork(), nullptr, &bHandled);
 	if (bHandled) return bSuccess;
 
 	ModHandle p = pModule->GetDLL();
@@ -1111,7 +1111,7 @@ bool CModules::ReloadModule(const CString& sModule, const CString& sArgs, CUser*
 	}
 
 	CModInfo::EModuleType eType = pModule->GetType();
-	pModule = NULL;
+	pModule = nullptr;
 
 	sRetMsg = "";
 	if (!UnloadModule(sMod, sRetMsg)) {
@@ -1267,7 +1267,7 @@ ModHandle CModules::OpenModule(const CString& sModule, const CString& sModPath,
 	for (unsigned int a = 0; a < sModule.length(); a++) {
 		if (((sModule[a] < '0') || (sModule[a] > '9')) && ((sModule[a] < 'a') || (sModule[a] > 'z')) && ((sModule[a] < 'A') || (sModule[a] > 'Z')) && (sModule[a] != '_')) {
 			sRetMsg = "Module names can only contain letters, numbers and underscores, [" + sModule + "] is invalid.";
-			return NULL;
+			return nullptr;
 		}
 	}
 
@@ -1291,7 +1291,7 @@ ModHandle CModules::OpenModule(const CString& sModule, const CString& sModPath,
 		const char* cDlError = dlerror();
 		CString sDlError = cDlError ? cDlError : "Unknown error";
 		sRetMsg = "Unable to open module [" + sModule + "] [" + sDlError + "]";
-		return NULL;
+		return nullptr;
 	}
 
 	typedef bool (*InfoFP)(double, CModInfo&);
@@ -1300,7 +1300,7 @@ ModHandle CModules::OpenModule(const CString& sModule, const CString& sModPath,
 	if (!ZNCModInfo) {
 		dlclose(p);
 		sRetMsg = "Could not find ZNCModInfo() in module [" + sModule + "]";
-		return NULL;
+		return nullptr;
 	}
 
 	if (ZNCModInfo(CModule::GetCoreVersion(), Info)) {
@@ -1315,7 +1315,7 @@ ModHandle CModules::OpenModule(const CString& sModule, const CString& sModPath,
 }
 
 CModCommand::CModCommand()
-	: m_sCmd(), m_pFunc(NULL), m_sArgs(), m_sDesc()
+	: m_sCmd(), m_pFunc(nullptr), m_sArgs(), m_sDesc()
 {
 }
 
diff --git a/src/Nick.cpp b/src/Nick.cpp
index ec92c300..32a51f09 100644
--- a/src/Nick.cpp
+++ b/src/Nick.cpp
@@ -34,7 +34,7 @@ CNick::~CNick() {}
 
 void CNick::Reset() {
 	m_sChanPerms.clear();
-	m_pNetwork = NULL;
+	m_pNetwork = nullptr;
 }
 
 void CNick::Parse(const CString& sNickMask) {
@@ -115,7 +115,7 @@ bool CNick::RemPerm(unsigned char uPerm) {
 }
 
 unsigned char CNick::GetPermChar() const {
-	CIRCSock* pIRCSock = (!m_pNetwork) ? NULL : m_pNetwork->GetIRCSock();
+	CIRCSock* pIRCSock = (!m_pNetwork) ? nullptr : m_pNetwork->GetIRCSock();
 	const CString& sChanPerms = (!pIRCSock) ? "@+" : pIRCSock->GetPerms();
 
 	for (unsigned int a = 0; a < sChanPerms.size(); a++) {
@@ -129,7 +129,7 @@ unsigned char CNick::GetPermChar() const {
 }
 
 CString CNick::GetPermStr() const {
-	CIRCSock* pIRCSock = (!m_pNetwork) ? NULL : m_pNetwork->GetIRCSock();
+	CIRCSock* pIRCSock = (!m_pNetwork) ? nullptr : m_pNetwork->GetIRCSock();
 	const CString& sChanPerms = (!pIRCSock) ? "@+" : pIRCSock->GetPerms();
 	CString sRet;
 
diff --git a/src/Query.cpp b/src/Query.cpp
index 9ba8c9e9..c59895ee 100644
--- a/src/Query.cpp
+++ b/src/Query.cpp
@@ -73,7 +73,7 @@ void CQuery::SendBuffer(CClient* pClient, const CBuffer& Buffer) {
 						CUtils::SetMessageTags(sLine, msBatchTags);
 					}
 					bool bContinue = false;
-					NETWORKMODULECALL(OnPrivBufferPlayLine2(*pUseClient, sLine, BufLine.GetTime()), m_pNetwork->GetUser(), m_pNetwork, NULL, &bContinue);
+					NETWORKMODULECALL(OnPrivBufferPlayLine2(*pUseClient, sLine, BufLine.GetTime()), m_pNetwork->GetUser(), m_pNetwork, nullptr, &bContinue);
 					if (bContinue) continue;
 					m_pNetwork->PutUser(sLine, pUseClient);
 				}
diff --git a/src/Socket.cpp b/src/Socket.cpp
index 49185299..1c2e0a9a 100644
--- a/src/Socket.cpp
+++ b/src/Socket.cpp
@@ -156,7 +156,7 @@ public:
 		Add(CThreadPool::Get().getReadFD(), ECT_Read);
 	}
 
-	virtual bool FDsThatTriggered(const std::map<int, short>& miiReadyFds) {
+	bool FDsThatTriggered(const std::map<int, short>& miiReadyFds) override {
 		if (miiReadyFds.find(CThreadPool::Get().getReadFD())->second) {
 			CThreadPool::Get().handlePipeReadable();
 		}
@@ -175,7 +175,7 @@ void CSockManager::CDNSJob::runThread() {
 		hints.ai_socktype = SOCK_STREAM;
 		hints.ai_protocol = IPPROTO_TCP;
 		hints.ai_flags = AI_ADDRCONFIG;
-		iRes = getaddrinfo(sHostname.c_str(), NULL, &hints, &aiResult);
+		iRes = getaddrinfo(sHostname.c_str(), nullptr, &hints, &aiResult);
 		if (EAGAIN != iRes) {
 			break;
 		}
@@ -195,7 +195,7 @@ void CSockManager::CDNSJob::runMain() {
 		if (this->aiResult) {
 			DEBUG("And aiResult is not NULL...");
 		}
-		this->aiResult = NULL; // just for case. Maybe to call freeaddrinfo()?
+		this->aiResult = nullptr; // just for case. Maybe to call freeaddrinfo()?
 	}
 	pManager->SetTDNSThreadFinished(this->task, this->bBind, this->aiResult);
 }
@@ -207,7 +207,7 @@ void CSockManager::StartTDNSThread(TDNSTask* task, bool bBind) {
 	arg->task      = task;
 	arg->bBind     = bBind;
 	arg->iRes      = 0;
-	arg->aiResult  = NULL;
+	arg->aiResult  = nullptr;
 	arg->pManager  = this;
 
 	CThreadPool::Get().addJob(arg);
@@ -256,7 +256,7 @@ void CSockManager::SetTDNSThreadFinished(TDNSTask* task, bool bBind, addrinfo* a
 	SCString ssTargets6;
 	for (addrinfo* ai = task->aiTarget; ai; ai = ai->ai_next) {
 		char s[INET6_ADDRSTRLEN] = {};
-		getnameinfo(ai->ai_addr, ai->ai_addrlen, s, sizeof(s), NULL, 0, NI_NUMERICHOST);
+		getnameinfo(ai->ai_addr, ai->ai_addrlen, s, sizeof(s), nullptr, 0, NI_NUMERICHOST);
 		switch (ai->ai_family) {
 			case AF_INET:
 				ssTargets4.insert(s);
@@ -272,7 +272,7 @@ void CSockManager::SetTDNSThreadFinished(TDNSTask* task, bool bBind, addrinfo* a
 	SCString ssBinds6;
 	for (addrinfo* ai = task->aiBind; ai; ai = ai->ai_next) {
 		char s[INET6_ADDRSTRLEN] = {};
-		getnameinfo(ai->ai_addr, ai->ai_addrlen, s, sizeof(s), NULL, 0, NI_NUMERICHOST);
+		getnameinfo(ai->ai_addr, ai->ai_addrlen, s, sizeof(s), nullptr, 0, NI_NUMERICHOST);
 		switch (ai->ai_family) {
 			case AF_INET:
 				ssBinds4.insert(s);
@@ -361,8 +361,8 @@ void CSockManager::Connect(const CString& sHostname, u_short iPort, const CStrin
 	task->bSSL        = bSSL;
 	task->sBindhost   = sBindHost;
 	task->pcSock      = pcSock;
-	task->aiTarget    = NULL;
-	task->aiBind      = NULL;
+	task->aiTarget    = nullptr;
+	task->aiBind      = nullptr;
 	task->bDoneTarget = false;
 	if (sBindHost.empty()) {
 		task->bDoneBind = true;
@@ -411,7 +411,7 @@ CSocket::CSocket(CModule* pModule, const CString& sHostname, unsigned short uPor
 }
 
 CSocket::~CSocket() {
-	CUser *pUser = NULL;
+	CUser *pUser = nullptr;
 
 	// CWebSock could cause us to have a NULL pointer here
 	if (m_pModule) {
diff --git a/src/Template.cpp b/src/Template.cpp
index 0c26cf91..37c088ab 100644
--- a/src/Template.cpp
+++ b/src/Template.cpp
@@ -48,7 +48,7 @@ CTemplate* CTemplateLoopContext::GetRow(unsigned int uIndex) {
 		}
 	}
 
-	return NULL;
+	return nullptr;
 }
 
 CString CTemplateLoopContext::GetValue(const CString& sName, bool bFromIf) {
@@ -104,7 +104,7 @@ void CTemplate::Init() {
 	*/
 
 	ClearPaths();
-	m_pParent = NULL;
+	m_pParent = nullptr;
 }
 
 CString CTemplate::ExpandFile(const CString& sFilename, bool bFromInc) {
@@ -241,7 +241,7 @@ CTemplate* CTemplate::GetRow(const CString& sName, unsigned int uIndex) {
 		}
 	}
 
-	return NULL;
+	return nullptr;
 }
 
 vector<CTemplate*>* CTemplate::GetLoop(const CString& sName) {
@@ -261,7 +261,7 @@ vector<CTemplate*>* CTemplate::GetLoop(const CString& sName) {
 		return &(it->second);
 	}
 
-	return NULL;
+	return nullptr;
 }
 
 bool CTemplate::PrintString(CString& sRet) {
@@ -456,7 +456,7 @@ bool CTemplate::Print(const CString& sFileName, ostream& oOut) {
 							bool bSort = (sArgs.Token(1).Left(4).Equals("SORT"));
 							vector<CTemplate*>* pvLoop = GetLoop(sLoopName);
 
-							if (bSort && pvLoop != NULL &&  pvLoop->size() > 1) {
+							if (bSort && pvLoop != nullptr &&  pvLoop->size() > 1) {
 								CString sKey;
 
 								if(sArgs.Token(1).TrimPrefix_n("SORT").Left(4).Equals("ASC=")) {
@@ -652,7 +652,7 @@ CTemplateLoopContext* CTemplate::GetCurLoopContext() {
 		return m_vLoopContexts.back();
 	}
 
-	return NULL;
+	return nullptr;
 }
 
 bool CTemplate::ValidIf(const CString& sArgs) {
@@ -749,7 +749,7 @@ bool CTemplate::IsTrue(const CString& sName) {
 }
 
 bool CTemplate::HasLoop(const CString& sName) {
-	return (GetLoop(sName) != NULL);
+	return (GetLoop(sName) != nullptr);
 }
 
 CTemplate* CTemplate::GetParent(bool bRoot) {
diff --git a/src/Threads.cpp b/src/Threads.cpp
index c6d28a9e..84972d30 100644
--- a/src/Threads.cpp
+++ b/src/Threads.cpp
@@ -68,7 +68,7 @@ void CThreadPool::handlePipeReadable() const {
 }
 
 CJob *CThreadPool::getJobFromPipe() const {
-	CJob* a = NULL;
+	CJob* a = nullptr;
 	ssize_t need = sizeof(a);
 	ssize_t r = read(m_iJobPipe[0], &a, need);
 	if (r != need) {
diff --git a/src/User.cpp b/src/User.cpp
index 7209a867..888a83cf 100644
--- a/src/User.cpp
+++ b/src/User.cpp
@@ -37,7 +37,7 @@ public:
 
 private:
 protected:
-	virtual void RunJob() {
+	void RunJob() override {
 		const vector<CClient*>& vUserClients = m_pUser->GetUserClients();
 
 		for (CClient* pUserClient : vUserClients) {
@@ -99,7 +99,7 @@ CUser::~CUser() {
 
 	// Delete modules (unloads all modules!)
 	delete m_pModules;
-	m_pModules = NULL;
+	m_pModules = nullptr;
 
 	CZNC::Get().GetManager().DelCronByAddr(m_pUserTimer);
 
@@ -182,7 +182,7 @@ bool CUser::ParseConfig(CConfig* pConfig, CString& sError) {
 		if (sValue.ToBool()) {
 			CUtils::PrintAction("Loading Module [bouncedcc]");
 			CString sModRet;
-			bool bModRet = GetModules().LoadModule("bouncedcc", "", CModInfo::UserModule, this, NULL, sModRet);
+			bool bModRet = GetModules().LoadModule("bouncedcc", "", CModInfo::UserModule, this, nullptr, sModRet);
 
 			CUtils::PrintStatus(bModRet, sModRet);
 			if (!bModRet) {
@@ -442,20 +442,20 @@ bool CUser::ParseConfig(CConfig* pConfig, CString& sError) {
 CIRCNetwork* CUser::AddNetwork(const CString &sNetwork, CString& sErrorRet) {
 	if (!CIRCNetwork::IsValidNetwork(sNetwork)) {
 		sErrorRet = "Invalid network name. It should be alphanumeric. Not to be confused with server name";
-		return NULL;
+		return nullptr;
 	} else if (FindNetwork(sNetwork)) {
 		sErrorRet = "Network [" + sNetwork.Token(0) + "] already exists";
-		return NULL;
+		return nullptr;
 	}
 
 	CIRCNetwork* pNetwork = new CIRCNetwork(this, sNetwork);
 
 	bool bCancel = false;
-	USERMODULECALL(OnAddNetwork(*pNetwork, sErrorRet), this, NULL, &bCancel);
+	USERMODULECALL(OnAddNetwork(*pNetwork, sErrorRet), this, nullptr, &bCancel);
 	if(bCancel) {
 		RemoveNetwork(pNetwork);
 		delete pNetwork;
-		return NULL;
+		return nullptr;
 	}
 
 	return pNetwork;
@@ -483,7 +483,7 @@ bool CUser::DeleteNetwork(const CString& sNetwork) {
 
 	if (pNetwork) {
 		bool bCancel = false;
-		USERMODULECALL(OnDeleteNetwork(*pNetwork), this, NULL, &bCancel);
+		USERMODULECALL(OnDeleteNetwork(*pNetwork), this, nullptr, &bCancel);
 		if (!bCancel) {
 			delete pNetwork;
 			return true;
@@ -500,7 +500,7 @@ CIRCNetwork* CUser::FindNetwork(const CString& sNetwork) const {
 		}
 	}
 
-	return NULL;
+	return nullptr;
 }
 
 const vector<CIRCNetwork*>& CUser::GetNetworks() const {
@@ -513,7 +513,7 @@ CString CUser::ExpandString(const CString& sStr) const {
 }
 
 CString& CUser::ExpandString(const CString& sStr, CString& sRet) const {
-	CString sTime = CUtils::CTime(time(NULL), m_sTimezone);
+	CString sTime = CUtils::CTime(time(nullptr), m_sTimezone);
 
 	sRet = sStr;
 	sRet.Replace("%user%", GetUserName());
@@ -636,7 +636,7 @@ void CUser::CloneNetworks(const CUser& User) {
 			CClient *pClient = vClients.front();
 			// This line will remove pClient from vClients,
 			// because it's a reference to the internal Network's vector.
-			pClient->SetNetwork(NULL);
+			pClient->SetNetwork(nullptr);
 		}
 
 		DeleteNetwork(sNetwork);
@@ -731,9 +731,9 @@ bool CUser::Clone(const CUser& User, CString& sErrorRet, bool bCloneNetworks) {
 		CModule* pCurMod = vCurMods.FindModule(pNewMod->GetModName());
 
 		if (!pCurMod) {
-			vCurMods.LoadModule(pNewMod->GetModName(), pNewMod->GetArgs(), CModInfo::UserModule, this, NULL, sModRet);
+			vCurMods.LoadModule(pNewMod->GetModName(), pNewMod->GetArgs(), CModInfo::UserModule, this, nullptr, sModRet);
 		} else if (pNewMod->GetArgs() != pCurMod->GetArgs()) {
-			vCurMods.ReloadModule(pNewMod->GetModName(), pNewMod->GetArgs(), this, NULL, sModRet);
+			vCurMods.ReloadModule(pNewMod->GetModName(), pNewMod->GetArgs(), this, nullptr, sModRet);
 		}
 	}
 
@@ -970,7 +970,7 @@ bool CUser::PutUser(const CString& sLine, CClient* pClient, CClient* pSkipClient
 		}
 	}
 
-	return (pClient == NULL);
+	return (pClient == nullptr);
 }
 
 bool CUser::PutAllUser(const CString& sLine, CClient* pClient, CClient* pSkipClient) {
@@ -982,7 +982,7 @@ bool CUser::PutAllUser(const CString& sLine, CClient* pClient, CClient* pSkipCli
 		}
 	}
 
-	return (pClient == NULL);
+	return (pClient == nullptr);
 }
 
 bool CUser::PutStatus(const CString& sLine, CClient* pClient, CClient* pSkipClient) {
@@ -997,7 +997,7 @@ bool CUser::PutStatus(const CString& sLine, CClient* pClient, CClient* pSkipClie
 		}
 	}
 
-	return (pClient == NULL);
+	return (pClient == nullptr);
 }
 
 bool CUser::PutStatusNotice(const CString& sLine, CClient* pClient, CClient* pSkipClient) {
@@ -1012,7 +1012,7 @@ bool CUser::PutStatusNotice(const CString& sLine, CClient* pClient, CClient* pSk
 		}
 	}
 
-	return (pClient == NULL);
+	return (pClient == nullptr);
 }
 
 bool CUser::PutModule(const CString& sModule, const CString& sLine, CClient* pClient, CClient* pSkipClient) {
@@ -1026,7 +1026,7 @@ bool CUser::PutModule(const CString& sModule, const CString& sLine, CClient* pCl
 		}
 	}
 
-	return (pClient == NULL);
+	return (pClient == nullptr);
 }
 
 bool CUser::PutModNotice(const CString& sModule, const CString& sLine, CClient* pClient, CClient* pSkipClient) {
@@ -1040,7 +1040,7 @@ bool CUser::PutModNotice(const CString& sModule, const CString& sLine, CClient*
 		}
 	}
 
-	return (pClient == NULL);
+	return (pClient == nullptr);
 }
 
 CString CUser::MakeCleanUserName(const CString& sUserName) {
@@ -1096,7 +1096,7 @@ bool CUser::LoadModule(const CString& sModName, const CString& sArgs, const CStr
 			}
 		}
 	} else {
-		bModRet = GetModules().LoadModule(sModName, sArgs, CModInfo::UserModule, this, NULL, sModRet);
+		bModRet = GetModules().LoadModule(sModName, sArgs, CModInfo::UserModule, this, nullptr, sModRet);
 	}
 
 	if (!bModRet) {
diff --git a/src/Utils.cpp b/src/Utils.cpp
index 7bd4c99f..e7009c7b 100644
--- a/src/Utils.cpp
+++ b/src/Utils.cpp
@@ -270,7 +270,7 @@ bool CUtils::GetInput(const CString& sPrompt, CString& sRet, const CString& sDef
 	PrintPrompt(sPrompt + sExtra);
 	char szBuf[1024];
 	memset(szBuf, 0, 1024);
-	if (fgets(szBuf, 1024, stdin) == NULL) {
+	if (fgets(szBuf, 1024, stdin) == nullptr) {
 		// Reading failed (Error? EOF?)
 		PrintError("Error while reading from stdin. Exiting...");
 		exit(-1);
diff --git a/src/WebModules.cpp b/src/WebModules.cpp
index be344989..09361d84 100644
--- a/src/WebModules.cpp
+++ b/src/WebModules.cpp
@@ -54,9 +54,9 @@ public:
 	virtual ~CWebAuth() {}
 
 	void SetWebSock(CWebSock* pWebSock) { m_pWebSock = pWebSock; }
-	void AcceptedLogin(CUser& User);
-	void RefusedLogin(const CString& sReason);
-	void Invalidate();
+	void AcceptedLogin(CUser& User) override;
+	void RefusedLogin(const CString& sReason) override;
+	void Invalidate() override;
 private:
 protected:
 	CWebSock*   m_pWebSock;
@@ -97,7 +97,7 @@ bool CZNCTagHandler::HandleTag(CTemplate& Tmpl, const CString& sName, const CStr
 }
 
 CWebSession::CWebSession(const CString& sId, const CString& sIP) : m_sId(sId), m_sIP(sIP) {
-	m_pUser = NULL;
+	m_pUser = nullptr;
 	Sessions.m_mIPSessions.insert(make_pair(sIP, this));
 	UpdateLastActive();
 }
@@ -174,7 +174,7 @@ void CWebAuth::RefusedLogin(const CString& sReason) {
 		std::shared_ptr<CWebSession> spSession = m_pWebSock->GetSession();
 
 		spSession->AddError("Invalid login!");
-		spSession->SetUser(NULL);
+		spSession->SetUser(nullptr);
 
 		m_pWebSock->SetLoggedIn(false);
 		m_pWebSock->UnPauseRead();
@@ -186,10 +186,10 @@ void CWebAuth::RefusedLogin(const CString& sReason) {
 
 void CWebAuth::Invalidate() {
 	CAuthBase::Invalidate();
-	m_pWebSock = NULL;
+	m_pWebSock = nullptr;
 }
 
-CWebSock::CWebSock(const CString& sURIPrefix) : CHTTPSock(NULL, sURIPrefix) {
+CWebSock::CWebSock(const CString& sURIPrefix) : CHTTPSock(nullptr, sURIPrefix) {
 	m_bPathsSet = false;
 
 	m_Template.AddTagHandler(std::make_shared<CZNCTagHandler>(*this));
@@ -321,7 +321,7 @@ void CWebSock::SetPaths(CModule* pModule, bool bIsTemplate) {
 void CWebSock::SetVars() {
 	m_Template["SessionUser"] = GetUser();
 	m_Template["SessionIP"] = GetRemoteIP();
-	m_Template["Tag"] = CZNC::GetTag(GetSession()->GetUser() != NULL, true);
+	m_Template["Tag"] = CZNC::GetTag(GetSession()->GetUser() != nullptr, true);
 	m_Template["Version"] = CZNC::GetVersion();
 	m_Template["SkinName"] = GetSkinName();
 	m_Template["_CSRF_Check"] = GetCSRFCheck();
@@ -613,7 +613,7 @@ CWebSock::EPageReqResult CWebSock::OnPageRequestInternal(const CString& sURI, CS
 	} else if (sURI == "/robots.txt") {
 		return PrintStaticFile("/pub/robots.txt", sPageRet);
 	} else if (sURI == "/logout") {
-		GetSession()->SetUser(NULL);
+		GetSession()->SetUser(nullptr);
 		SetLoggedIn(false);
 		Redirect("/");
 
@@ -685,7 +685,7 @@ CWebSock::EPageReqResult CWebSock::OnPageRequestInternal(const CString& sURI, CS
 			return PAGE_DONE;
 		}
 
-		CIRCNetwork *pNetwork = NULL;
+		CIRCNetwork *pNetwork = nullptr;
 		if (eModType == CModInfo::NetworkModule) {
 			CString sNetwork = m_sPath.Token(0, false, "/");
 			m_sPath = m_sPath.Token(1, true, "/");
@@ -707,7 +707,7 @@ CWebSock::EPageReqResult CWebSock::OnPageRequestInternal(const CString& sURI, CS
 
 		DEBUG("Path [" + m_sPath + "], Module [" + m_sModName + "], Page [" + m_sPage + "]");
 
-		CModule *pModule = NULL;
+		CModule *pModule = nullptr;
 
 		switch (eModType) {
 			case CModInfo::GlobalModule:
@@ -820,7 +820,7 @@ std::shared_ptr<CWebSession> CWebSock::GetSession() {
 	const CString sCookieSessionId = GetRequestCookie("SessionId");
 	std::shared_ptr<CWebSession> *pSession = Sessions.m_mspSessions.GetItem(sCookieSessionId);
 
-	if (pSession != NULL) {
+	if (pSession != nullptr) {
 		// Refresh the timeout
 		Sessions.m_mspSessions.AddItem((*pSession)->GetId(), *pSession);
 		(*pSession)->UpdateLastActive();
@@ -842,7 +842,7 @@ std::shared_ptr<CWebSession> CWebSock::GetSession() {
 		sSessionID = CString::RandomString(32);
 		sSessionID += ":" + GetRemoteIP() + ":" + CString(GetRemotePort());
 		sSessionID += ":" + GetLocalIP()  + ":" + CString(GetLocalPort());
-		sSessionID += ":" + CString(time(NULL));
+		sSessionID += ":" + CString(time(nullptr));
 		sSessionID = sSessionID.SHA256();
 
 		DEBUG("Auto generated session: [" + sSessionID + "]");
@@ -878,7 +878,7 @@ Csock* CWebSock::GetSockObj(const CString& sHost, unsigned short uPort) {
 	// All listening is done by CListener, thus CWebSock should never have
 	// to listen, but since GetSockObj() is pure virtual...
 	DEBUG("CWebSock::GetSockObj() called - this should never happen!");
-	return NULL;
+	return nullptr;
 }
 
 CString CWebSock::GetSkinName() {
diff --git a/src/ZNCDebug.cpp b/src/ZNCDebug.cpp
index a6e1d253..6e36b577 100644
--- a/src/ZNCDebug.cpp
+++ b/src/ZNCDebug.cpp
@@ -29,7 +29,7 @@ bool CDebug::debug =
 
 CDebugStream::~CDebugStream() {
 	timeval tTime;
-	gettimeofday(&tTime, NULL);
+	gettimeofday(&tTime, nullptr);
 	time_t tSec = (time_t)tTime.tv_sec; // some systems (e.g. openbsd) define tv_sec as long int instead of time_t
 	tm tM;
 	tzset();// localtime_r requires this
diff --git a/src/ZNCString.cpp b/src/ZNCString.cpp
index abf1b473..9e9cca70 100644
--- a/src/ZNCString.cpp
+++ b/src/ZNCString.cpp
@@ -62,7 +62,7 @@ unsigned char* CString::strnchr(const unsigned char* src, unsigned char c, unsig
 		*piCount = 0;
 	}
 
-	return NULL;
+	return nullptr;
 }
 
 int CString::CaseCmp(const CString& s, CString::size_type uLen) const {
@@ -104,7 +104,7 @@ bool CString::WildCmp(const CString& sWild, const CString& sString, CaseSensitiv
 
 	// Written by Jack Handy - jakkhandy@hotmail.com
 	const char *wild = sWld.c_str(), *CString = sStr.c_str();
-	const char *cp = NULL, *mp = NULL;
+	const char *cp = nullptr, *mp = nullptr;
 
 	while ((*CString) && (*wild != '*')) {
 		if ((*wild != *CString) && (*wild != '?')) {
@@ -222,7 +222,7 @@ CString CString::Escape_n(EEscape eFrom, EEscape eTo) const {
 							base = 16;
 						}
 
-						char* endptr = NULL;
+						char* endptr = nullptr;
 						unsigned long int b = strtol((const char*) (pTmp +2 + (base == 16)), &endptr, base);
 
 						if ((*endptr == ';') && (b <= 255)) { // incase they do something like &#7777777777;
@@ -1105,15 +1105,15 @@ bool CString::ToBool() const {
 			!sTrimmed.Equals("n"));
 }
 
-short CString::ToShort() const { return (short int)strtol(this->c_str(), (char**) NULL, 10); }
-unsigned short CString::ToUShort() const { return (unsigned short int)strtoul(this->c_str(), (char**) NULL, 10); }
-unsigned int CString::ToUInt() const { return (unsigned int)strtoul(this->c_str(), (char**) NULL, 10); }
-int CString::ToInt() const { return (int)strtol(this->c_str(), (char**) NULL, 10); }
-long CString::ToLong() const { return strtol(this->c_str(), (char**) NULL, 10); }
-unsigned long CString::ToULong() const { return strtoul(c_str(), NULL, 10); }
-unsigned long long CString::ToULongLong() const { return strtoull(c_str(), NULL, 10); }
-long long CString::ToLongLong() const { return strtoll(c_str(), NULL, 10); }
-double CString::ToDouble() const { return strtod(c_str(), NULL); }
+short CString::ToShort() const { return (short int)strtol(this->c_str(), (char**) nullptr, 10); }
+unsigned short CString::ToUShort() const { return (unsigned short int)strtoul(this->c_str(), (char**) nullptr, 10); }
+unsigned int CString::ToUInt() const { return (unsigned int)strtoul(this->c_str(), (char**) nullptr, 10); }
+int CString::ToInt() const { return (int)strtol(this->c_str(), (char**) nullptr, 10); }
+long CString::ToLong() const { return strtol(this->c_str(), (char**) nullptr, 10); }
+unsigned long CString::ToULong() const { return strtoul(c_str(), nullptr, 10); }
+unsigned long long CString::ToULongLong() const { return strtoull(c_str(), nullptr, 10); }
+long long CString::ToLongLong() const { return strtoll(c_str(), nullptr, 10); }
+double CString::ToDouble() const { return strtod(c_str(), nullptr); }
 
 
 bool CString::Trim(const CString& s) {
diff --git a/src/main.cpp b/src/main.cpp
index 1ab54df2..b4ac6e12 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -99,17 +99,17 @@ static inline int getopt_long(int argc, char * const argv[], const char *optstri
 #endif
 
 static const struct option g_LongOpts[] = {
-	{ "help",        no_argument,       0, 'h' },
-	{ "version",     no_argument,       0, 'v' },
-	{ "debug",       no_argument,       0, 'D' },
-	{ "foreground",  no_argument,       0, 'f' },
-	{ "no-color",    no_argument,       0, 'n' },
-	{ "allow-root",  no_argument,       0, 'r' },
-	{ "makeconf",    no_argument,       0, 'c' },
-	{ "makepass",    no_argument,       0, 's' },
-	{ "makepem",     no_argument,       0, 'p' },
-	{ "datadir",     required_argument, 0, 'd' },
-	{ 0, 0, 0, 0 }
+	{ "help",        no_argument,       nullptr, 'h' },
+	{ "version",     no_argument,       nullptr, 'v' },
+	{ "debug",       no_argument,       nullptr, 'D' },
+	{ "foreground",  no_argument,       nullptr, 'f' },
+	{ "no-color",    no_argument,       nullptr, 'n' },
+	{ "allow-root",  no_argument,       nullptr, 'r' },
+	{ "makeconf",    no_argument,       nullptr, 'c' },
+	{ "makepass",    no_argument,       nullptr, 's' },
+	{ "makepem",     no_argument,       nullptr, 'p' },
+	{ "datadir",     required_argument, nullptr, 'd' },
+	{ nullptr, 0, nullptr, 0 }
 };
 
 static void GenerateHelp(const char *appname) {
@@ -164,14 +164,14 @@ static void seedPRNG() {
 
 	// Try to find a seed which can't be as easily guessed as only time()
 
-	if (gettimeofday(&tv, NULL) == 0) {
+	if (gettimeofday(&tv, nullptr) == 0) {
 		seed = (unsigned int)tv.tv_sec;
 
 		// This is in [0:1e6], which means that roughly 20 bits are
 		// actually used, let's try to shuffle the high bits.
 		seed ^= uint32_t((tv.tv_usec << 10) | tv.tv_usec);
 	} else
-		seed = (unsigned int)time(NULL);
+		seed = (unsigned int)time(nullptr);
 
 	seed ^= rand();
 	seed ^= getpid();
@@ -393,19 +393,19 @@ int main(int argc, char** argv) {
 	sigemptyset(&sa.sa_mask);
 
 	sa.sa_handler = SIG_IGN;
-	sigaction(SIGPIPE, &sa, (struct sigaction*) NULL);
+	sigaction(SIGPIPE, &sa, (struct sigaction*) nullptr);
 
 	sa.sa_handler = signalHandler;
-	sigaction(SIGHUP,  &sa, (struct sigaction*) NULL);
-	sigaction(SIGUSR1, &sa, (struct sigaction*) NULL);
+	sigaction(SIGHUP,  &sa, (struct sigaction*) nullptr);
+	sigaction(SIGUSR1, &sa, (struct sigaction*) nullptr);
 
 	// Once this signal is caught, the signal handler is reset
 	// to SIG_DFL. This avoids endless loop with signals.
 	sa.sa_flags = SA_RESETHAND;
 	sa.sa_handler = die;
-	sigaction(SIGINT,  &sa, (struct sigaction*) NULL);
-	sigaction(SIGQUIT, &sa, (struct sigaction*) NULL);
-	sigaction(SIGTERM, &sa, (struct sigaction*) NULL);
+	sigaction(SIGINT,  &sa, (struct sigaction*) nullptr);
+	sigaction(SIGQUIT, &sa, (struct sigaction*) nullptr);
+	sigaction(SIGTERM, &sa, (struct sigaction*) nullptr);
 
 	int iRet = 0;
 
@@ -422,10 +422,10 @@ int main(int argc, char** argv) {
 					strdup(argv[0]),
 					strdup("--datadir"),
 					strdup(pZNC->GetZNCPath().c_str()),
-					NULL,
-					NULL,
-					NULL,
-					NULL
+					nullptr,
+					nullptr,
+					nullptr,
+					nullptr
 				};
 				int pos = 3;
 				if (CDebug::Debug())
diff --git a/src/znc.cpp b/src/znc.cpp
index 7ebde5f9..15653bf8 100644
--- a/src/znc.cpp
+++ b/src/znc.cpp
@@ -48,12 +48,12 @@ CZNC::CZNC() {
 	m_uBytesRead = 0;
 	m_uBytesWritten = 0;
 	m_uiMaxBufferSize = 500;
-	m_pConnectQueueTimer = NULL;
+	m_pConnectQueueTimer = nullptr;
 	m_uiConnectPaused = 0;
 	m_eConfigState = ECONFIG_NOTHING;
-	m_TimeStarted = time(NULL);
+	m_TimeStarted = time(nullptr);
 	m_sConnectThrottle.SetTTL(30000);
-	m_pLockFile = NULL;
+	m_pLockFile = nullptr;
 	m_bProtectWebSessions = true;
 	m_bHideVersion = false;
 	m_uDisabledSSLProtocols = Csock::EDP_SSL;
@@ -80,7 +80,7 @@ CZNC::~CZNC() {
 		a->second->SetBeingDeleted(true);
 	}
 
-	m_pConnectQueueTimer = NULL;
+	m_pConnectQueueTimer = nullptr;
 	// This deletes m_pConnectQueueTimer
 	m_Manager.Cleanup();
 	DeleteUsers();
@@ -141,7 +141,7 @@ CString CZNC::GetCompileOptionsString() {
 }
 
 CString CZNC::GetUptime() const {
-	time_t now = time(NULL);
+	time_t now = time(nullptr);
 	return CString::ToTimeStr(now - TimeStarted());
 }
 
@@ -235,12 +235,12 @@ CFile* CZNC::InitPidFile() {
 		return new CFile(sFile);
 	}
 
-	return NULL;
+	return nullptr;
 }
 
 bool CZNC::WritePidFile(int iPid) {
 	CFile* File = InitPidFile();
-	if (File == NULL)
+	if (File == nullptr)
 		return false;
 
 	CUtils::PrintAction("Writing pid file [" + File->GetLongName() + "]");
@@ -259,7 +259,7 @@ bool CZNC::WritePidFile(int iPid) {
 
 bool CZNC::DeletePidFile() {
 	CFile* File = InitPidFile();
-	if (File == NULL)
+	if (File == nullptr)
 		return false;
 
 	CUtils::PrintAction("Deleting pid file [" + File->GetLongName() + "]");
@@ -1015,7 +1015,7 @@ bool CZNC::DoRehash(CString& sError)
 		if (!pOldMod) {
 			CUtils::PrintAction("Loading global module [" + sModName + "]");
 
-			bool bModRet = GetModules().LoadModule(sModName, sArgs, CModInfo::GlobalModule, NULL, NULL, sModRet);
+			bool bModRet = GetModules().LoadModule(sModName, sArgs, CModInfo::GlobalModule, nullptr, nullptr, sModRet);
 
 			CUtils::PrintStatus(bModRet, sModRet);
 			if (!bModRet) {
@@ -1025,7 +1025,7 @@ bool CZNC::DoRehash(CString& sError)
 		} else if (pOldMod->GetArgs() != sArgs) {
 			CUtils::PrintAction("Reloading global module [" + sModName + "]");
 
-			bool bModRet = GetModules().ReloadModule(sModName, sArgs, NULL, NULL, sModRet);
+			bool bModRet = GetModules().ReloadModule(sModName, sArgs, nullptr, nullptr, sModRet);
 
 			CUtils::PrintStatus(bModRet, sModRet);
 			if (!bModRet) {
@@ -1047,7 +1047,7 @@ bool CZNC::DoRehash(CString& sError)
 			CUtils::PrintAction("Loading global Module [identfile]");
 
 			CString sModRet;
-			bool bModRet = GetModules().LoadModule("identfile", "", CModInfo::GlobalModule, NULL, NULL, sModRet);
+			bool bModRet = GetModules().LoadModule("identfile", "", CModInfo::GlobalModule, nullptr, nullptr, sModRet);
 
 			CUtils::PrintStatus(bModRet, sModRet);
 			if (!bModRet) {
@@ -1184,7 +1184,7 @@ bool CZNC::DoRehash(CString& sError)
 	for (subIt = subConf.begin(); subIt != subConf.end(); ++subIt) {
 		const CString& sUserName = subIt->first;
 		CConfig* pSubConf = subIt->second.m_pSubConfig;
-		CUser* pRealUser = NULL;
+		CUser* pRealUser = nullptr;
 
 		CUtils::PrintMessage("Loading user [" + sUserName + "]");
 
@@ -1209,7 +1209,7 @@ bool CZNC::DoRehash(CString& sError)
 		if (!pUser->ParseConfig(pSubConf, sError)) {
 			CUtils::PrintError(sError);
 			delete pUser;
-			pUser = NULL;
+			pUser = nullptr;
 			return false;
 		}
 
@@ -1230,7 +1230,7 @@ bool CZNC::DoRehash(CString& sError)
 			}
 			pUser->SetBeingDeleted(true);
 			delete pUser;
-			pUser = NULL;
+			pUser = nullptr;
 		} else if (!AddUser(pUser, sErr)) {
 			sError = "Invalid user [" + pUser->GetUserName() + "] " + sErr;
 		}
@@ -1240,13 +1240,13 @@ bool CZNC::DoRehash(CString& sError)
 			if (pUser) {
 				pUser->SetBeingDeleted(true);
 				delete pUser;
-				pUser = NULL;
+				pUser = nullptr;
 			}
 			return false;
 		}
 
-		pUser = NULL;
-		pRealUser = NULL;
+		pUser = nullptr;
+		pRealUser = nullptr;
 	}
 
 	if (!config.empty()) {
@@ -1385,10 +1385,10 @@ void CZNC::Broadcast(const CString& sMessage, bool bAdminOnly,
 			CString sMsg = sMessage;
 
 			bool bContinue = false;
-			USERMODULECALL(OnBroadcast(sMsg), a->second, NULL, &bContinue);
+			USERMODULECALL(OnBroadcast(sMsg), a->second, nullptr, &bContinue);
 			if (bContinue) continue;
 
-			a->second->PutStatusNotice("*** " + sMsg, NULL, pSkipClient);
+			a->second->PutStatusNotice("*** " + sMsg, nullptr, pSkipClient);
 		}
 	}
 }
@@ -1400,7 +1400,7 @@ CModule* CZNC::FindModule(const CString& sModName, const CString& sUsername) {
 
 	CUser* pUser = FindUser(sUsername);
 
-	return (!pUser) ? NULL : pUser->GetModules().FindModule(sModName);
+	return (!pUser) ? nullptr : pUser->GetModules().FindModule(sModName);
 }
 
 CModule* CZNC::FindModule(const CString& sModName, CUser* pUser) {
@@ -1461,7 +1461,7 @@ bool CZNC::UpdateModule(const CString &sModule) {
 
 	// Reload the global module
 	if (bGlobal) {
-		if (!GetModules().LoadModule(sModule, sGlobalArgs, CModInfo::GlobalModule, NULL, NULL, sErr)) {
+		if (!GetModules().LoadModule(sModule, sGlobalArgs, CModInfo::GlobalModule, nullptr, nullptr, sErr)) {
 			DEBUG("Failed to reload [" <<  sModule << "] globally [" << sErr << "]");
 			bError = true;
 		}
@@ -1472,7 +1472,7 @@ bool CZNC::UpdateModule(const CString &sModule) {
 		CUser *pUser = musIt->first;
 		CString& sArgs = musIt->second;
 
-		if (!pUser->GetModules().LoadModule(sModule, sArgs, CModInfo::UserModule, pUser, NULL, sErr)) {
+		if (!pUser->GetModules().LoadModule(sModule, sArgs, CModInfo::UserModule, pUser, nullptr, sErr)) {
 			DEBUG("Failed to reload [" <<  sModule << "] for ["
 					<< pUser->GetUserName() << "] [" << sErr << "]");
 			bError = true;
@@ -1502,7 +1502,7 @@ CUser* CZNC::FindUser(const CString& sUsername) {
 		return it->second;
 	}
 
-	return NULL;
+	return nullptr;
 }
 
 bool CZNC::DeleteUser(const CString& sUsername) {
@@ -1517,7 +1517,7 @@ bool CZNC::DeleteUser(const CString& sUsername) {
 }
 
 bool CZNC::AddUser(CUser* pUser, CString& sErrorRet) {
-	if (FindUser(pUser->GetUserName()) != NULL) {
+	if (FindUser(pUser->GetUserName()) != nullptr) {
 		sErrorRet = "User already exists";
 		DEBUG("User [" << pUser->GetUserName() << "] - already exists");
 		return false;
@@ -1550,7 +1550,7 @@ CListener* CZNC::FindListener(u_short uPort, const CString& sBindHost, EAddrType
 			continue;
 		return *it;
 	}
-	return NULL;
+	return nullptr;
 }
 
 bool CZNC::AddListener(const CString& sLine, CString& sError) {
@@ -1769,7 +1769,7 @@ bool CZNC::DelListener(CListener* pListener) {
 	return false;
 }
 
-static CZNC* s_pZNC = NULL;
+static CZNC* s_pZNC = nullptr;
 
 void CZNC::CreateInstance() {
 	if (s_pZNC)
@@ -1784,7 +1784,7 @@ CZNC& CZNC::Get() {
 
 void CZNC::DestroyInstance() {
 	delete s_pZNC;
-	s_pZNC = NULL;
+	s_pZNC = nullptr;
 }
 
 CZNC::TrafficStatsMap CZNC::GetTrafficStats(TrafficStatsPair &Users,
@@ -1804,7 +1804,7 @@ CZNC::TrafficStatsMap CZNC::GetTrafficStats(TrafficStatsPair &Users,
 	}
 
 	for (CSockManager::const_iterator it = m_Manager.begin(); it != m_Manager.end(); ++it) {
-		CUser *pUser = NULL;
+		CUser *pUser = nullptr;
 		if ((*it)->GetSockName().Left(5) == "IRC::") {
 			pUser = ((CIRCSock *) *it)->GetNetwork()->GetUser();
 		} else if ((*it)->GetSockName().Left(5) == "USR::") {
@@ -1874,7 +1874,7 @@ public:
 	}
 
 protected:
-	virtual void RunJob() {
+	void RunJob() override {
 		list<CIRCNetwork*> ConnectionQueue;
 		list<CIRCNetwork*>& RealConnectionQueue = CZNC::Get().GetConnectionQueue();
 
@@ -1913,7 +1913,7 @@ void CZNC::SetConnectDelay(unsigned int i) {
 		// Don't hammer server with our failed connects
 		i = 1;
 	}
-	if (m_uiConnectDelay != i && m_pConnectQueueTimer != NULL) {
+	if (m_uiConnectDelay != i && m_pConnectQueueTimer != nullptr) {
 		m_pConnectQueueTimer->Start(i);
 	}
 	m_uiConnectDelay = i;
@@ -1930,7 +1930,7 @@ void CZNC::DisableConnectQueue() {
 	if (m_pConnectQueueTimer) {
 		// This will kill the cron
 		m_pConnectQueueTimer->Stop();
-		m_pConnectQueueTimer = NULL;
+		m_pConnectQueueTimer = nullptr;
 	}
 }
 
@@ -1967,7 +1967,7 @@ void CZNC::AddNetworkToQueue(CIRCNetwork *pNetwork) {
 
 void CZNC::LeakConnectQueueTimer(CConnectQueueTimer *pTimer) {
 	if (m_pConnectQueueTimer == pTimer)
-		m_pConnectQueueTimer = NULL;
+		m_pConnectQueueTimer = nullptr;
 }
 
 bool CZNC::WaitForChildLock() {