diff --git a/globalfunctions/Type.cpp b/globalfunctions/Type.cpp
index 97f38473..fa6d2f28 100644
--- a/globalfunctions/Type.cpp
+++ b/globalfunctions/Type.cpp
@@ -1,4 +1,4 @@
-#include "../globalfunctions/Type.h"
+#include "Type.h"
 #include "../serialize/SerializeAdapter.h"
 
 Type::Type() :
diff --git a/globalfunctions/Type.h b/globalfunctions/Type.h
index 8d03c467..d28f56ac 100644
--- a/globalfunctions/Type.h
+++ b/globalfunctions/Type.h
@@ -1,5 +1,5 @@
-#ifndef TYPE_H_
-#define TYPE_H_
+#ifndef FSFW_GLOBALFUNCTIONS_TYPE_H_
+#define FSFW_GLOBALFUNCTIONS_TYPE_H_
 
 #include "../returnvalues/HasReturnvaluesIF.h"
 #include "../serialize/SerializeIF.h"
@@ -95,4 +95,4 @@ struct PodTypeConversion<double> {
 	static const Type::ActualType_t type = Type::DOUBLE;
 };
 
-#endif /* TYPE_H_ */
+#endif /* FSFW_GLOBALFUNCTIONS_TYPE_H_ */