diff --git a/lib/base/application.hpp b/lib/base/application.hpp
index f45c8bdd7..95a11cc2f 100644
--- a/lib/base/application.hpp
+++ b/lib/base/application.hpp
@@ -119,7 +119,7 @@ protected:
 
 	virtual void OnShutdown();
 
-	void ValidateName(const Lazy<String>& lvalue, const ValidationUtils& utils) final;
+	void ValidateName(const Lazy<String>& lvalue, const ValidationUtils& utils) override final;
 
 private:
 	static Application::Ptr m_Instance; /**< The application instance. */
diff --git a/lib/base/exception.hpp b/lib/base/exception.hpp
index 53b7642c9..f581f4a03 100644
--- a/lib/base/exception.hpp
+++ b/lib/base/exception.hpp
@@ -35,7 +35,7 @@ public:
 	ScriptError(String message);
 	ScriptError(String message, DebugInfo di, bool incompleteExpr = false);
 
-	const char *what(void) const throw() final;
+	const char* what() const noexcept override final;
 
 	DebugInfo GetDebugInfo() const;
 	bool IsIncompleteExpression() const;
@@ -59,7 +59,7 @@ public:
 	ValidationError(const ConfigObject::Ptr& object, const std::vector<String>& attributePath, const String& message);
 	~ValidationError() throw() override;
 
-	const char *what() const throw() override;
+	const char *what() const noexcept override;
 
 	ConfigObject::Ptr GetObject() const;
 	std::vector<String> GetAttributePath() const;
@@ -118,7 +118,7 @@ String DiagnosticInformation(const boost::exception_ptr& eptr, bool verbose = tr
 
 class posix_error : virtual public std::exception, virtual public boost::exception {
 public:
-	const char* what() const noexcept final;
+	const char* what() const noexcept override final;
 
 private:
 	mutable String m_Message;
@@ -153,7 +153,7 @@ public:
 
 	~invalid_downtime_removal_error() noexcept override;
 
-	const char *what() const noexcept final;
+	const char* what() const noexcept override final;
 
 private:
 	String m_Message;
diff --git a/lib/base/logger.hpp b/lib/base/logger.hpp
index d7f30bcee..3c6bff18d 100644
--- a/lib/base/logger.hpp
+++ b/lib/base/logger.hpp
@@ -88,7 +88,7 @@ public:
 	}
 
 	void SetSeverity(const String& value, bool suppress_events = false, const Value& cookie = Empty) override;
-	void ValidateSeverity(const Lazy<String>& lvalue, const ValidationUtils& utils) final;
+	void ValidateSeverity(const Lazy<String>& lvalue, const ValidationUtils& utils) override final;
 
 protected:
 	void Start(bool runtimeCreated) override;