diff --git a/rosplane_extra/include/input_mapper.hpp b/rosplane_extra/include/input_mapper.hpp
index df42eaf..4c34f67 100644
--- a/rosplane_extra/include/input_mapper.hpp
+++ b/rosplane_extra/include/input_mapper.hpp
@@ -2,12 +2,13 @@
 #define INPUT_MAPPER_HPP
 
 #include <rclcpp/rclcpp.hpp>
-#include <rosflight_msgs/msg/rc_raw.hpp>
 #include <rosflight_msgs/msg/command.hpp>
-#include <rosplane_msgs/msg/controller_commands.hpp>
-#include <rosplane_msgs/msg/state.hpp>
+#include <rosflight_msgs/msg/rc_raw.hpp>
 #include <std_srvs/srv/trigger.hpp>
-#include <param_manager/param_manager.hpp>
+
+#include "param_manager/param_manager.hpp"
+#include "rosplane_msgs/msg/controller_commands.hpp"
+#include "rosplane_msgs/msg/state.hpp"
 
 namespace rosplane
 {
diff --git a/rosplane_gcs/src/rviz_waypoint_publisher.cpp b/rosplane_gcs/src/rviz_waypoint_publisher.cpp
index 61df39e..f3b2908 100644
--- a/rosplane_gcs/src/rviz_waypoint_publisher.cpp
+++ b/rosplane_gcs/src/rviz_waypoint_publisher.cpp
@@ -1,15 +1,13 @@
-#include "rclcpp/rclcpp.hpp"
-#include "rosplane_msgs/msg/waypoint.hpp"
-#include "rclcpp/logging.hpp"
-#include "visualization_msgs/msg/marker.hpp"
-#include "rosplane_msgs/msg/waypoint.hpp"
-#include "rosplane_msgs/msg/state.hpp"
-// #include "geometry_msgs/msg/point.hpp"
-// #include "std_msgs/msg/header.hpp"
-#include "tf2_ros/transform_broadcaster.h"
-#include "tf2/LinearMath/Quaternion.h"
-#include "geometry_msgs/msg/transform_stamped.hpp"
 #include <ament_index_cpp/get_package_share_directory.hpp>
+#include <geometry_msgs/msg/transform_stamped.hpp>
+#include <rclcpp/logging.hpp>
+#include <rclcpp/rclcpp.hpp>
+#include <tf2/LinearMath/Quaternion.h>
+#include <tf2_ros/transform_broadcaster.h>
+#include <visualization_msgs/msg/marker.hpp>
+
+#include "rosplane_msgs/msg/state.hpp"
+#include "rosplane_msgs/msg/waypoint.hpp"
 
 #define SCALE 5.0
 #define TEXT_SCALE 15.0
diff --git a/rosplane_sim/src/gazebo_state_transcription.cpp b/rosplane_sim/src/gazebo_state_transcription.cpp
index 2b5e91b..f431267 100644
--- a/rosplane_sim/src/gazebo_state_transcription.cpp
+++ b/rosplane_sim/src/gazebo_state_transcription.cpp
@@ -1,12 +1,12 @@
+#include <chrono>
 #include <memory>
 
-#include "Eigen/Geometry"
-#include "geometry_msgs/msg/vector3_stamped.hpp"
-#include "nav_msgs/msg/odometry.hpp"
-#include "rclcpp/rclcpp.hpp"
-#include "rosplane_msgs/msg/state.hpp"
+#include <Eigen/Geometry>
+#include <geometry_msgs/msg/vector3_stamped.hpp>
+#include <nav_msgs/msg/odometry.hpp>
+#include <rclcpp/rclcpp.hpp>
 
-#include "chrono"
+#include "rosplane_msgs/msg/state.hpp"
 
 using namespace std::chrono_literals;
 using rosplane_msgs::msg::State;
diff --git a/rosplane_tuning/include/signal_generator.hpp b/rosplane_tuning/include/signal_generator.hpp
index 27437bb..9a02d08 100644
--- a/rosplane_tuning/include/signal_generator.hpp
+++ b/rosplane_tuning/include/signal_generator.hpp
@@ -42,11 +42,12 @@
 #ifndef TUNING_SIGNAL_GENERATOR_HPP
 #define TUNING_SIGNAL_GENERATOR_HPP
 
-#include "rosplane_msgs/msg/controller_commands.hpp"
 #include <rcl_interfaces/msg/set_parameters_result.hpp>
 #include <rclcpp/rclcpp.hpp>
 #include <std_srvs/srv/trigger.hpp>
 
+#include "rosplane_msgs/msg/controller_commands.hpp"
+
 namespace rosplane
 {
 /**