diff --git a/platforms/common/include/px4_defines.h b/platforms/common/include/px4_defines.h
index 0be87fa85f..5eb4dbaecb 100644
--- a/platforms/common/include/px4_defines.h
+++ b/platforms/common/include/px4_defines.h
@@ -38,4 +38,3 @@
 #pragma once
 
 #include <px4_platform_common/defines.h>
-
diff --git a/platforms/common/include/px4_log.h b/platforms/common/include/px4_log.h
index fd055ac8b3..5558cdd5dc 100644
--- a/platforms/common/include/px4_log.h
+++ b/platforms/common/include/px4_log.h
@@ -39,4 +39,3 @@
 #pragma once
 
 #include <px4_platform_common/log.h>
-
diff --git a/platforms/common/include/px4_platform_common/app.h b/platforms/common/include/px4_platform_common/app.h
index 220712c916..bb2b923d3f 100644
--- a/platforms/common/include/px4_platform_common/app.h
+++ b/platforms/common/include/px4_platform_common/app.h
@@ -70,5 +70,3 @@ private:
 #ifdef PX4_MAIN
 extern int PX4_MAIN(int argc, char *argv[]);
 #endif
-
-
diff --git a/platforms/common/include/px4_platform_common/board_common.h b/platforms/common/include/px4_platform_common/board_common.h
index f3d2372ae8..3cfd018c70 100644
--- a/platforms/common/include/px4_platform_common/board_common.h
+++ b/platforms/common/include/px4_platform_common/board_common.h
@@ -1078,4 +1078,3 @@ __EXPORT bool board_has_bus(enum board_bus_types type, uint32_t bus);
  *               32000 resets.
  */
 int board_hardfault_init(int display_to_console, bool allow_prompt);
-
diff --git a/platforms/common/include/px4_platform_common/cli.h b/platforms/common/include/px4_platform_common/cli.h
index 2ccb9cd238..1e08cfabd0 100644
--- a/platforms/common/include/px4_platform_common/cli.h
+++ b/platforms/common/include/px4_platform_common/cli.h
@@ -50,5 +50,3 @@
  * @return 0 on success, -errno otherwise
  */
 int px4_get_parameter_value(const char *option, int &value);
-
-
diff --git a/platforms/common/include/px4_platform_common/getopt.h b/platforms/common/include/px4_platform_common/getopt.h
index ce786d9433..df74422d2c 100644
--- a/platforms/common/include/px4_platform_common/getopt.h
+++ b/platforms/common/include/px4_platform_common/getopt.h
@@ -43,4 +43,3 @@ __BEGIN_DECLS
 int px4_getopt(int argc, char *argv[], const char *options, int *myoptind, const char **myoptarg);
 
 __END_DECLS
-
diff --git a/platforms/common/include/px4_platform_common/init.h b/platforms/common/include/px4_platform_common/init.h
index a0bf68a1d2..0789dd03ba 100644
--- a/platforms/common/include/px4_platform_common/init.h
+++ b/platforms/common/include/px4_platform_common/init.h
@@ -51,4 +51,3 @@ __EXPORT void init(int argc, char *argv[], const char *process_name);
 } // namespace px4
 
 #endif /* __cplusplus */
-
diff --git a/platforms/common/include/px4_platform_common/micro_hal.h b/platforms/common/include/px4_platform_common/micro_hal.h
index 4bea4d458b..3489519406 100644
--- a/platforms/common/include/px4_platform_common/micro_hal.h
+++ b/platforms/common/include/px4_platform_common/micro_hal.h
@@ -38,4 +38,3 @@
 
 // include arch-specific header
 #include <px4_arch/micro_hal.h>
-
diff --git a/platforms/common/include/px4_platform_common/shutdown.h b/platforms/common/include/px4_platform_common/shutdown.h
index e805913777..eb2759ad34 100644
--- a/platforms/common/include/px4_platform_common/shutdown.h
+++ b/platforms/common/include/px4_platform_common/shutdown.h
@@ -96,4 +96,3 @@ __EXPORT int px4_shutdown_lock(void);
 __EXPORT int px4_shutdown_unlock(void);
 
 __END_DECLS
-
diff --git a/platforms/common/include/px4_platform_common/tasks.h b/platforms/common/include/px4_platform_common/tasks.h
index 39f922cc2e..fe3a234ab8 100644
--- a/platforms/common/include/px4_platform_common/tasks.h
+++ b/platforms/common/include/px4_platform_common/tasks.h
@@ -190,4 +190,3 @@ __EXPORT int px4_prctl(int option, const char *arg2, px4_task_t pid);
 __EXPORT const char *px4_get_taskname(void);
 
 __END_DECLS
-
diff --git a/platforms/common/include/px4_time.h b/platforms/common/include/px4_time.h
index 0881f2ad92..2726fa7339 100644
--- a/platforms/common/include/px4_time.h
+++ b/platforms/common/include/px4_time.h
@@ -38,4 +38,3 @@
 #pragma once
 
 #include <px4_platform_common/time.h>
-
diff --git a/platforms/nuttx/src/px4/common/include/px4_platform/board_determine_hw_info.h b/platforms/nuttx/src/px4/common/include/px4_platform/board_determine_hw_info.h
index cefc77ff57..e8c77771e7 100644
--- a/platforms/nuttx/src/px4/common/include/px4_platform/board_determine_hw_info.h
+++ b/platforms/nuttx/src/px4/common/include/px4_platform/board_determine_hw_info.h
@@ -59,4 +59,3 @@ __BEGIN_DECLS
 __EXPORT int board_determine_hw_info(void);
 
 __END_DECLS
-
diff --git a/platforms/nuttx/src/px4/common/include/px4_platform/gpio.h b/platforms/nuttx/src/px4/common/include/px4_platform/gpio.h
index 85a7d97fc1..905861e06e 100644
--- a/platforms/nuttx/src/px4/common/include/px4_platform/gpio.h
+++ b/platforms/nuttx/src/px4/common/include/px4_platform/gpio.h
@@ -53,4 +53,3 @@ __BEGIN_DECLS
 __EXPORT void px4_gpio_init(const uint32_t list[], int count);
 
 __END_DECLS
-
diff --git a/platforms/nuttx/src/px4/nxp/kinetis/version/CMakeLists.txt b/platforms/nuttx/src/px4/nxp/kinetis/version/CMakeLists.txt
index d9d43fae61..3303bdea43 100644
--- a/platforms/nuttx/src/px4/nxp/kinetis/version/CMakeLists.txt
+++ b/platforms/nuttx/src/px4/nxp/kinetis/version/CMakeLists.txt
@@ -35,4 +35,3 @@ px4_add_library(arch_version
 	board_identity.c
 	board_mcu_version.c
 )
-
diff --git a/platforms/nuttx/src/px4/stm/stm32_common/version/CMakeLists.txt b/platforms/nuttx/src/px4/stm/stm32_common/version/CMakeLists.txt
index d9d43fae61..3303bdea43 100644
--- a/platforms/nuttx/src/px4/stm/stm32_common/version/CMakeLists.txt
+++ b/platforms/nuttx/src/px4/stm/stm32_common/version/CMakeLists.txt
@@ -35,4 +35,3 @@ px4_add_library(arch_version
 	board_identity.c
 	board_mcu_version.c
 )
-