diff --git a/src/fsfw/timemanager/CCSDSTime.h b/src/fsfw/timemanager/CCSDSTime.h
index 2a2316af8..f2841d0c5 100644
--- a/src/fsfw/timemanager/CCSDSTime.h
+++ b/src/fsfw/timemanager/CCSDSTime.h
@@ -6,7 +6,7 @@
 #include <cstddef>
 #include <cstdint>
 
-#include "../returnvalues/HasReturnvaluesIF.h"
+#include "fsfw/returnvalues/HasReturnvaluesIF.h"
 #include "Clock.h"
 #include "clockDefinitions.h"
 
diff --git a/src/fsfw/timemanager/Clock.h b/src/fsfw/timemanager/Clock.h
index 75c898e52..2dd01dd93 100644
--- a/src/fsfw/timemanager/Clock.h
+++ b/src/fsfw/timemanager/Clock.h
@@ -11,7 +11,7 @@
 #ifdef WIN32
 #include <winsock2.h>
 #else
-#include <sys/time.h>
+#include <ctime>
 #endif
 
 class Clock {
@@ -33,7 +33,7 @@ class Clock {
    *
    * @deprecated, we should not worry about ticks, but only time
    */
-  static uint32_t getTicksPerSecond(void);
+  static uint32_t getTicksPerSecond();
   /**
    * This system call sets the system time.
    * To set the time, it uses a TimeOfDay_t struct.
@@ -148,7 +148,7 @@ class Clock {
    * @return
    *  - @c RETURN_OK on success.
    */
-  static ReturnValue_t setLeapSeconds(const uint16_t leapSeconds_);
+  static ReturnValue_t setLeapSeconds(uint16_t leapSeconds_);
 
   /**
    * Get the Leap Seconds since 1972
diff --git a/src/fsfw/timemanager/ReceivesTimeInfoIF.h b/src/fsfw/timemanager/ReceivesTimeInfoIF.h
index 5fb915ae2..a6067a331 100644
--- a/src/fsfw/timemanager/ReceivesTimeInfoIF.h
+++ b/src/fsfw/timemanager/ReceivesTimeInfoIF.h
@@ -1,7 +1,7 @@
 #ifndef FSFW_TIMEMANAGER_RECEIVESTIMEINFOIF_H_
 #define FSFW_TIMEMANAGER_RECEIVESTIMEINFOIF_H_
 
-#include "../ipc/MessageQueueSenderIF.h"
+#include "fsfw/ipc/MessageQueueSenderIF.h"
 
 /**
  * This is a Interface for classes that receive timing information
@@ -13,11 +13,11 @@ class ReceivesTimeInfoIF {
    * Returns the id of the queue which receives the timing information.
    * @return Queue id of the timing queue.
    */
-  virtual MessageQueueId_t getTimeReceptionQueue() const = 0;
+  [[nodiscard]] virtual MessageQueueId_t getTimeReceptionQueue() const = 0;
   /**
    * Empty virtual destructor.
    */
-  virtual ~ReceivesTimeInfoIF() {}
+  virtual ~ReceivesTimeInfoIF() = default;
 };
 
 #endif /* FSFW_TIMEMANAGER_RECEIVESTIMEINFOIF_H_ */
diff --git a/src/fsfw/timemanager/TimeMessage.h b/src/fsfw/timemanager/TimeMessage.h
index ae4a9cafc..c5eed13fe 100644
--- a/src/fsfw/timemanager/TimeMessage.h
+++ b/src/fsfw/timemanager/TimeMessage.h
@@ -3,7 +3,7 @@
 
 #include <cstring>
 
-#include "../ipc/MessageQueueMessage.h"
+#include "fsfw/ipc/MessageQueueMessage.h"
 #include "Clock.h"
 
 class TimeMessage : public MessageQueueMessage {