diff --git a/timemanager/CCSDSTime.cpp b/timemanager/CCSDSTime.cpp
index 12ecf34af..f99f8fbb4 100644
--- a/timemanager/CCSDSTime.cpp
+++ b/timemanager/CCSDSTime.cpp
@@ -1,11 +1,8 @@
 #include "../timemanager/CCSDSTime.h"
-#include <stdio.h>
-#include <inttypes.h>
-#include <math.h>
+#include <cstdio>
+#include <cinttypes>
+#include <cmath>
 
-#ifndef SCNu8
-  #define SCNu8 "hhu"
-#endif
 
 CCSDSTime::CCSDSTime() {
 }
diff --git a/timemanager/CCSDSTime.h b/timemanager/CCSDSTime.h
index 8563cf0fd..89fcff92f 100644
--- a/timemanager/CCSDSTime.h
+++ b/timemanager/CCSDSTime.h
@@ -5,7 +5,7 @@
 
 #include "Clock.h"
 #include "../returnvalues/HasReturnvaluesIF.h"
-#include <stdint.h>
+#include <cstdint>
 
 bool operator<(const timeval& lhs, const timeval& rhs);
 bool operator<=(const timeval& lhs, const timeval& rhs);