diff --git a/nav2_behaviors/plugins/assisted_teleop.hpp b/nav2_behaviors/include/nav2_behaviors/plugins/assisted_teleop.hpp
similarity index 100%
rename from nav2_behaviors/plugins/assisted_teleop.hpp
rename to nav2_behaviors/include/nav2_behaviors/plugins/assisted_teleop.hpp
diff --git a/nav2_behaviors/plugins/back_up.hpp b/nav2_behaviors/include/nav2_behaviors/plugins/back_up.hpp
similarity index 100%
rename from nav2_behaviors/plugins/back_up.hpp
rename to nav2_behaviors/include/nav2_behaviors/plugins/back_up.hpp
diff --git a/nav2_behaviors/plugins/drive_on_heading.hpp b/nav2_behaviors/include/nav2_behaviors/plugins/drive_on_heading.hpp
similarity index 100%
rename from nav2_behaviors/plugins/drive_on_heading.hpp
rename to nav2_behaviors/include/nav2_behaviors/plugins/drive_on_heading.hpp
diff --git a/nav2_behaviors/plugins/spin.hpp b/nav2_behaviors/include/nav2_behaviors/plugins/spin.hpp
similarity index 100%
rename from nav2_behaviors/plugins/spin.hpp
rename to nav2_behaviors/include/nav2_behaviors/plugins/spin.hpp
diff --git a/nav2_behaviors/plugins/wait.hpp b/nav2_behaviors/include/nav2_behaviors/plugins/wait.hpp
similarity index 100%
rename from nav2_behaviors/plugins/wait.hpp
rename to nav2_behaviors/include/nav2_behaviors/plugins/wait.hpp
diff --git a/nav2_behaviors/plugins/assisted_teleop.cpp b/nav2_behaviors/plugins/assisted_teleop.cpp
index 25f92fc9fe7..4628010a3de 100644
--- a/nav2_behaviors/plugins/assisted_teleop.cpp
+++ b/nav2_behaviors/plugins/assisted_teleop.cpp
@@ -14,7 +14,7 @@
 
 #include <utility>
 
-#include "assisted_teleop.hpp"
+#include "nav2_behaviors/plugins/assisted_teleop.hpp"
 #include "nav2_util/node_utils.hpp"
 
 namespace nav2_behaviors
diff --git a/nav2_behaviors/plugins/back_up.cpp b/nav2_behaviors/plugins/back_up.cpp
index aed843d75c6..1ec9e83264d 100644
--- a/nav2_behaviors/plugins/back_up.cpp
+++ b/nav2_behaviors/plugins/back_up.cpp
@@ -12,7 +12,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-#include "back_up.hpp"
+#include "nav2_behaviors/plugins/back_up.hpp"
 
 namespace nav2_behaviors
 {
diff --git a/nav2_behaviors/plugins/drive_on_heading.cpp b/nav2_behaviors/plugins/drive_on_heading.cpp
index 53525b3bb6e..9b44f0bacb8 100644
--- a/nav2_behaviors/plugins/drive_on_heading.cpp
+++ b/nav2_behaviors/plugins/drive_on_heading.cpp
@@ -14,7 +14,7 @@
 // limitations under the License.
 
 #include <memory>
-#include "drive_on_heading.hpp"
+#include "nav2_behaviors/plugins/drive_on_heading.hpp"
 
 #include "pluginlib/class_list_macros.hpp"
 PLUGINLIB_EXPORT_CLASS(nav2_behaviors::DriveOnHeading<>, nav2_core::Behavior)
diff --git a/nav2_behaviors/plugins/spin.cpp b/nav2_behaviors/plugins/spin.cpp
index 714483c85cd..1e3b07fbf1c 100644
--- a/nav2_behaviors/plugins/spin.cpp
+++ b/nav2_behaviors/plugins/spin.cpp
@@ -18,7 +18,7 @@
 #include <memory>
 #include <utility>
 
-#include "spin.hpp"
+#include "nav2_behaviors/plugins/spin.hpp"
 #include "tf2/utils.h"
 #include "tf2_geometry_msgs/tf2_geometry_msgs.hpp"
 #include "nav2_util/node_utils.hpp"
diff --git a/nav2_behaviors/plugins/wait.cpp b/nav2_behaviors/plugins/wait.cpp
index 9b006196d99..e47de4a8f80 100644
--- a/nav2_behaviors/plugins/wait.cpp
+++ b/nav2_behaviors/plugins/wait.cpp
@@ -15,7 +15,7 @@
 #include <chrono>
 #include <memory>
 
-#include "wait.hpp"
+#include "nav2_behaviors/plugins/wait.hpp"
 
 namespace nav2_behaviors
 {