From deeccc5850a015d0e9c6634e7d5efc21bb6563d7 Mon Sep 17 00:00:00 2001
From: AndyZe <zelenak@picknik.ai>
Date: Sun, 6 Mar 2022 17:23:17 -0600
Subject: [PATCH 1/3] Remove OgrePrerequisites include

---
 .../include/moveit/rviz_plugin_render_tools/octomap_render.h     | 1 -
 1 file changed, 1 deletion(-)

diff --git a/moveit_ros/visualization/rviz_plugin_render_tools/include/moveit/rviz_plugin_render_tools/octomap_render.h b/moveit_ros/visualization/rviz_plugin_render_tools/include/moveit/rviz_plugin_render_tools/octomap_render.h
index 11ff67c831..c4034d7e6b 100644
--- a/moveit_ros/visualization/rviz_plugin_render_tools/include/moveit/rviz_plugin_render_tools/octomap_render.h
+++ b/moveit_ros/visualization/rviz_plugin_render_tools/include/moveit/rviz_plugin_render_tools/octomap_render.h
@@ -42,7 +42,6 @@
 #include <rviz_default_plugins/displays/pointcloud/point_cloud_helpers.hpp>
 #include <rviz_common/properties/color_property.hpp>
 #include <moveit/rviz_plugin_render_tools/octomap_render.h>
-#include <OGRE/OgrePrerequisites.h>
 
 namespace octomap
 {

From 66d066d3116b2439a47174b8b0ec778881175f1b Mon Sep 17 00:00:00 2001
From: AndyZe <zelenak@picknik.ai>
Date: Mon, 14 Mar 2022 13:42:10 -0500
Subject: [PATCH 2/3] octomap_render.h includes itself

---
 .../include/moveit/rviz_plugin_render_tools/octomap_render.h     | 1 -
 1 file changed, 1 deletion(-)

diff --git a/moveit_ros/visualization/rviz_plugin_render_tools/include/moveit/rviz_plugin_render_tools/octomap_render.h b/moveit_ros/visualization/rviz_plugin_render_tools/include/moveit/rviz_plugin_render_tools/octomap_render.h
index c4034d7e6b..de4f1987b8 100644
--- a/moveit_ros/visualization/rviz_plugin_render_tools/include/moveit/rviz_plugin_render_tools/octomap_render.h
+++ b/moveit_ros/visualization/rviz_plugin_render_tools/include/moveit/rviz_plugin_render_tools/octomap_render.h
@@ -41,7 +41,6 @@
 #include <octomap/octomap.h>
 #include <rviz_default_plugins/displays/pointcloud/point_cloud_helpers.hpp>
 #include <rviz_common/properties/color_property.hpp>
-#include <moveit/rviz_plugin_render_tools/octomap_render.h>
 
 namespace octomap
 {

From 20baf334c15753ea69bed91489f642a721428719 Mon Sep 17 00:00:00 2001
From: AndyZe <zelenak@picknik.ai>
Date: Mon, 14 Mar 2022 14:03:25 -0500
Subject: [PATCH 3/3] Include OgrePrerequisites.h

---
 .../include/moveit/rviz_plugin_render_tools/octomap_render.h | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/moveit_ros/visualization/rviz_plugin_render_tools/include/moveit/rviz_plugin_render_tools/octomap_render.h b/moveit_ros/visualization/rviz_plugin_render_tools/include/moveit/rviz_plugin_render_tools/octomap_render.h
index de4f1987b8..e7b7efbe45 100644
--- a/moveit_ros/visualization/rviz_plugin_render_tools/include/moveit/rviz_plugin_render_tools/octomap_render.h
+++ b/moveit_ros/visualization/rviz_plugin_render_tools/include/moveit/rviz_plugin_render_tools/octomap_render.h
@@ -37,10 +37,11 @@
 #pragma once
 
 #include <memory>
-#include <vector>
 #include <octomap/octomap.h>
-#include <rviz_default_plugins/displays/pointcloud/point_cloud_helpers.hpp>
+#include <OgrePrerequisites.h>
 #include <rviz_common/properties/color_property.hpp>
+#include <rviz_default_plugins/displays/pointcloud/point_cloud_helpers.hpp>
+#include <vector>
 
 namespace octomap
 {