diff --git a/include/znc/Client.h b/include/znc/Client.h
index 11960761..fb71b509 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 = nullptr; 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;
@@ -152,15 +152,15 @@ public:
 
 	bool IsCapEnabled(const CString& sCap) const { return 1 == m_ssAcceptedCaps.count(sCap); }
 
-	virtual void ReadLine(const CString& sData);
+	virtual 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();
+	virtual void Connected() override;
+	virtual void Timeout() override;
+	virtual void Disconnected() override;
+	virtual void ConnectionRefused() override;
+	virtual void ReachedMaxBuffer() override;
 
 	void SetNick(const CString& s);
 	void SetAway(bool bAway) { m_bAway = bAway; }
diff --git a/include/znc/HTTPSock.h b/include/znc/HTTPSock.h
index 6ec5cee2..54611e07 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();
+	virtual void ReadData(const char* data, size_t len) override;
+	virtual void ReadLine(const CString& sData) override;
+	virtual void Connected() override;
 	virtual Csock* GetSockObj(const CString& sHost, unsigned short uPort) = 0;
 	// !Csocket derived members
 
diff --git a/include/znc/IRCSock.h b/include/znc/IRCSock.h
index 098a8c1c..3f99321c 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();
+	virtual void ReadLine(const CString& sData) override;
+	virtual void Connected() override;
+	virtual void Disconnected() override;
+	virtual void ConnectionRefused() override;
+	virtual void SockError(int iErrno, const CString& sDescription) override;
+	virtual void Timeout() override;
+	virtual 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 5fca2bab..f6b60cc7 100644
--- a/include/znc/Listener.h
+++ b/include/znc/Listener.h
@@ -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);
+	virtual bool ConnectionFrom(const CString& sHost, unsigned short uPort) override;
+	virtual Csock* GetSockObj(const CString& sHost, unsigned short uPort) override;
+	virtual 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();
+	virtual void ReadLine(const CString& sData) override;
+	virtual void ReachedMaxBuffer() override;
 
 private:
 	CListener::EAcceptType m_eAcceptType;
diff --git a/include/znc/Modules.h b/include/znc/Modules.h
index 0a2f4046..23352415 100644
--- a/include/znc/Modules.h
+++ b/include/znc/Modules.h
@@ -174,7 +174,7 @@ public:
 	void SetFPCallback(FPTimer_t p) { m_pFBCallback = p; }
 
 protected:
-	virtual void RunJob() {
+	virtual void RunJob() override {
 		if (m_pFBCallback) {
 			m_pFBCallback(m_pModule, this);
 		}
diff --git a/include/znc/Socket.h b/include/znc/Socket.h
index c05325e5..2efa95e1 100644
--- a/include/znc/Socket.h
+++ b/include/znc/Socket.h
@@ -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);
+	virtual void ReachedMaxBuffer() override;
+	virtual 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);
+	virtual 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/WebModules.h b/include/znc/WebModules.h
index 5a8c4bb5..7cbc8269 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);
+	virtual bool HandleTag(CTemplate& Tmpl, const CString& sName, const CString& sArgs, CString& sOutput) override;
 private:
 	CWebSock& m_WebSock;
 };
@@ -137,7 +137,7 @@ public:
 
 	std::shared_ptr<CWebSession> GetSession();
 
-	virtual Csock* GetSockObj(const CString& sHost, unsigned short uPort);
+	virtual Csock* GetSockObj(const CString& sHost, unsigned short uPort) override;
 	static CString GetSkinPath(const CString& sSkinName);
 	void GetAvailSkins(VCString& vRet) const;
 	CString GetSkinName();
diff --git a/src/IRCNetwork.cpp b/src/IRCNetwork.cpp
index 9c0b06f0..6651d6ef 100644
--- a/src/IRCNetwork.cpp
+++ b/src/IRCNetwork.cpp
@@ -38,7 +38,7 @@ public:
 	virtual ~CIRCNetworkPingTimer() {}
 
 protected:
-	virtual void RunJob() {
+	virtual void RunJob() override {
 		CIRCSock* pIRCSock = m_pNetwork->GetIRCSock();
 
 		if (pIRCSock && pIRCSock->GetTimeSinceLastDataTransaction() >= CIRCNetwork::PING_FREQUENCY) {
@@ -74,7 +74,7 @@ public:
 	}
 
 protected:
-	virtual void RunJob() {
+	virtual void RunJob() override {
 		if (m_bDelayed) {
 			m_bDelayed = false;
 			Start(CIRCNetwork::JOIN_FREQUENCY);
diff --git a/src/IRCSock.cpp b/src/IRCSock.cpp
index 105d3d8a..c24cac3a 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() {
+		virtual void RunJob() override {
 			if (m_pSock->m_iSendsAllowed < m_pSock->m_uFloodBurst) {
 				m_pSock->m_iSendsAllowed++;
 			}
diff --git a/src/Socket.cpp b/src/Socket.cpp
index e339e261..eef03067 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) {
+	virtual bool FDsThatTriggered(const std::map<int, short>& miiReadyFds) override {
 		if (miiReadyFds.find(CThreadPool::Get().getReadFD())->second) {
 			CThreadPool::Get().handlePipeReadable();
 		}
diff --git a/src/User.cpp b/src/User.cpp
index f8b7dc9d..f1028129 100644
--- a/src/User.cpp
+++ b/src/User.cpp
@@ -37,7 +37,7 @@ public:
 
 private:
 protected:
-	virtual void RunJob() {
+	virtual void RunJob() override {
 		const vector<CClient*>& vUserClients = m_pUser->GetUserClients();
 		for (size_t c = 0; c < vUserClients.size(); ++c) {
 			CClient* pUserClient = vUserClients[c];
diff --git a/src/WebModules.cpp b/src/WebModules.cpp
index 96244afc..f492501f 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;
diff --git a/src/znc.cpp b/src/znc.cpp
index 818e636e..bb3d392e 100644
--- a/src/znc.cpp
+++ b/src/znc.cpp
@@ -1874,7 +1874,7 @@ public:
 	}
 
 protected:
-	virtual void RunJob() {
+	virtual void RunJob() override {
 		list<CIRCNetwork*> ConnectionQueue;
 		list<CIRCNetwork*>& RealConnectionQueue = CZNC::Get().GetConnectionQueue();