diff --git a/rosidl_generator_tests/test/rosidl_generator_cpp/test_interfaces.cpp b/rosidl_generator_tests/test/rosidl_generator_cpp/test_interfaces.cpp
index 15bb4b7ef..ae91e957e 100644
--- a/rosidl_generator_tests/test/rosidl_generator_cpp/test_interfaces.cpp
+++ b/rosidl_generator_tests/test/rosidl_generator_cpp/test_interfaces.cpp
@@ -30,7 +30,7 @@
 #include <string>
 #include <vector>
 
-#include "test_array_generator.hpp"
+#include "./test_array_generator.hpp"
 
 #include "rosidl_generator_tests/msg/arrays.hpp"
 #include "rosidl_generator_tests/msg/basic_types.hpp"
diff --git a/rosidl_typesupport_introspection_tests/test/test_arrays_message_introspection.cpp b/rosidl_typesupport_introspection_tests/test/test_arrays_message_introspection.cpp
index a134fe0e3..f3cdf6b0f 100644
--- a/rosidl_typesupport_introspection_tests/test/test_arrays_message_introspection.cpp
+++ b/rosidl_typesupport_introspection_tests/test/test_arrays_message_introspection.cpp
@@ -20,7 +20,7 @@
 #include "rosidl_typesupport_introspection_tests/api.hpp"
 #include "rosidl_typesupport_introspection_tests/type_traits.hpp"
 
-#include "introspection_libraries_under_test.hpp"
+#include "./introspection_libraries_under_test.hpp"
 
 namespace rosidl_typesupport_introspection_tests
 {
diff --git a/rosidl_typesupport_introspection_tests/test/test_arrays_service_introspection.cpp b/rosidl_typesupport_introspection_tests/test/test_arrays_service_introspection.cpp
index 512a91f26..c923b15b4 100644
--- a/rosidl_typesupport_introspection_tests/test/test_arrays_service_introspection.cpp
+++ b/rosidl_typesupport_introspection_tests/test/test_arrays_service_introspection.cpp
@@ -23,7 +23,7 @@
 #include "rosidl_typesupport_introspection_tests/srv/arrays.h"
 #include "rosidl_typesupport_introspection_tests/srv/arrays.hpp"
 
-#include "introspection_libraries_under_test.hpp"
+#include "./introspection_libraries_under_test.hpp"
 
 namespace rosidl_typesupport_introspection_tests
 {
diff --git a/rosidl_typesupport_introspection_tests/test/test_basic_types_message_introspection.cpp b/rosidl_typesupport_introspection_tests/test/test_basic_types_message_introspection.cpp
index 2926d4515..95ecffddf 100644
--- a/rosidl_typesupport_introspection_tests/test/test_basic_types_message_introspection.cpp
+++ b/rosidl_typesupport_introspection_tests/test/test_basic_types_message_introspection.cpp
@@ -20,7 +20,7 @@
 #include "rosidl_typesupport_introspection_tests/api.hpp"
 #include "rosidl_typesupport_introspection_tests/type_traits.hpp"
 
-#include "introspection_libraries_under_test.hpp"
+#include "./introspection_libraries_under_test.hpp"
 
 namespace rosidl_typesupport_introspection_tests
 {
diff --git a/rosidl_typesupport_introspection_tests/test/test_basic_types_service_introspection.cpp b/rosidl_typesupport_introspection_tests/test/test_basic_types_service_introspection.cpp
index 25e2170d1..91fdc3120 100644
--- a/rosidl_typesupport_introspection_tests/test/test_basic_types_service_introspection.cpp
+++ b/rosidl_typesupport_introspection_tests/test/test_basic_types_service_introspection.cpp
@@ -20,7 +20,7 @@
 #include "rosidl_typesupport_introspection_tests/api.hpp"
 #include "rosidl_typesupport_introspection_tests/type_traits.hpp"
 
-#include "introspection_libraries_under_test.hpp"
+#include "./introspection_libraries_under_test.hpp"
 
 namespace rosidl_typesupport_introspection_tests
 {
diff --git a/rosidl_typesupport_introspection_tests/test/test_bounded_sequences_message_introspection.cpp b/rosidl_typesupport_introspection_tests/test/test_bounded_sequences_message_introspection.cpp
index 56f8e2506..3279d45de 100644
--- a/rosidl_typesupport_introspection_tests/test/test_bounded_sequences_message_introspection.cpp
+++ b/rosidl_typesupport_introspection_tests/test/test_bounded_sequences_message_introspection.cpp
@@ -20,7 +20,7 @@
 #include "rosidl_typesupport_introspection_tests/api.hpp"
 #include "rosidl_typesupport_introspection_tests/type_traits.hpp"
 
-#include "introspection_libraries_under_test.hpp"
+#include "./introspection_libraries_under_test.hpp"
 
 namespace rosidl_typesupport_introspection_tests
 {
diff --git a/rosidl_typesupport_introspection_tests/test/test_constants_message_introspection.cpp b/rosidl_typesupport_introspection_tests/test/test_constants_message_introspection.cpp
index f16db850b..0b5ddda86 100644
--- a/rosidl_typesupport_introspection_tests/test/test_constants_message_introspection.cpp
+++ b/rosidl_typesupport_introspection_tests/test/test_constants_message_introspection.cpp
@@ -18,7 +18,7 @@
 #include "rosidl_typesupport_introspection_tests/api.hpp"
 #include "rosidl_typesupport_introspection_tests/type_traits.hpp"
 
-#include "introspection_libraries_under_test.hpp"
+#include "./introspection_libraries_under_test.hpp"
 
 namespace rosidl_typesupport_introspection_tests
 {
diff --git a/rosidl_typesupport_introspection_tests/test/test_defaults_message_introspection.cpp b/rosidl_typesupport_introspection_tests/test/test_defaults_message_introspection.cpp
index 7b5ec2cf3..0641bc85b 100644
--- a/rosidl_typesupport_introspection_tests/test/test_defaults_message_introspection.cpp
+++ b/rosidl_typesupport_introspection_tests/test/test_defaults_message_introspection.cpp
@@ -20,7 +20,7 @@
 #include "rosidl_typesupport_introspection_tests/api.hpp"
 #include "rosidl_typesupport_introspection_tests/type_traits.hpp"
 
-#include "introspection_libraries_under_test.hpp"
+#include "./introspection_libraries_under_test.hpp"
 
 namespace rosidl_typesupport_introspection_tests
 {
diff --git a/rosidl_typesupport_introspection_tests/test/test_empty_message_introspection.cpp b/rosidl_typesupport_introspection_tests/test/test_empty_message_introspection.cpp
index 3d087b254..5f8fa8200 100644
--- a/rosidl_typesupport_introspection_tests/test/test_empty_message_introspection.cpp
+++ b/rosidl_typesupport_introspection_tests/test/test_empty_message_introspection.cpp
@@ -18,7 +18,7 @@
 #include "rosidl_typesupport_introspection_tests/api.hpp"
 #include "rosidl_typesupport_introspection_tests/type_traits.hpp"
 
-#include "introspection_libraries_under_test.hpp"
+#include "./introspection_libraries_under_test.hpp"
 
 namespace rosidl_typesupport_introspection_tests
 {
diff --git a/rosidl_typesupport_introspection_tests/test/test_empty_service_introspection.cpp b/rosidl_typesupport_introspection_tests/test/test_empty_service_introspection.cpp
index 3935233f9..5da1e29d7 100644
--- a/rosidl_typesupport_introspection_tests/test/test_empty_service_introspection.cpp
+++ b/rosidl_typesupport_introspection_tests/test/test_empty_service_introspection.cpp
@@ -20,7 +20,7 @@
 #include "rosidl_typesupport_introspection_tests/api.hpp"
 #include "rosidl_typesupport_introspection_tests/type_traits.hpp"
 
-#include "introspection_libraries_under_test.hpp"
+#include "./introspection_libraries_under_test.hpp"
 
 namespace rosidl_typesupport_introspection_tests
 {
diff --git a/rosidl_typesupport_introspection_tests/test/test_multi_nested_message_introspection.cpp b/rosidl_typesupport_introspection_tests/test/test_multi_nested_message_introspection.cpp
index 558a794d2..badc35530 100644
--- a/rosidl_typesupport_introspection_tests/test/test_multi_nested_message_introspection.cpp
+++ b/rosidl_typesupport_introspection_tests/test/test_multi_nested_message_introspection.cpp
@@ -20,7 +20,7 @@
 #include "rosidl_typesupport_introspection_tests/api.hpp"
 #include "rosidl_typesupport_introspection_tests/type_traits.hpp"
 
-#include "introspection_libraries_under_test.hpp"
+#include "./introspection_libraries_under_test.hpp"
 
 namespace rosidl_typesupport_introspection_tests
 {
diff --git a/rosidl_typesupport_introspection_tests/test/test_nested_message_introspection.cpp b/rosidl_typesupport_introspection_tests/test/test_nested_message_introspection.cpp
index c0077847b..eaf67ce6b 100644
--- a/rosidl_typesupport_introspection_tests/test/test_nested_message_introspection.cpp
+++ b/rosidl_typesupport_introspection_tests/test/test_nested_message_introspection.cpp
@@ -20,7 +20,7 @@
 #include "rosidl_typesupport_introspection_tests/api.hpp"
 #include "rosidl_typesupport_introspection_tests/type_traits.hpp"
 
-#include "introspection_libraries_under_test.hpp"
+#include "./introspection_libraries_under_test.hpp"
 
 namespace rosidl_typesupport_introspection_tests
 {
diff --git a/rosidl_typesupport_introspection_tests/test/test_strings_message_introspection.cpp b/rosidl_typesupport_introspection_tests/test/test_strings_message_introspection.cpp
index e7e9803ec..f18bef077 100644
--- a/rosidl_typesupport_introspection_tests/test/test_strings_message_introspection.cpp
+++ b/rosidl_typesupport_introspection_tests/test/test_strings_message_introspection.cpp
@@ -20,7 +20,7 @@
 #include "rosidl_typesupport_introspection_tests/api.hpp"
 #include "rosidl_typesupport_introspection_tests/type_traits.hpp"
 
-#include "introspection_libraries_under_test.hpp"
+#include "./introspection_libraries_under_test.hpp"
 
 namespace rosidl_typesupport_introspection_tests
 {
diff --git a/rosidl_typesupport_introspection_tests/test/test_typesupport_introspection_libraries.cpp b/rosidl_typesupport_introspection_tests/test/test_typesupport_introspection_libraries.cpp
index 14d796925..76cd68cad 100644
--- a/rosidl_typesupport_introspection_tests/test/test_typesupport_introspection_libraries.cpp
+++ b/rosidl_typesupport_introspection_tests/test/test_typesupport_introspection_libraries.cpp
@@ -16,7 +16,7 @@
 
 #include "rosidl_typesupport_introspection_tests/gtest/typesupport_library_test.hpp"
 
-#include "introspection_libraries_under_test.hpp"
+#include "./introspection_libraries_under_test.hpp"
 
 namespace rosidl_typesupport_introspection_tests
 {
diff --git a/rosidl_typesupport_introspection_tests/test/test_unbounded_sequences_message_introspection.cpp b/rosidl_typesupport_introspection_tests/test/test_unbounded_sequences_message_introspection.cpp
index 7236b041c..017552cd2 100644
--- a/rosidl_typesupport_introspection_tests/test/test_unbounded_sequences_message_introspection.cpp
+++ b/rosidl_typesupport_introspection_tests/test/test_unbounded_sequences_message_introspection.cpp
@@ -20,7 +20,7 @@
 #include "rosidl_typesupport_introspection_tests/api.hpp"
 #include "rosidl_typesupport_introspection_tests/type_traits.hpp"
 
-#include "introspection_libraries_under_test.hpp"
+#include "./introspection_libraries_under_test.hpp"
 
 namespace rosidl_typesupport_introspection_tests
 {
diff --git a/rosidl_typesupport_introspection_tests/test/test_wstrings_message_introspection.cpp b/rosidl_typesupport_introspection_tests/test/test_wstrings_message_introspection.cpp
index d97c2d62c..5ae62b247 100644
--- a/rosidl_typesupport_introspection_tests/test/test_wstrings_message_introspection.cpp
+++ b/rosidl_typesupport_introspection_tests/test/test_wstrings_message_introspection.cpp
@@ -20,7 +20,7 @@
 #include "rosidl_typesupport_introspection_tests/api.hpp"
 #include "rosidl_typesupport_introspection_tests/type_traits.hpp"
 
-#include "introspection_libraries_under_test.hpp"
+#include "./introspection_libraries_under_test.hpp"
 
 namespace rosidl_typesupport_introspection_tests
 {