diff --git a/README.md b/README.md
index 5cc9699..3d0fb50 100644
--- a/README.md
+++ b/README.md
@@ -7,8 +7,8 @@ does limit its use to a single output type, so I've had to make a guess as to th
 
 For example:
 ```
-#include <tf2_2d/tf2_2d.h>     // This header includes the tf2 conversion functions
-#include <tf2_2d/transform.h>  // Then include what you use
+#include <tf2_2d/tf2_2d.hpp>     // This header includes the tf2 conversion functions
+#include <tf2_2d/transform.hpp>  // Then include what you use
 
 // Convert a tf2_2d object into a 3D message
 auto transform_2d = tf2_2d::Transform(1.0, 1.5, 2.0);
diff --git a/include/tf2_2d/tf2_2d.hpp b/include/tf2_2d/tf2_2d.hpp
index 7c28a9c..45c4b4d 100644
--- a/include/tf2_2d/tf2_2d.hpp
+++ b/include/tf2_2d/tf2_2d.hpp
@@ -35,7 +35,6 @@
 #define TF2_2D__TF2_2D_HPP_
 
 #include <Eigen/Core>
-#include <tf2_ros/buffer_interface.h>
 
 #include <array>
 #include <cmath>
@@ -59,6 +58,7 @@
 #include <tf2_2d/transform.hpp>
 #include <tf2_2d/vector2.hpp>
 #include <tf2_geometry_msgs/tf2_geometry_msgs.hpp>
+#include <tf2_ros/buffer_interface.hpp>
 
 #include <boost/array.hpp>
 
diff --git a/test/test_conversions.cpp b/test/test_conversions.cpp
index b4c1c00..2361b57 100644
--- a/test/test_conversions.cpp
+++ b/test/test_conversions.cpp
@@ -33,7 +33,6 @@
  */
 #include <Eigen/Core>
 #include <gtest/gtest.h>
-#include <tf2_ros/buffer_interface.h>
 
 #include <boost/array.hpp>
 #include <geometry_msgs/msg/quaternion.hpp>
@@ -54,6 +53,7 @@
 #include <tf2_2d/tf2_2d.hpp>
 #include <tf2_2d/transform.hpp>
 #include <tf2_2d/vector2.hpp>
+#include <tf2_ros/buffer_interface.hpp>
 
 
 TEST(Conversions, Vector2)