diff --git a/src/shared/drivers/timer/TimestampTimer.cpp b/src/shared/drivers/timer/TimestampTimer.cpp
index 2bd519efdcb5318375b3b9d1471f16240f5bb7f4..2eadc2650a4f2ee471bd73bb56f640baad3ca058 100644
--- a/src/shared/drivers/timer/TimestampTimer.cpp
+++ b/src/shared/drivers/timer/TimestampTimer.cpp
@@ -29,9 +29,9 @@ namespace Boardcore
 {
 namespace TimestampTimer
 {
-unsigned long long getTimestamp()
+uint64_t getTimestamp()
 {
-    return static_cast<unsigned long long>(nsToUs(miosix::getTime()));
+    return static_cast<uint64_t>(nsToUs(miosix::getTime()));
 }
 }  // namespace TimestampTimer
 }  // namespace Boardcore
diff --git a/src/shared/drivers/timer/TimestampTimer.h b/src/shared/drivers/timer/TimestampTimer.h
index eef81b209b07a616702190aa5bf98b0cbbb452b0..13fa2ed1fa833d87982bf363e1a570c3359f6ac0 100644
--- a/src/shared/drivers/timer/TimestampTimer.h
+++ b/src/shared/drivers/timer/TimestampTimer.h
@@ -22,6 +22,8 @@
 
 #pragma once
 
+#include <cstdint>
+
 namespace Boardcore
 {
 
@@ -48,6 +50,6 @@ namespace TimestampTimer
  *
  * @return Current timestamp in microseconds.
  */
-unsigned long long getTimestamp();
+uint64_t getTimestamp();
 };  // namespace TimestampTimer
 }  // namespace Boardcore