diff --git a/groundStation/src/cli/cli.h b/groundStation/src/cli/cli.h
index 48345bed7408932b7ae497aa6bd3642499125f93..1d0cf6951488872906ac99447fda3b7b5e9e5b7c 100644
--- a/groundStation/src/cli/cli.h
+++ b/groundStation/src/cli/cli.h
@@ -1,11 +1,11 @@
 #ifndef __CLI_H
 #define __CLI_H
 
+#include "cli_setsetpoint.h"
 #include "cli_monitor.h"
 #include "cli_setpid.h"
 #include "cli_getpid.h"
 #include "cli_getimu.h"
-#include "cli_setsetpoint.h"
 
 enum CommandNameIds{
 	CMD_MONITOR,
@@ -32,4 +32,5 @@ static char* commandNames[MAX_COMMANDS] = {
 	"getimu",
 	"setsetpoint"
 };
+
 #endif
diff --git a/groundStation/src/cli/cli_setsetpoint.c b/groundStation/src/cli/cli_setsetpoint.c
index 7ec7641d525f6bc8ef9ffe8e0f7b530f1004eeaf..85cd86d164712e0a83ef7bdc64bd1b50a0ffeee3 100644
--- a/groundStation/src/cli/cli_setsetpoint.c
+++ b/groundStation/src/cli/cli_setsetpoint.c
@@ -3,7 +3,6 @@
 #include <getopt.h>
 
 #include "cli_setsetpoint.h"
-#include "frontend_setsetpoint.h"
 
 int cli_set(struct backend_conn * conn,	int argc, char **argv) {
 	int c;
diff --git a/groundStation/src/cli/cli_setsetpoint.h b/groundStation/src/cli/cli_setsetpoint.h
index 7b5dc371f4a23779802608981e27b809f94cad42..8f2657963222181f4fcf7e20fae9242d84b37b95 100644
--- a/groundStation/src/cli/cli_setsetpoint.h
+++ b/groundStation/src/cli/cli_setsetpoint.h
@@ -5,4 +5,4 @@
 
 int cli_setsetpoint(struct backend_conn * conn, int argc, char ** argv);
 
-#endif
+#endif /* CLI_SETSETPOINT_H */
diff --git a/groundStation/src/frontend/frontend_setpid.h b/groundStation/src/frontend/frontend_setpid.h
index 5a186ca193b0d28a01c56c6161769e55fed5a66a..bd53cd4535e4aa5834e2841879fdf4dd6bdb014c 100644
--- a/groundStation/src/frontend/frontend_setpid.h
+++ b/groundStation/src/frontend/frontend_setpid.h
@@ -12,6 +12,9 @@ int frontend_setpid(
 #define SET_P 0x01
 #define SET_I 0x02
 #define SET_D 0x04
+
+#ifndef SET_ALL
 #define SET_ALL (SET_P | SET_I | SET_D)
+#endif /* SET_ALL */
 
 #endif /* FRONTEND_SETPID_H */
\ No newline at end of file
diff --git a/groundStation/src/frontend/frontend_setsetpoint.h b/groundStation/src/frontend/frontend_setsetpoint.h
index 030417b2181cd1b5e3121fbe1ac20194c7a0ce58..03806fdfe2bfb492a458475c36ffbb012586ebcd 100644
--- a/groundStation/src/frontend/frontend_setsetpoint.h
+++ b/groundStation/src/frontend/frontend_setsetpoint.h
@@ -12,6 +12,9 @@ int frontend_setsetpoint(
 #define SET_X 0x01
 #define SET_Y 0x02
 #define SET_Z 0x04
+
+#ifndef SET_ALL
 #define SET_ALL (SET_X | SET_Y | SET_Z)
+#endif /* SET_ALL */
 
 #endif /* FRONTEND_SETSETPOINT_H */
\ No newline at end of file