Cleanup includes

projects/can_transceiver/inc/can_transceiver.h

@@ -2,10 +2,10 @@
 
 #include <linux/can.h>
 
+#include <rclcpp/rclcpp.hpp>
 #include <string>
 
 #include "can_frame_parser.h"
-#include "rclcpp/rclcpp.hpp"
 
 /**
  * Abstract CAN Transceiver Class

projects/can_transceiver/src/can_transceiver_ros_intf.cpp

@@ -1,37 +1,24 @@
 #include <chrono>
-#include <custom_interfaces/msg/detail/ais_ships__struct.hpp>
-#include <custom_interfaces/msg/detail/batteries__struct.hpp>
-#include <custom_interfaces/msg/detail/can_sim_to_boat_sim__struct.hpp>
-#include <custom_interfaces/msg/detail/desired_heading__struct.hpp>
-#include <custom_interfaces/msg/detail/generic_sensors__struct.hpp>
-#include <custom_interfaces/msg/detail/gps__struct.hpp>
-#include <custom_interfaces/msg/detail/helper_ais_ship__struct.hpp>
-#include <custom_interfaces/msg/detail/helper_lat_lon__struct.hpp>
-#include <custom_interfaces/msg/detail/sail_cmd__struct.hpp>
-#include <custom_interfaces/msg/detail/wind_sensors__struct.hpp>
+#include <custom_interfaces/msg/ais_ships.hpp>
+#include <custom_interfaces/msg/batteries.hpp>
+#include <custom_interfaces/msg/can_sim_to_boat_sim.hpp>
+#include <custom_interfaces/msg/desired_heading.hpp>
+#include <custom_interfaces/msg/generic_sensors.hpp>
+#include <custom_interfaces/msg/gps.hpp>
+#include <custom_interfaces/msg/wind_sensors.hpp>
 #include <functional>
 #include <memory>
+#include <rclcpp/publisher.hpp>
+#include <rclcpp/rclcpp.hpp>
+#include <rclcpp/subscription.hpp>
+#include <rclcpp/timer.hpp>
+#include <std_msgs/msg/string.hpp>
 #include <string>
 #include <thread>
 
 #include "can_frame_parser.h"
 #include "can_transceiver.h"
 #include "cmn_hdrs/ros_info.h"
-#include "custom_interfaces/msg/ais_ships.hpp"
-#include "custom_interfaces/msg/batteries.hpp"
-#include "custom_interfaces/msg/can_sim_to_boat_sim.hpp"
-#include "custom_interfaces/msg/desired_heading.hpp"
-#include "custom_interfaces/msg/generic_sensors.hpp"
-#include "custom_interfaces/msg/gps.hpp"
-#include "custom_interfaces/msg/helper_generic_sensor.hpp"
-#include "custom_interfaces/msg/sail_cmd.hpp"
-#include "custom_interfaces/msg/wind_sensor.hpp"
-#include "custom_interfaces/msg/wind_sensors.hpp"
-#include "rclcpp/publisher.hpp"
-#include "rclcpp/rclcpp.hpp"
-#include "rclcpp/subscription.hpp"
-#include "rclcpp/timer.hpp"
-#include "std_msgs/msg/string.hpp"
 
 constexpr int QUEUE_SIZE        = 10;
 constexpr int PLACEHOLDER_VALUE = 42;   // Placeholder value for debugging or testing

projects/example/src/cached_fib_subscriber.cpp

@@ -1,8 +1,8 @@
 // Include this module
 #include "cached_fib.h"
 // Include ROS headers
-#include "rclcpp/rclcpp.hpp"
-#include "std_msgs/msg/u_int64.hpp"
+#include <rclcpp/rclcpp.hpp>
+#include <std_msgs/msg/u_int64.hpp>
 
 namespace
 {

projects/example/test/test_cached_fib.cpp

@@ -1,5 +1,6 @@
+#include <gtest/gtest.h>
+
 #include "cached_fib.h"
-#include "gtest/gtest.h"
 
 static constexpr int DEFAULT_SIZE = 5;
 static CachedFib     g_test_fib   = CachedFib(DEFAULT_SIZE);

projects/local_transceiver/inc/local_transceiver.h

@@ -1,20 +1,19 @@
 #pragma once
 
-#include <custom_interfaces/msg/detail/ais_ships__struct.hpp>
-#include <custom_interfaces/msg/detail/batteries__struct.hpp>
-#include <custom_interfaces/msg/detail/generic_sensors__struct.hpp>
-#include <custom_interfaces/msg/detail/l_path_data__struct.hpp>
-#include <custom_interfaces/msg/detail/wind_sensors__struct.hpp>
+#include <boost/asio/io_service.hpp>
+#include <boost/asio/serial_port.hpp>
+#include <custom_interfaces/msg/ais_ships.hpp>
+#include <custom_interfaces/msg/batteries.hpp>
+#include <custom_interfaces/msg/generic_sensors.hpp>
+#include <custom_interfaces/msg/gps.hpp>
+#include <custom_interfaces/msg/l_path_data.hpp>
+#include <custom_interfaces/msg/wind_sensors.hpp>
 #include <mutex>
+#include <rclcpp/node.hpp>
+#include <std_msgs/msg/string.hpp>
 #include <string>
 
-#include "boost/asio/io_service.hpp"
-#include "boost/asio/serial_port.hpp"
-#include "custom_interfaces/msg/ais_ships.hpp"
-#include "custom_interfaces/msg/gps.hpp"
-#include "rclcpp/node.hpp"
 #include "sensors.pb.h"
-#include "std_msgs/msg/string.hpp"
 
 namespace msg = custom_interfaces::msg;
 

projects/local_transceiver/src/local_transceiver.cpp

@@ -6,14 +6,12 @@
 #include <boost/asio/streambuf.hpp>
 #include <boost/asio/write.hpp>
 #include <boost/system/error_code.hpp>
-#include <custom_interfaces/msg/detail/batteries__struct.hpp>
-#include <custom_interfaces/msg/detail/generic_sensors__struct.hpp>
-#include <custom_interfaces/msg/detail/helper_battery__struct.hpp>
-#include <custom_interfaces/msg/detail/helper_generic_sensor__struct.hpp>
-#include <custom_interfaces/msg/detail/helper_lat_lon__struct.hpp>
-#include <custom_interfaces/msg/detail/l_path_data__struct.hpp>
-#include <custom_interfaces/msg/detail/path__struct.hpp>
-#include <custom_interfaces/msg/detail/wind_sensor__struct.hpp>
+#include <custom_interfaces/msg/ais_ships.hpp>
+#include <custom_interfaces/msg/batteries.hpp>
+#include <custom_interfaces/msg/generic_sensors.hpp>
+#include <custom_interfaces/msg/gps.hpp>
+#include <custom_interfaces/msg/l_path_data.hpp>
+#include <custom_interfaces/msg/wind_sensors.hpp>
 #include <exception>
 #include <mutex>
 #include <stdexcept>
@@ -22,13 +20,6 @@
 #include "at_cmds.h"
 #include "cmn_hdrs/ros_info.h"
 #include "cmn_hdrs/shared_constants.h"
-#include "custom_interfaces/msg/ais_ships.hpp"
-#include "custom_interfaces/msg/batteries.hpp"
-#include "custom_interfaces/msg/generic_sensors.hpp"
-#include "custom_interfaces/msg/gps.hpp"
-#include "custom_interfaces/msg/l_path_data.hpp"
-#include "custom_interfaces/msg/path.hpp"
-#include "custom_interfaces/msg/wind_sensor.hpp"
 #include "sensors.pb.h"
 #include "waypoint.pb.h"
 

projects/local_transceiver/src/local_transceiver_ros_intf.cpp

@@ -1,14 +1,14 @@
 #include <chrono>
 #include <memory>
+#include <rclcpp/publisher.hpp>
+#include <rclcpp/rclcpp.hpp>
+#include <rclcpp/subscription.hpp>
+#include <rclcpp/timer.hpp>
+#include <std_msgs/msg/string.hpp>
 
 #include "cmn_hdrs/ros_info.h"
 #include "cmn_hdrs/shared_constants.h"
 #include "local_transceiver.h"
-#include "rclcpp/publisher.hpp"
-#include "rclcpp/rclcpp.hpp"
-#include "rclcpp/subscription.hpp"
-#include "rclcpp/timer.hpp"
-#include "std_msgs/msg/string.hpp"
 
 /**
  * Local Transceiver Interface Node

projects/local_transceiver/test/test_local_transceiver.cpp

@@ -1,9 +1,10 @@
 /* IMPORTANT: Make sure only one instance of network_systems/scripts/run_virtual_iridium.sh is running */
 
+#include <gtest/gtest.h>
+
 #include <boost/system/system_error.hpp>
 
 #include "cmn_hdrs/shared_constants.h"
-#include "gtest/gtest.h"
 #include "local_transceiver.h"
 #include "sensors.pb.h"