diff --git a/bsp_q7s/core/ObjectFactory.cpp b/bsp_q7s/core/ObjectFactory.cpp
index a1faee53..1dfcd6d7 100644
--- a/bsp_q7s/core/ObjectFactory.cpp
+++ b/bsp_q7s/core/ObjectFactory.cpp
@@ -606,7 +606,7 @@ void ObjectFactory::createAcsBoardComponents(LinuxLibgpioIF* gpioComIF, UartComI
       new SpiCookie(addresses::MGM_2_LIS3, gpioIds::MGM_2_LIS3_CS, spiDev,
                     MGMLIS3MDL::MAX_BUFFER_SIZE, spi::DEFAULT_LIS3_MODE, spi::DEFAULT_LIS3_SPEED);
   mgmLis3Handler = new MgmLIS3MDLHandler(objects::MGM_2_LIS3_HANDLER, objects::SPI_COM_IF,
-                                               spiCookie, spi::LIS3_TRANSITION_DELAY);
+                                         spiCookie, spi::LIS3_TRANSITION_DELAY);
 #if OBSW_TEST_ACS == 1
   mgmLis3Handler->setStartUpImmediately();
   mgmLis3Handler->setToGoToNormalMode(true);
diff --git a/bsp_q7s/devices/PlocSupervisorHandler.h b/bsp_q7s/devices/PlocSupervisorHandler.h
index 1a77af6a..b85b8ace 100644
--- a/bsp_q7s/devices/PlocSupervisorHandler.h
+++ b/bsp_q7s/devices/PlocSupervisorHandler.h
@@ -1,11 +1,11 @@
 #ifndef MISSION_DEVICES_PLOCSUPERVISORHANDLER_H_
 #define MISSION_DEVICES_PLOCSUPERVISORHANDLER_H_
 
-#include "OBSWConfig.h"
 #include <bsp_q7s/memory/SdCardManager.h>
 #include <fsfw/devicehandlers/DeviceHandlerBase.h>
 #include <fsfw_hal/linux/uart/UartComIF.h>
 
+#include "OBSWConfig.h"
 #include "devicedefinitions/PlocSupervisorDefinitions.h"
 
 /**
diff --git a/bsp_q7s/memory/SdCardManager.cpp b/bsp_q7s/memory/SdCardManager.cpp
index 06072253..4ca11787 100644
--- a/bsp_q7s/memory/SdCardManager.cpp
+++ b/bsp_q7s/memory/SdCardManager.cpp
@@ -1,6 +1,5 @@
 #include "SdCardManager.h"
 
-#include "OBSWConfig.h"
 #include <fsfw/ipc/MutexGuard.h>
 #include <fsfw/timemanager/Countdown.h>
 #include <unistd.h>
@@ -10,6 +9,7 @@
 #include <fstream>
 #include <memory>
 
+#include "OBSWConfig.h"
 #include "common/config/commonObjects.h"
 #include "fsfw/ipc/MutexFactory.h"
 #include "fsfw/serviceinterface/ServiceInterface.h"
diff --git a/bsp_q7s/xadc/Xadc.h b/bsp_q7s/xadc/Xadc.h
index f8c6e7b6..92ec2c0c 100644
--- a/bsp_q7s/xadc/Xadc.h
+++ b/bsp_q7s/xadc/Xadc.h
@@ -2,6 +2,7 @@
 #define BSP_Q7S_XADC_XADC_H_
 
 #include <string>
+
 #include "fsfw/returnvalues/HasReturnvaluesIF.h"
 
 namespace xadc {
diff --git a/mission/devices/SolarArrayDeploymentHandler.cpp b/mission/devices/SolarArrayDeploymentHandler.cpp
index ee1dba07..9bb016b7 100644
--- a/mission/devices/SolarArrayDeploymentHandler.cpp
+++ b/mission/devices/SolarArrayDeploymentHandler.cpp
@@ -5,12 +5,10 @@
 #include <fsfw/objectmanager/ObjectManager.h>
 #include <fsfw_hal/common/gpio/GpioCookie.h>
 
-SolarArrayDeploymentHandler::SolarArrayDeploymentHandler(object_id_t setObjectId_,
-                                                         object_id_t gpioDriverId_,
-                                                         CookieIF* gpioCookie_,
-                                                         object_id_t mainLineSwitcherObjectId_,
-                                                         pcduSwitches::Switches mainLineSwitch_, gpioId_t deplSA1,
-                                                         gpioId_t deplSA2, uint32_t burnTimeMs)
+SolarArrayDeploymentHandler::SolarArrayDeploymentHandler(
+    object_id_t setObjectId_, object_id_t gpioDriverId_, CookieIF* gpioCookie_,
+    object_id_t mainLineSwitcherObjectId_, pcduSwitches::Switches mainLineSwitch_, gpioId_t deplSA1,
+    gpioId_t deplSA2, uint32_t burnTimeMs)
     : SystemObject(setObjectId_),
       gpioDriverId(gpioDriverId_),
       gpioCookie(gpioCookie_),
diff --git a/mission/devices/SolarArrayDeploymentHandler.h b/mission/devices/SolarArrayDeploymentHandler.h
index 1e5bd9b1..e5d91d3d 100644
--- a/mission/devices/SolarArrayDeploymentHandler.h
+++ b/mission/devices/SolarArrayDeploymentHandler.h
@@ -2,7 +2,6 @@
 #define MISSION_DEVICES_SOLARARRAYDEPLOYMENT_H_
 
 #include <devices/powerSwitcherList.h>
-
 #include <fsfw/action/HasActionsIF.h>
 #include <fsfw/devicehandlers/CookieIF.h>
 #include <fsfw/devicehandlers/DeviceHandlerIF.h>
@@ -44,8 +43,8 @@ class SolarArrayDeploymentHandler : public ExecutableObjectIF,
    */
   SolarArrayDeploymentHandler(object_id_t setObjectId, object_id_t gpioDriverId,
                               CookieIF* gpioCookie, object_id_t mainLineSwitcherObjectId,
-                              pcduSwitches::Switches mainLineSwitch, gpioId_t deplSA1, gpioId_t deplSA2,
-                              uint32_t burnTimeMs);
+                              pcduSwitches::Switches mainLineSwitch, gpioId_t deplSA1,
+                              gpioId_t deplSA2, uint32_t burnTimeMs);
 
   virtual ~SolarArrayDeploymentHandler();