diff --git a/timemanager/TimeStamper.cpp b/timemanager/TimeStamper.cpp
index 07c3530c..d9f0f2f3 100644
--- a/timemanager/TimeStamper.cpp
+++ b/timemanager/TimeStamper.cpp
@@ -1,5 +1,5 @@
-#include <fsfw/timemanager/Clock.h>
-#include <fsfw/timemanager/TimeStamper.h>
+#include "TimeStamper.h"
+#include "Clock.h"
 #include <cstring>
 
 TimeStamper::TimeStamper(object_id_t objectId): SystemObject(objectId) {}
@@ -18,6 +18,6 @@ ReturnValue_t TimeStamper::addTimeStamp(uint8_t* buffer,
 	if(result != HasReturnvaluesIF::RETURN_OK){
 		return result;
 	}
-	memcpy(buffer,&cds,sizeof(cds));
+	std::memcpy(buffer,&cds,sizeof(cds));
 	return result;
 }
diff --git a/timemanager/TimeStamper.h b/timemanager/TimeStamper.h
index 80139c50..6895c14b 100644
--- a/timemanager/TimeStamper.h
+++ b/timemanager/TimeStamper.h
@@ -1,9 +1,9 @@
 #ifndef FSFW_TIMEMANAGER_TIMESTAMPER_H_
 #define FSFW_TIMEMANAGER_TIMESTAMPER_H_
 
-#include <fsfw/timemanager/TimeStamperIF.h>
-#include <fsfw/timemanager/CCSDSTime.h>
-#include <fsfw/objectmanager/SystemObject.h>
+#include "TimeStamperIF.h"
+#include "CCSDSTime.h"
+#include "../objectmanager/SystemObject.h"
 
 /**
  * @brief   Time stamper which can be used to add any timestamp to a