diff --git a/parameters/HasParametersIF.h b/parameters/HasParametersIF.h
index 0c6afc12..005403fa 100644
--- a/parameters/HasParametersIF.h
+++ b/parameters/HasParametersIF.h
@@ -1,5 +1,5 @@
-#ifndef HASPARAMETERSIF_H_
-#define HASPARAMETERSIF_H_
+#ifndef FSFW_PARAMETERS_HASPARAMETERSIF_H_
+#define FSFW_PARAMETERS_HASPARAMETERSIF_H_
 
 #include "../parameters/ParameterWrapper.h"
 #include "../returnvalues/HasReturnvaluesIF.h"
@@ -64,4 +64,4 @@ public:
 			const ParameterWrapper *newValues, uint16_t startAtIndex) = 0;
 };
 
-#endif /* HASPARAMETERSIF_H_ */
+#endif /* FSFW_PARAMETERS_HASPARAMETERSIF_H_ */
diff --git a/parameters/ParameterHelper.cpp b/parameters/ParameterHelper.cpp
index ec7ded3c..659b00de 100644
--- a/parameters/ParameterHelper.cpp
+++ b/parameters/ParameterHelper.cpp
@@ -1,6 +1,6 @@
+#include "ParameterHelper.h"
+#include "ParameterMessage.h"
 #include "../objectmanager/ObjectManagerIF.h"
-#include "../parameters/ParameterHelper.h"
-#include "../parameters/ParameterMessage.h"
 
 ParameterHelper::ParameterHelper(ReceivesParameterMessagesIF* owner) :
 		owner(owner) {}
diff --git a/parameters/ParameterHelper.h b/parameters/ParameterHelper.h
index 5dd78b64..6b06ffdc 100644
--- a/parameters/ParameterHelper.h
+++ b/parameters/ParameterHelper.h
@@ -1,9 +1,9 @@
-#ifndef FRAMEWORK_PARAMETERS_PARAMETERHELPER_H_
-#define FRAMEWORK_PARAMETERS_PARAMETERHELPER_H_
+#ifndef FSFW_PARAMETERS_PARAMETERHELPER_H_
+#define FSFW_PARAMETERS_PARAMETERHELPER_H_
 
+#include "ParameterMessage.h"
+#include "ReceivesParameterMessagesIF.h"
 #include "../ipc/MessageQueueIF.h"
-#include "../parameters/ParameterMessage.h"
-#include "../parameters/ReceivesParameterMessagesIF.h"
 
 /**
  * @brief	Helper class to handle parameter messages
@@ -33,4 +33,4 @@ private:
 			Command_t initialCommand);
 };
 
-#endif /* PARAMETERHELPER_H_ */
+#endif /* FSFW_PARAMETERS_PARAMETERHELPER_H_ */
diff --git a/parameters/ParameterMessage.h b/parameters/ParameterMessage.h
index de68dcfc..31d7fe0b 100644
--- a/parameters/ParameterMessage.h
+++ b/parameters/ParameterMessage.h
@@ -1,8 +1,8 @@
-#ifndef PARAMETERMESSAGE_H_
-#define PARAMETERMESSAGE_H_
+#ifndef FSFW_PARAMETERS_PARAMETERMESSAGE_H_
+#define FSFW_PARAMETERS_PARAMETERMESSAGE_H_
 
+#include "HasParametersIF.h"
 #include "../ipc/CommandMessage.h"
-#include "../parameters/HasParametersIF.h"
 #include "../storagemanager/StorageManagerIF.h"
 
 class ParameterMessage {
@@ -26,4 +26,4 @@ public:
 
 };
 
-#endif /* PARAMETERMESSAGE_H_ */
+#endif /* FSFW_PARAMETERS_PARAMETERMESSAGE_H_ */
diff --git a/parameters/ParameterWrapper.cpp b/parameters/ParameterWrapper.cpp
index fd36a0a9..d020da33 100644
--- a/parameters/ParameterWrapper.cpp
+++ b/parameters/ParameterWrapper.cpp
@@ -1,4 +1,4 @@
-#include "../parameters/ParameterWrapper.h"
+#include "ParameterWrapper.h"
 
 ParameterWrapper::ParameterWrapper() :
 		pointsToStream(false), type(Type::UNKNOWN_TYPE) {
diff --git a/parameters/ParameterWrapper.h b/parameters/ParameterWrapper.h
index 35045959..f07205d4 100644
--- a/parameters/ParameterWrapper.h
+++ b/parameters/ParameterWrapper.h
@@ -1,11 +1,11 @@
-#ifndef FRAMEWORK_PARAMETERS_PARAMETERWRAPPER_H_
-#define FRAMEWORK_PARAMETERS_PARAMETERWRAPPER_H_
+#ifndef FSFW_PARAMETERS_PARAMETERWRAPPER_H_
+#define FSFW_PARAMETERS_PARAMETERWRAPPER_H_
 
 #include "../returnvalues/HasReturnvaluesIF.h"
 #include "../serialize/SerializeAdapter.h"
 #include "../serialize/SerializeIF.h"
-#include <stddef.h>
 #include "../globalfunctions/Type.h"
+#include <cstddef>
 
 /**
  * @brief
@@ -159,4 +159,4 @@ inline ReturnValue_t ParameterWrapper::getElement(T *value, uint8_t row,
 	}
 }
 
-#endif /* PARAMETERWRAPPER_H_ */
+#endif /* FSFW_PARAMETERS_PARAMETERWRAPPER_H_ */
diff --git a/parameters/ReceivesParameterMessagesIF.h b/parameters/ReceivesParameterMessagesIF.h
index f8c3746e..e8c7fa69 100644
--- a/parameters/ReceivesParameterMessagesIF.h
+++ b/parameters/ReceivesParameterMessagesIF.h
@@ -1,8 +1,8 @@
-#ifndef RECEIVESPARAMETERMESSAGESIF_H_
-#define RECEIVESPARAMETERMESSAGESIF_H_
+#ifndef FSFW_PARAMETERS_RECEIVESPARAMETERMESSAGESIF_H_
+#define FSFW_PARAMETERS_RECEIVESPARAMETERMESSAGESIF_H_
 
 
-#include "../parameters/HasParametersIF.h"
+#include "HasParametersIF.h"
 #include "../ipc/MessageQueueSenderIF.h"
 
 class ReceivesParameterMessagesIF : public HasParametersIF {
@@ -16,4 +16,4 @@ public:
 };
 
 
-#endif /* RECEIVESPARAMETERMESSAGESIF_H_ */
+#endif /* FSFW_PARAMETERS_RECEIVESPARAMETERMESSAGESIF_H_ */