diff --git a/mavros/src/plugins/command.cpp b/mavros/src/plugins/command.cpp
index f16e17a38..ffe09f51d 100644
--- a/mavros/src/plugins/command.cpp
+++ b/mavros/src/plugins/command.cpp
@@ -127,7 +127,7 @@ class CommandPlugin : public plugin::Plugin
       "~/land",
       std::bind(&CommandPlugin::land_cb, this, _1, _2, _3), rmw_qos_profile_services_default,
       srv_cg);
-    land_local_srv = 
+    land_local_srv =
       node->create_service<mavros_msgs::srv::CommandTOLLocal>(
       "~/land_local",
       std::bind(&CommandPlugin::land_local_cb, this, _1, _2, _3), rmw_qos_profile_services_default,
diff --git a/mavros_extras/src/plugins/fake_gps.cpp b/mavros_extras/src/plugins/fake_gps.cpp
index cd86bf6e4..2a5b99fb4 100644
--- a/mavros_extras/src/plugins/fake_gps.cpp
+++ b/mavros_extras/src/plugins/fake_gps.cpp
@@ -18,12 +18,12 @@
  * @{
  */
 
-#include <tf2_eigen/tf2_eigen.h>
+#include <string>
+
+#include <tf2_eigen/tf2_eigen.hpp>
 #include <GeographicLib/Geocentric.hpp>
 #include <GeographicLib/Geoid.hpp>
 
-#include <string>
-
 #include "rcpputils/asserts.hpp"
 #include "mavros/mavros_uas.hpp"
 #include "mavros/plugin.hpp"
diff --git a/mavros_extras/src/plugins/onboard_computer_status.cpp b/mavros_extras/src/plugins/onboard_computer_status.cpp
index 980447383..4899fc3fa 100644
--- a/mavros_extras/src/plugins/onboard_computer_status.cpp
+++ b/mavros_extras/src/plugins/onboard_computer_status.cpp
@@ -99,7 +99,9 @@ class OnboardComputerStatusPlugin : public plugin::Plugin
     std::copy(req->cpu_combined.cbegin(), req->cpu_combined.cend(), status.cpu_combined.begin());
     std::copy(req->gpu_cores.cbegin(), req->gpu_cores.cend(), status.gpu_cores.begin());
     std::copy(req->gpu_combined.cbegin(), req->gpu_combined.cend(), status.gpu_combined.begin());
-    std::copy(req->temperature_core.cbegin(), req->temperature_core.cend(), status.temperature_core.begin());
+    std::copy(
+      req->temperature_core.cbegin(),
+      req->temperature_core.cend(), status.temperature_core.begin());
     std::copy(req->fan_speed.cbegin(), req->fan_speed.cend(), status.fan_speed.begin());
     std::copy(req->storage_type.cbegin(), req->storage_type.cend(), status.storage_type.begin());
     std::copy(req->storage_usage.cbegin(), req->storage_usage.cend(), status.storage_usage.begin());