diff --git a/bsp_egse/ObjectFactory.cpp b/bsp_egse/ObjectFactory.cpp
index 2e2ccd68..7ccec79c 100644
--- a/bsp_egse/ObjectFactory.cpp
+++ b/bsp_egse/ObjectFactory.cpp
@@ -1,6 +1,10 @@
 #include "ObjectFactory.h"
 
 #include <devConf.h>
+#include <fsfw/src/fsfw/osal/common/TcpTmTcBridge.h>
+#include <fsfw/src/fsfw/osal/common/TcpTmTcServer.h>
+#include <fsfw_hal/linux/uart/UartComIF.h>
+#include <fsfw_hal/linux/uart/UartCookie.h>
 #include <mission/devices/GPSHyperionHandler.h>
 
 #include "OBSWConfig.h"
@@ -9,19 +13,13 @@
 #include "fsfw/tmtcpacket/pus/tm.h"
 #include "fsfw/tmtcservices/CommandingServiceBase.h"
 #include "fsfw/tmtcservices/PusServiceBase.h"
+#include "linux/devices/devicedefinitions/StarTrackerDefinitions.h"
+#include "linux/devices/startracker/StarTrackerHandler.h"
 #include "mission/core/GenericFactory.h"
 #include "mission/utility/TmFunnel.h"
 #include "objects/systemObjectList.h"
 #include "tmtc/apid.h"
 #include "tmtc/pusIds.h"
-#include "linux/devices/devicedefinitions/StarTrackerDefinitions.h"
-#include "linux/devices/startracker/StarTrackerHandler.h"
-
-#include <fsfw/src/fsfw/osal/common/TcpTmTcBridge.h>
-#include <fsfw/src/fsfw/osal/common/TcpTmTcServer.h>
-
-#include <fsfw_hal/linux/uart/UartComIF.h>
-#include <fsfw_hal/linux/uart/UartCookie.h>
 
 void Factory::setStaticFrameworkObjectIds() {
   PusServiceBase::packetSource = objects::PUS_PACKET_DISTRIBUTOR;
diff --git a/bsp_egse/boardconfig/busConf.h b/bsp_egse/boardconfig/busConf.h
index 38822dc6..4df55edc 100644
--- a/bsp_egse/boardconfig/busConf.h
+++ b/bsp_egse/boardconfig/busConf.h
@@ -2,7 +2,7 @@
 #define BSP_EGSE_BOARDCONFIG_BUSCONF_H_
 
 namespace egse {
-    static constexpr char STAR_TRACKER_UART[] = "/dev/serial0";
+static constexpr char STAR_TRACKER_UART[] = "/dev/serial0";
 }
 
 #endif /* BSP_EGSE_BOARDCONFIG_BUSCONF_H_ */
diff --git a/bsp_egse/main.cpp b/bsp_egse/main.cpp
index fc2d9a0f..4c77bbce 100644
--- a/bsp_egse/main.cpp
+++ b/bsp_egse/main.cpp
@@ -12,7 +12,8 @@
  */
 int main(void) {
   std::cout << "-- EIVE OBSW --" << std::endl;
-  std::cout << "-- Compiled for EGSE from Arcsec" << " --" << std::endl;
+  std::cout << "-- Compiled for EGSE from Arcsec"
+            << " --" << std::endl;
   std::cout << "-- OBSW " << SW_NAME << " v" << SW_VERSION << "." << SW_SUBVERSION << "."
             << SW_REVISION << ", FSFW v" << FSFW_VERSION << "." << FSFW_SUBVERSION << FSFW_REVISION
             << "--" << std::endl;
diff --git a/scripts/apply-clang-format.sh b/scripts/apply-clang-format.sh
index 55a31487..724b44a0 100755
--- a/scripts/apply-clang-format.sh
+++ b/scripts/apply-clang-format.sh
@@ -8,4 +8,5 @@ find ./linux -iname *.h -o -iname *.cpp -o -iname *.c | xargs clang-format --sty
 find ./bsp_q7s -iname *.h -o -iname *.cpp -o -iname *.c | xargs clang-format --style=file -i
 find ./bsp_linux_board -iname *.h -o -iname *.cpp -o -iname *.c | xargs clang-format --style=file -i
 find ./bsp_hosted -iname *.h -o -iname *.cpp -o -iname *.c | xargs clang-format --style=file -i
+find ./bsp_egse -iname *.h -o -iname *.cpp -o -iname *.c | xargs clang-format --style=file -i
 find ./test -iname *.h -o -iname *.cpp -o -iname *.c | xargs clang-format --style=file -i