diff --git a/final/eventloop/kqueue_timer.cpp b/final/eventloop/kqueue_timer.cpp
index 04ec5549..9cb2ac7e 100644
--- a/final/eventloop/kqueue_timer.cpp
+++ b/final/eventloop/kqueue_timer.cpp
@@ -95,7 +95,7 @@ static std::vector<struct kevent> time_events{};
 // class KqueueHandler
 //----------------------------------------------------------------------
 
-class KqueueHandler
+class KqueueHandler final
 {
   public:
     // Constructor
@@ -212,7 +212,7 @@ void KqueueTimer::init (handler_t hdl, void* uc)
 
   setFileDescriptor (getKqueue());
   setEvents (POLLIN);
-  setHandler (std::move(KqueueHandler()));
+  setHandler (KqueueHandler());
   setUserContext (uc);
   timer_id = getTimerID();
   timer_handler = std::move(hdl);
@@ -250,7 +250,7 @@ void KqueueTimer::trigger (short return_events)
 // struct KqueueHandlerInstaller
 //----------------------------------------------------------------------
 
-struct KqueueHandlerInstaller
+struct KqueueHandlerInstaller final
 {
   // constructor
   KqueueHandlerInstaller()
diff --git a/final/eventloop/posix_timer.cpp b/final/eventloop/posix_timer.cpp
index 98c12864..4eba745a 100644
--- a/final/eventloop/posix_timer.cpp
+++ b/final/eventloop/posix_timer.cpp
@@ -53,7 +53,7 @@ namespace finalcut
 // struct TimerNode
 //----------------------------------------------------------------------
 
-struct TimerNode
+struct TimerNode final
 {
   public:
     // Constructor
@@ -91,7 +91,7 @@ static std::list<TimerNode> timer_nodes{};
 // class SigAlrmHandler
 //----------------------------------------------------------------------
 
-class SigAlrmHandler
+class SigAlrmHandler final
 {
   public:
     // Using-declaration
@@ -240,7 +240,7 @@ void PosixTimer::trigger (short return_events)
 // class SigAlrmHandlerInstaller
 //----------------------------------------------------------------------
 
-class SigAlrmHandlerInstaller
+class SigAlrmHandlerInstaller final
 {
   public:
     SigAlrmHandlerInstaller()  // constructor