diff --git a/tf2_ros/include/tf2_ros/message_filter.h b/tf2_ros/include/tf2_ros/message_filter.h
index 06668185d..fd461a8bc 100644
--- a/tf2_ros/include/tf2_ros/message_filter.h
+++ b/tf2_ros/include/tf2_ros/message_filter.h
@@ -47,9 +47,9 @@
 #include <utility>
 #include <vector>
 
-#include "message_filters/connection.h"
-#include "message_filters/message_traits.h"
-#include "message_filters/simple_filter.h"
+#include "message_filters/connection.hpp"
+#include "message_filters/message_traits.hpp"
+#include "message_filters/simple_filter.hpp"
 #include "tf2/buffer_core_interface.h"
 #include "tf2/time.h"
 #include "tf2_ros/async_buffer_interface.h"
diff --git a/tf2_ros/test/message_filter_test.cpp b/tf2_ros/test/message_filter_test.cpp
index 19026de81..dd1634933 100644
--- a/tf2_ros/test/message_filter_test.cpp
+++ b/tf2_ros/test/message_filter_test.cpp
@@ -33,9 +33,9 @@
 
 #include "gtest/gtest.h"
 
-#include "message_filters/subscriber.h"
-#include "message_filters/simple_filter.h"
-#include "message_filters/message_traits.h"
+#include "message_filters/subscriber.hpp"
+#include "message_filters/simple_filter.hpp"
+#include "message_filters/message_traits.hpp"
 
 #include "tf2_ros/buffer.h"
 #include "tf2_ros/create_timer_ros.h"