From 7a5fc3fad2bff701316b7d7fb26a66729bd0efa0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Alejandro=20Hern=C3=A1ndez=20Cordero?= <ahcorde@gmail.com>
Date: Fri, 22 May 2026 11:03:39 +0200
Subject: [PATCH 1/2] Cleanup headers (#928)

Signed-off-by: Alejandro Hernandez Cordero <ahcorde@gmail.com>
(cherry picked from commit 5c556d6f44708c3e9542e0e478f35cf6c2c7a97a)

# Conflicts:
#	tf2_ros/src/buffer.cpp
---
 tf2/src/cache.cpp                            | 1 -
 tf2/src/static_cache.cpp                     | 2 --
 tf2/src/time.cpp                             | 1 +
 tf2_bullet/include/tf2_bullet/tf2_bullet.hpp | 2 --
 tf2_ros/src/buffer.cpp                       | 5 ++++-
 tf2_ros/src/tf2_echo.cpp                     | 1 -
 tf2_ros/src/transform_listener.cpp           | 1 -
 7 files changed, 5 insertions(+), 8 deletions(-)

diff --git a/tf2/src/cache.cpp b/tf2/src/cache.cpp
index 5b47ad155..7b3e66e86 100644
--- a/tf2/src/cache.cpp
+++ b/tf2/src/cache.cpp
@@ -40,7 +40,6 @@
 
 #include "tf2/LinearMath/Vector3.hpp"
 #include "tf2/LinearMath/Quaternion.hpp"
-#include "tf2/LinearMath/Transform.hpp"
 
 namespace tf2
 {
diff --git a/tf2/src/static_cache.cpp b/tf2/src/static_cache.cpp
index 2c2bad202..2dbf9fed5 100644
--- a/tf2/src/static_cache.cpp
+++ b/tf2/src/static_cache.cpp
@@ -34,8 +34,6 @@
 #include "tf2/time_cache.hpp"
 #include "tf2/exceptions.hpp"
 
-#include "tf2/LinearMath/Transform.hpp"
-
 bool tf2::StaticCache::getData(
   tf2::TimePoint time,
   tf2::TransformStorage & data_out, std::string * error_str, TF2Error * error_code)
diff --git a/tf2/src/time.cpp b/tf2/src/time.cpp
index abcd83021..6be00315e 100644
--- a/tf2/src/time.cpp
+++ b/tf2/src/time.cpp
@@ -29,6 +29,7 @@
 /** \author Tully Foote */
 
 #include <chrono>
+#include <limits>
 #include <stdexcept>
 #include <string>
 
diff --git a/tf2_bullet/include/tf2_bullet/tf2_bullet.hpp b/tf2_bullet/include/tf2_bullet/tf2_bullet.hpp
index 3a495790f..152d10ddb 100644
--- a/tf2_bullet/include/tf2_bullet/tf2_bullet.hpp
+++ b/tf2_bullet/include/tf2_bullet/tf2_bullet.hpp
@@ -33,8 +33,6 @@
 #ifndef TF2_BULLET__TF2_BULLET_HPP_
 #define TF2_BULLET__TF2_BULLET_HPP_
 
-#include <iostream>
-
 #include "tf2/convert.hpp"
 #include "LinearMath/btQuaternion.h"
 #include "LinearMath/btScalar.h"
diff --git a/tf2_ros/src/buffer.cpp b/tf2_ros/src/buffer.cpp
index a5da4c57c..a6372e48c 100644
--- a/tf2_ros/src/buffer.cpp
+++ b/tf2_ros/src/buffer.cpp
@@ -33,12 +33,15 @@
 #include "tf2_ros/buffer.hpp"
 
 #include <exception>
+<<<<<<< HEAD
 #include <limits>
+=======
+#include <functional>
+>>>>>>> 5c556d6 (Cleanup headers (#928))
 #include <memory>
 #include <mutex>
 #include <sstream>
 #include <string>
-#include <thread>
 
 namespace tf2_ros
 {
diff --git a/tf2_ros/src/tf2_echo.cpp b/tf2_ros/src/tf2_echo.cpp
index 7e564e0d7..9cd9411ad 100644
--- a/tf2_ros/src/tf2_echo.cpp
+++ b/tf2_ros/src/tf2_echo.cpp
@@ -36,7 +36,6 @@
 
 #include <cmath>
 #include <cstdio>
-#include <cstring>
 #include <iomanip>
 #include <memory>
 #include <stdexcept>
diff --git a/tf2_ros/src/transform_listener.cpp b/tf2_ros/src/transform_listener.cpp
index 52467ffb2..2c9a852c0 100644
--- a/tf2_ros/src/transform_listener.cpp
+++ b/tf2_ros/src/transform_listener.cpp
@@ -30,7 +30,6 @@
 /** \author Tully Foote */
 
 #include <memory>
-#include <sstream>
 #include <string>
 #include <thread>
 #include <utility>

From e77d260f4396e9072d298a01e42c149a9323b3f6 Mon Sep 17 00:00:00 2001
From: Alejandro Hernandez Cordero <ahcorde@gmail.com>
Date: Fri, 22 May 2026 11:11:47 +0200
Subject: [PATCH 2/2] Fixed merge

Signed-off-by: Alejandro Hernandez Cordero <ahcorde@gmail.com>
---
 tf2_ros/src/buffer.cpp | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/tf2_ros/src/buffer.cpp b/tf2_ros/src/buffer.cpp
index a6372e48c..51690b199 100644
--- a/tf2_ros/src/buffer.cpp
+++ b/tf2_ros/src/buffer.cpp
@@ -33,11 +33,7 @@
 #include "tf2_ros/buffer.hpp"
 
 #include <exception>
-<<<<<<< HEAD
-#include <limits>
-=======
 #include <functional>
->>>>>>> 5c556d6 (Cleanup headers (#928))
 #include <memory>
 #include <mutex>
 #include <sstream>