diff --git a/rclcpp/src/rclcpp/executor.cpp b/rclcpp/src/rclcpp/executor.cpp
index 7a39c0b..3e77d95 100644
--- a/rclcpp/src/rclcpp/executor.cpp
+++ b/rclcpp/src/rclcpp/executor.cpp
@@ -13,11 +13,10 @@
 // limitations under the License.
 
 #include "rclcpp/executor.hpp"
+#include "rclcpp/scope_exit.hpp"
 
 #include "rcl_interfaces/msg/intra_process_message.hpp"
 
-#include "./scope_exit.hpp"
-
 using rclcpp::executor::AnyExecutable;
 using rclcpp::executor::Executor;
 
diff --git a/rclcpp/src/rclcpp/executors/multi_threaded_executor.cpp b/rclcpp/src/rclcpp/executors/multi_threaded_executor.cpp
index 63d555f..fc393f4 100644
--- a/rclcpp/src/rclcpp/executors/multi_threaded_executor.cpp
+++ b/rclcpp/src/rclcpp/executors/multi_threaded_executor.cpp
@@ -19,8 +19,7 @@
 #include <vector>
 
 #include "rclcpp/utilities.hpp"
-
-#include "../scope_exit.hpp"
+#include "rclcpp/scope_exit.hpp"
 
 using rclcpp::executors::multi_threaded_executor::MultiThreadedExecutor;
 
diff --git a/rclcpp/src/rclcpp/executors/single_threaded_executor.cpp b/rclcpp/src/rclcpp/executors/single_threaded_executor.cpp
index 204d422..24b6f97 100644
--- a/rclcpp/src/rclcpp/executors/single_threaded_executor.cpp
+++ b/rclcpp/src/rclcpp/executors/single_threaded_executor.cpp
@@ -12,9 +12,8 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-#include <rclcpp/executors/single_threaded_executor.hpp>
-
-#include "../scope_exit.hpp"
+#include "rclcpp/executors/single_threaded_executor.hpp"
+#include "rclcpp/scope_exit.hpp"
 
 using rclcpp::executors::single_threaded_executor::SingleThreadedExecutor;