diff --git a/src/image_view/image_view.cpp b/src/image_view/image_view.cpp
index c45ff8e88e..b5cfa30411 100644
--- a/src/image_view/image_view.cpp
+++ b/src/image_view/image_view.cpp
@@ -38,14 +38,14 @@
 #include "ros/ros.h"
 #include <ros/package.h>
 
-#include <OGRE/OgreRoot.h>
-#include <OGRE/OgreRenderWindow.h>
-#include <OGRE/OgreSceneManager.h>
-#include <OGRE/OgreViewport.h>
-#include <OGRE/OgreRectangle2D.h>
-#include <OGRE/OgreMaterial.h>
-#include <OGRE/OgreMaterialManager.h>
-#include <OGRE/OgreTextureUnitState.h>
+#include <OgreRoot.h>
+#include <OgreRenderWindow.h>
+#include <OgreSceneManager.h>
+#include <OgreViewport.h>
+#include <OgreRectangle2D.h>
+#include <OgreMaterial.h>
+#include <OgreMaterialManager.h>
+#include <OgreTextureUnitState.h>
 
 #include "image_view.h"
 
diff --git a/src/image_view/image_view.h b/src/image_view/image_view.h
index 8e98be05c1..e3ecfe8658 100644
--- a/src/image_view/image_view.h
+++ b/src/image_view/image_view.h
@@ -35,13 +35,13 @@
 # include "ros/ros.h"
 # include <ros/package.h>
 
-# include <OGRE/OgreRoot.h>
-# include <OGRE/OgreSceneManager.h>
-# include <OGRE/OgreViewport.h>
-# include <OGRE/OgreRectangle2D.h>
-# include <OGRE/OgreMaterial.h>
-# include <OGRE/OgreMaterialManager.h>
-# include <OGRE/OgreTextureUnitState.h>
+# include <OgreRoot.h>
+# include <OgreSceneManager.h>
+# include <OgreViewport.h>
+# include <OgreRectangle2D.h>
+# include <OgreMaterial.h>
+# include <OgreMaterialManager.h>
+# include <OgreTextureUnitState.h>
 
 # include <image_transport/image_transport.h>
 # include <image_transport/subscriber_filter.h>
diff --git a/src/rviz/default_plugin/axes_display.cpp b/src/rviz/default_plugin/axes_display.cpp
index ae0e6c5699..9e93cb1ec3 100644
--- a/src/rviz/default_plugin/axes_display.cpp
+++ b/src/rviz/default_plugin/axes_display.cpp
@@ -29,8 +29,8 @@
 
 #include <boost/bind.hpp>
 
-#include <OGRE/OgreSceneNode.h>
-#include <OGRE/OgreSceneManager.h>
+#include <OgreSceneNode.h>
+#include <OgreSceneManager.h>
 
 #include "rviz/display_context.h"
 #include "rviz/frame_manager.h"
diff --git a/src/rviz/default_plugin/camera_display.cpp b/src/rviz/default_plugin/camera_display.cpp
index a9792c6021..f8143db561 100644
--- a/src/rviz/default_plugin/camera_display.cpp
+++ b/src/rviz/default_plugin/camera_display.cpp
@@ -29,15 +29,15 @@
 
 #include <boost/bind.hpp>
 
-#include <OGRE/OgreManualObject.h>
-#include <OGRE/OgreMaterialManager.h>
-#include <OGRE/OgreRectangle2D.h>
-#include <OGRE/OgreRenderSystem.h>
-#include <OGRE/OgreRenderWindow.h>
-#include <OGRE/OgreSceneManager.h>
-#include <OGRE/OgreSceneNode.h>
-#include <OGRE/OgreTextureManager.h>
-#include <OGRE/OgreViewport.h>
+#include <OgreManualObject.h>
+#include <OgreMaterialManager.h>
+#include <OgreRectangle2D.h>
+#include <OgreRenderSystem.h>
+#include <OgreRenderWindow.h>
+#include <OgreSceneManager.h>
+#include <OgreSceneNode.h>
+#include <OgreTextureManager.h>
+#include <OgreViewport.h>
 
 #include <tf/transform_listener.h>
 
diff --git a/src/rviz/default_plugin/camera_display.h b/src/rviz/default_plugin/camera_display.h
index 1cfc2e0f79..266d4b6b10 100644
--- a/src/rviz/default_plugin/camera_display.h
+++ b/src/rviz/default_plugin/camera_display.h
@@ -32,8 +32,8 @@
 
 #include <QObject>
 
-#include <OGRE/OgreMaterial.h>
-#include <OGRE/OgreRenderTargetListener.h>
+#include <OgreMaterial.h>
+#include <OgreRenderTargetListener.h>
 
 #ifndef Q_MOC_RUN
 # include <sensor_msgs/CameraInfo.h>
diff --git a/src/rviz/default_plugin/depth_cloud_display.cpp b/src/rviz/default_plugin/depth_cloud_display.cpp
index e1fecd6b55..4dc68ef135 100644
--- a/src/rviz/default_plugin/depth_cloud_display.cpp
+++ b/src/rviz/default_plugin/depth_cloud_display.cpp
@@ -46,8 +46,8 @@
 #include <boost/foreach.hpp>
 #include <boost/shared_ptr.hpp>
 
-#include <OGRE/OgreSceneNode.h>
-#include <OGRE/OgreSceneManager.h>
+#include <OgreSceneNode.h>
+#include <OgreSceneManager.h>
 
 #include <image_transport/camera_common.h>
 #include <image_transport/subscriber_plugin.h>
diff --git a/src/rviz/default_plugin/effort_display.cpp b/src/rviz/default_plugin/effort_display.cpp
index 3beb37939c..0071436e02 100644
--- a/src/rviz/default_plugin/effort_display.cpp
+++ b/src/rviz/default_plugin/effort_display.cpp
@@ -1,5 +1,5 @@
-#include <OGRE/OgreSceneNode.h>
-#include <OGRE/OgreSceneManager.h>
+#include <OgreSceneNode.h>
+#include <OgreSceneManager.h>
 
 #include <tf/transform_listener.h>
 
diff --git a/src/rviz/default_plugin/effort_visual.cpp b/src/rviz/default_plugin/effort_visual.cpp
index 1885b34e8c..775ba7b257 100644
--- a/src/rviz/default_plugin/effort_visual.cpp
+++ b/src/rviz/default_plugin/effort_visual.cpp
@@ -1,6 +1,6 @@
-#include <OGRE/OgreVector3.h>
-#include <OGRE/OgreSceneNode.h>
-#include <OGRE/OgreSceneManager.h>
+#include <OgreVector3.h>
+#include <OgreSceneNode.h>
+#include <OgreSceneManager.h>
 
 #include <rviz/ogre_helpers/arrow.h>
 #include <rviz/ogre_helpers/billboard_line.h>
diff --git a/src/rviz/default_plugin/fluid_pressure_display.cpp b/src/rviz/default_plugin/fluid_pressure_display.cpp
index 8da1116b4a..3713bd41f3 100644
--- a/src/rviz/default_plugin/fluid_pressure_display.cpp
+++ b/src/rviz/default_plugin/fluid_pressure_display.cpp
@@ -27,8 +27,8 @@
  * POSSIBILITY OF SUCH DAMAGE.
  */
 
-#include <OGRE/OgreSceneNode.h>
-#include <OGRE/OgreSceneManager.h>
+#include <OgreSceneNode.h>
+#include <OgreSceneManager.h>
 
 #include <ros/time.h>
 
diff --git a/src/rviz/default_plugin/grid_cells_display.cpp b/src/rviz/default_plugin/grid_cells_display.cpp
index 0399600cd3..17746fb481 100644
--- a/src/rviz/default_plugin/grid_cells_display.cpp
+++ b/src/rviz/default_plugin/grid_cells_display.cpp
@@ -29,10 +29,10 @@
 
 #include <boost/bind.hpp>
 
-#include <OGRE/OgreSceneNode.h>
-#include <OGRE/OgreSceneManager.h>
-#include <OGRE/OgreManualObject.h>
-#include <OGRE/OgreBillboardSet.h>
+#include <OgreSceneNode.h>
+#include <OgreSceneManager.h>
+#include <OgreManualObject.h>
+#include <OgreBillboardSet.h>
 
 #include <tf/transform_listener.h>
 
diff --git a/src/rviz/default_plugin/grid_display.cpp b/src/rviz/default_plugin/grid_display.cpp
index d6691d2380..a2939e0475 100644
--- a/src/rviz/default_plugin/grid_display.cpp
+++ b/src/rviz/default_plugin/grid_display.cpp
@@ -31,8 +31,8 @@
 
 #include <boost/bind.hpp>
 
-#include <OGRE/OgreSceneNode.h>
-#include <OGRE/OgreSceneManager.h>
+#include <OgreSceneNode.h>
+#include <OgreSceneManager.h>
 
 #include "rviz/display_context.h"
 #include "rviz/frame_manager.h"
diff --git a/src/rviz/default_plugin/illuminance_display.cpp b/src/rviz/default_plugin/illuminance_display.cpp
index 008881f1e8..b5168979ac 100644
--- a/src/rviz/default_plugin/illuminance_display.cpp
+++ b/src/rviz/default_plugin/illuminance_display.cpp
@@ -27,8 +27,8 @@
  * POSSIBILITY OF SUCH DAMAGE.
  */
 
-#include <OGRE/OgreSceneNode.h>
-#include <OGRE/OgreSceneManager.h>
+#include <OgreSceneNode.h>
+#include <OgreSceneManager.h>
 
 #include <ros/time.h>
 
diff --git a/src/rviz/default_plugin/image_display.cpp b/src/rviz/default_plugin/image_display.cpp
index 4567872bbb..ee70131aed 100644
--- a/src/rviz/default_plugin/image_display.cpp
+++ b/src/rviz/default_plugin/image_display.cpp
@@ -29,16 +29,16 @@
 
 #include <boost/bind.hpp>
 
-#include <OGRE/OgreManualObject.h>
-#include <OGRE/OgreMaterialManager.h>
-#include <OGRE/OgreRectangle2D.h>
-#include <OGRE/OgreRenderSystem.h>
-#include <OGRE/OgreRenderWindow.h>
-#include <OGRE/OgreRoot.h>
-#include <OGRE/OgreSceneManager.h>
-#include <OGRE/OgreSceneNode.h>
-#include <OGRE/OgreTextureManager.h>
-#include <OGRE/OgreViewport.h>
+#include <OgreManualObject.h>
+#include <OgreMaterialManager.h>
+#include <OgreRectangle2D.h>
+#include <OgreRenderSystem.h>
+#include <OgreRenderWindow.h>
+#include <OgreRoot.h>
+#include <OgreSceneManager.h>
+#include <OgreSceneNode.h>
+#include <OgreTextureManager.h>
+#include <OgreViewport.h>
 
 #include <tf/transform_listener.h>
 
diff --git a/src/rviz/default_plugin/image_display.h b/src/rviz/default_plugin/image_display.h
index 84b0225a61..6a74d53aa6 100644
--- a/src/rviz/default_plugin/image_display.h
+++ b/src/rviz/default_plugin/image_display.h
@@ -33,8 +33,8 @@
 #ifndef Q_MOC_RUN  // See: https://bugreports.qt-project.org/browse/QTBUG-22829
 # include <QObject>
 
-# include <OGRE/OgreMaterial.h>
-# include <OGRE/OgreRenderTargetListener.h>
+# include <OgreMaterial.h>
+# include <OgreRenderTargetListener.h>
 
 # include "rviz/image/image_display_base.h"
 # include "rviz/image/ros_image_texture.h"
diff --git a/src/rviz/default_plugin/interactive_markers/interactive_marker.cpp b/src/rviz/default_plugin/interactive_markers/interactive_marker.cpp
index 23fcba1622..c436a2ec1d 100644
--- a/src/rviz/default_plugin/interactive_markers/interactive_marker.cpp
+++ b/src/rviz/default_plugin/interactive_markers/interactive_marker.cpp
@@ -31,13 +31,13 @@
 
 #include <QMenu>
 
-#include <OGRE/OgreSceneNode.h>
-#include <OGRE/OgreSceneManager.h>
-#include <OGRE/OgreMaterialManager.h>
-#include <OGRE/OgreResourceGroupManager.h>
-#include <OGRE/OgreSubEntity.h>
-#include <OGRE/OgreMath.h>
-#include <OGRE/OgreRenderWindow.h>
+#include <OgreSceneNode.h>
+#include <OgreSceneManager.h>
+#include <OgreMaterialManager.h>
+#include <OgreResourceGroupManager.h>
+#include <OgreSubEntity.h>
+#include <OgreMath.h>
+#include <OgreRenderWindow.h>
 
 #include <ros/ros.h>
 #include <interactive_markers/tools.h>
diff --git a/src/rviz/default_plugin/interactive_markers/interactive_marker.h b/src/rviz/default_plugin/interactive_markers/interactive_marker.h
index 8aec2a945f..332456ac0f 100644
--- a/src/rviz/default_plugin/interactive_markers/interactive_marker.h
+++ b/src/rviz/default_plugin/interactive_markers/interactive_marker.h
@@ -35,8 +35,8 @@
 #include <boost/thread/recursive_mutex.hpp>
 #include <boost/thread/thread.hpp>
 
-#include <OGRE/OgreVector3.h>
-#include <OGRE/OgreQuaternion.h>
+#include <OgreVector3.h>
+#include <OgreQuaternion.h>
 
 #include <visualization_msgs/InteractiveMarker.h>
 #include <visualization_msgs/InteractiveMarkerPose.h>
diff --git a/src/rviz/default_plugin/interactive_markers/interactive_marker_control.cpp b/src/rviz/default_plugin/interactive_markers/interactive_marker_control.cpp
index b0d94304be..2c36965a2a 100644
--- a/src/rviz/default_plugin/interactive_markers/interactive_marker_control.cpp
+++ b/src/rviz/default_plugin/interactive_markers/interactive_marker_control.cpp
@@ -27,14 +27,14 @@
  * POSSIBILITY OF SUCH DAMAGE.
  */
 
-#include <OGRE/OgreViewport.h>
-#include <OGRE/OgreCamera.h>
-#include <OGRE/OgreSceneNode.h>
-#include <OGRE/OgreSceneManager.h>
-#include <OGRE/OgrePass.h>
-#include <OGRE/OgreMaterial.h>
-#include <OGRE/OgreEntity.h>
-#include <OGRE/OgreSubEntity.h>
+#include <OgreViewport.h>
+#include <OgreCamera.h>
+#include <OgreSceneNode.h>
+#include <OgreSceneManager.h>
+#include <OgrePass.h>
+#include <OgreMaterial.h>
+#include <OgreEntity.h>
+#include <OgreSubEntity.h>
 
 #include "rviz/display_context.h"
 #include "rviz/selection/selection_manager.h"
diff --git a/src/rviz/default_plugin/interactive_markers/interactive_marker_control.h b/src/rviz/default_plugin/interactive_markers/interactive_marker_control.h
index 299a2263a9..0806c82a67 100644
--- a/src/rviz/default_plugin/interactive_markers/interactive_marker_control.h
+++ b/src/rviz/default_plugin/interactive_markers/interactive_marker_control.h
@@ -36,10 +36,10 @@
 
 #include <QCursor>
 
-#include <OGRE/OgreRay.h>
-#include <OGRE/OgreVector3.h>
-#include <OGRE/OgreQuaternion.h>
-#include <OGRE/OgreSceneManager.h>
+#include <OgreRay.h>
+#include <OgreVector3.h>
+#include <OgreQuaternion.h>
+#include <OgreSceneManager.h>
 
 #include <visualization_msgs/InteractiveMarkerControl.h>
 
diff --git a/src/rviz/default_plugin/laser_scan_display.cpp b/src/rviz/default_plugin/laser_scan_display.cpp
index 32bd8cf110..c9561d32b1 100644
--- a/src/rviz/default_plugin/laser_scan_display.cpp
+++ b/src/rviz/default_plugin/laser_scan_display.cpp
@@ -27,8 +27,8 @@
  * POSSIBILITY OF SUCH DAMAGE.
  */
 
-#include <OGRE/OgreSceneNode.h>
-#include <OGRE/OgreSceneManager.h>
+#include <OgreSceneNode.h>
+#include <OgreSceneManager.h>
 
 #include <ros/time.h>
 
diff --git a/src/rviz/default_plugin/map_display.cpp b/src/rviz/default_plugin/map_display.cpp
index 49884936d5..7cb46ae912 100644
--- a/src/rviz/default_plugin/map_display.cpp
+++ b/src/rviz/default_plugin/map_display.cpp
@@ -29,11 +29,11 @@
 
 #include <boost/bind.hpp>
 
-#include <OGRE/OgreManualObject.h>
-#include <OGRE/OgreMaterialManager.h>
-#include <OGRE/OgreSceneManager.h>
-#include <OGRE/OgreSceneNode.h>
-#include <OGRE/OgreTextureManager.h>
+#include <OgreManualObject.h>
+#include <OgreMaterialManager.h>
+#include <OgreSceneManager.h>
+#include <OgreSceneNode.h>
+#include <OgreTextureManager.h>
 
 #include <ros/ros.h>
 
diff --git a/src/rviz/default_plugin/map_display.h b/src/rviz/default_plugin/map_display.h
index 3fe6b7647a..75310e9d15 100644
--- a/src/rviz/default_plugin/map_display.h
+++ b/src/rviz/default_plugin/map_display.h
@@ -32,9 +32,9 @@
 
 #include <boost/thread/thread.hpp>
 
-#include <OGRE/OgreTexture.h>
-#include <OGRE/OgreMaterial.h>
-#include <OGRE/OgreVector3.h>
+#include <OgreTexture.h>
+#include <OgreMaterial.h>
+#include <OgreVector3.h>
 
 #include <nav_msgs/MapMetaData.h>
 #include <ros/time.h>
diff --git a/src/rviz/default_plugin/markers/arrow_marker.cpp b/src/rviz/default_plugin/markers/arrow_marker.cpp
index 8984091693..5ed0add4b8 100644
--- a/src/rviz/default_plugin/markers/arrow_marker.cpp
+++ b/src/rviz/default_plugin/markers/arrow_marker.cpp
@@ -27,11 +27,11 @@
  * POSSIBILITY OF SUCH DAMAGE.
  */
 
-#include <OGRE/OgreVector3.h>
-#include <OGRE/OgreQuaternion.h>
-#include <OGRE/OgreSceneNode.h>
-#include <OGRE/OgreSceneManager.h>
-#include <OGRE/OgreEntity.h>
+#include <OgreVector3.h>
+#include <OgreQuaternion.h>
+#include <OgreSceneNode.h>
+#include <OgreSceneManager.h>
+#include <OgreEntity.h>
 
 #include <tf/transform_listener.h>
 
diff --git a/src/rviz/default_plugin/markers/line_list_marker.cpp b/src/rviz/default_plugin/markers/line_list_marker.cpp
index ac3b25394f..0616c43877 100644
--- a/src/rviz/default_plugin/markers/line_list_marker.cpp
+++ b/src/rviz/default_plugin/markers/line_list_marker.cpp
@@ -34,9 +34,9 @@
 
 #include <rviz/ogre_helpers/billboard_line.h>
 
-#include <OGRE/OgreVector3.h>
-#include <OGRE/OgreQuaternion.h>
-#include <OGRE/OgreSceneNode.h>
+#include <OgreVector3.h>
+#include <OgreQuaternion.h>
+#include <OgreSceneNode.h>
 
 namespace rviz
 {
diff --git a/src/rviz/default_plugin/markers/line_strip_marker.cpp b/src/rviz/default_plugin/markers/line_strip_marker.cpp
index a0a9a87ac4..430bedc08c 100644
--- a/src/rviz/default_plugin/markers/line_strip_marker.cpp
+++ b/src/rviz/default_plugin/markers/line_strip_marker.cpp
@@ -35,9 +35,9 @@
 
 #include <rviz/ogre_helpers/billboard_line.h>
 
-#include <OGRE/OgreVector3.h>
-#include <OGRE/OgreQuaternion.h>
-#include <OGRE/OgreSceneNode.h>
+#include <OgreVector3.h>
+#include <OgreQuaternion.h>
+#include <OgreSceneNode.h>
 
 namespace rviz
 {
diff --git a/src/rviz/default_plugin/markers/marker_base.cpp b/src/rviz/default_plugin/markers/marker_base.cpp
index 8596cf69f0..98dfa923ac 100644
--- a/src/rviz/default_plugin/markers/marker_base.cpp
+++ b/src/rviz/default_plugin/markers/marker_base.cpp
@@ -34,10 +34,10 @@
 #include "marker_selection_handler.h"
 #include "rviz/frame_manager.h"
 
-#include <OGRE/OgreSceneNode.h>
-#include <OGRE/OgreSceneManager.h>
-#include <OGRE/OgreEntity.h>
-#include <OGRE/OgreSubEntity.h>
+#include <OgreSceneNode.h>
+#include <OgreSceneManager.h>
+#include <OgreEntity.h>
+#include <OgreSubEntity.h>
 
 #include <tf/tf.h>
 #include <tf/transform_listener.h>
diff --git a/src/rviz/default_plugin/markers/marker_selection_handler.cpp b/src/rviz/default_plugin/markers/marker_selection_handler.cpp
index e122d998b4..5d715b1790 100644
--- a/src/rviz/default_plugin/markers/marker_selection_handler.cpp
+++ b/src/rviz/default_plugin/markers/marker_selection_handler.cpp
@@ -27,8 +27,8 @@
  * POSSIBILITY OF SUCH DAMAGE.
  */
 
-#include <OGRE/OgreQuaternion.h>
-#include <OGRE/OgreVector3.h>
+#include <OgreQuaternion.h>
+#include <OgreVector3.h>
 
 #include "rviz/default_plugin/interactive_markers/interactive_marker_control.h"
 #include "rviz/default_plugin/marker_display.h"
diff --git a/src/rviz/default_plugin/markers/mesh_resource_marker.cpp b/src/rviz/default_plugin/markers/mesh_resource_marker.cpp
index 22814b8fdf..d2722a8a7e 100644
--- a/src/rviz/default_plugin/markers/mesh_resource_marker.cpp
+++ b/src/rviz/default_plugin/markers/mesh_resource_marker.cpp
@@ -37,12 +37,12 @@
 #include "rviz/mesh_loader.h"
 #include "marker_display.h"
 
-#include <OGRE/OgreSceneNode.h>
-#include <OGRE/OgreSceneManager.h>
-#include <OGRE/OgreEntity.h>
-#include <OGRE/OgreSubEntity.h>
-#include <OGRE/OgreMaterialManager.h>
-#include <OGRE/OgreTextureManager.h>
+#include <OgreSceneNode.h>
+#include <OgreSceneManager.h>
+#include <OgreEntity.h>
+#include <OgreSubEntity.h>
+#include <OgreMaterialManager.h>
+#include <OgreTextureManager.h>
 
 namespace rviz
 {
diff --git a/src/rviz/default_plugin/markers/mesh_resource_marker.h b/src/rviz/default_plugin/markers/mesh_resource_marker.h
index 750b884548..683a97da2c 100644
--- a/src/rviz/default_plugin/markers/mesh_resource_marker.h
+++ b/src/rviz/default_plugin/markers/mesh_resource_marker.h
@@ -32,7 +32,7 @@
 
 #include "marker_base.h"
 
-#include <OGRE/OgreMaterial.h>
+#include <OgreMaterial.h>
 
 #include <vector>
 
diff --git a/src/rviz/default_plugin/markers/points_marker.cpp b/src/rviz/default_plugin/markers/points_marker.cpp
index 4a1aacfc6d..bea5ec019c 100644
--- a/src/rviz/default_plugin/markers/points_marker.cpp
+++ b/src/rviz/default_plugin/markers/points_marker.cpp
@@ -35,10 +35,10 @@
 
 #include <rviz/ogre_helpers/point_cloud.h>
 
-#include <OGRE/OgreVector3.h>
-#include <OGRE/OgreQuaternion.h>
-#include <OGRE/OgreSceneNode.h>
-#include <OGRE/OgreSceneManager.h>
+#include <OgreVector3.h>
+#include <OgreQuaternion.h>
+#include <OgreSceneNode.h>
+#include <OgreSceneManager.h>
 
 namespace rviz
 {
diff --git a/src/rviz/default_plugin/markers/shape_marker.cpp b/src/rviz/default_plugin/markers/shape_marker.cpp
index dbc83b9533..25c98c2713 100644
--- a/src/rviz/default_plugin/markers/shape_marker.cpp
+++ b/src/rviz/default_plugin/markers/shape_marker.cpp
@@ -36,8 +36,8 @@
 
 #include <rviz/ogre_helpers/shape.h>
 
-#include <OGRE/OgreSceneNode.h>
-#include <OGRE/OgreMatrix3.h>
+#include <OgreSceneNode.h>
+#include <OgreMatrix3.h>
 
 namespace rviz
 {
diff --git a/src/rviz/default_plugin/markers/text_view_facing_marker.cpp b/src/rviz/default_plugin/markers/text_view_facing_marker.cpp
index 82a7f8ad56..1178e52ed6 100644
--- a/src/rviz/default_plugin/markers/text_view_facing_marker.cpp
+++ b/src/rviz/default_plugin/markers/text_view_facing_marker.cpp
@@ -27,8 +27,8 @@
  * POSSIBILITY OF SUCH DAMAGE.
  */
 
-#include <OGRE/OgreSceneNode.h>
-#include <OGRE/OgreSceneManager.h>
+#include <OgreSceneNode.h>
+#include <OgreSceneManager.h>
 
 #include <ros/assert.h>
 
diff --git a/src/rviz/default_plugin/markers/triangle_list_marker.cpp b/src/rviz/default_plugin/markers/triangle_list_marker.cpp
index f99fde529c..3d944028dd 100644
--- a/src/rviz/default_plugin/markers/triangle_list_marker.cpp
+++ b/src/rviz/default_plugin/markers/triangle_list_marker.cpp
@@ -38,12 +38,12 @@
 #include "rviz/mesh_loader.h"
 #include "marker_display.h"
 
-#include <OGRE/OgreSceneNode.h>
-#include <OGRE/OgreSceneManager.h>
-#include <OGRE/OgreManualObject.h>
-#include <OGRE/OgreMaterialManager.h>
-#include <OGRE/OgreTextureManager.h>
-#include <OGRE/OgreTechnique.h>
+#include <OgreSceneNode.h>
+#include <OgreSceneManager.h>
+#include <OgreManualObject.h>
+#include <OgreMaterialManager.h>
+#include <OgreTextureManager.h>
+#include <OgreTechnique.h>
 
 namespace rviz
 {
diff --git a/src/rviz/default_plugin/markers/triangle_list_marker.h b/src/rviz/default_plugin/markers/triangle_list_marker.h
index b383b48b25..0058542abc 100644
--- a/src/rviz/default_plugin/markers/triangle_list_marker.h
+++ b/src/rviz/default_plugin/markers/triangle_list_marker.h
@@ -30,7 +30,7 @@
 #ifndef RVIZ_TRIANGLE_LIST_MARKER_H
 #define RVIZ_TRIANGLE_LIST_MARKER_H
 
-#include <OGRE/OgreMaterial.h>
+#include <OgreMaterial.h>
 
 #include "rviz/default_plugin/markers/marker_base.h"
 
diff --git a/src/rviz/default_plugin/path_display.cpp b/src/rviz/default_plugin/path_display.cpp
index ccfce2b619..5635f91914 100644
--- a/src/rviz/default_plugin/path_display.cpp
+++ b/src/rviz/default_plugin/path_display.cpp
@@ -29,11 +29,11 @@
 
 #include <boost/bind.hpp>
 
-#include <OGRE/OgreSceneNode.h>
-#include <OGRE/OgreSceneManager.h>
-#include <OGRE/OgreManualObject.h>
-#include <OGRE/OgreBillboardSet.h>
-#include <OGRE/OgreMatrix4.h>
+#include <OgreSceneNode.h>
+#include <OgreSceneManager.h>
+#include <OgreManualObject.h>
+#include <OgreBillboardSet.h>
+#include <OgreMatrix4.h>
 
 #include <tf/transform_listener.h>
 
diff --git a/src/rviz/default_plugin/point_cloud2_display.cpp b/src/rviz/default_plugin/point_cloud2_display.cpp
index c2d7c8ed48..d749aca23d 100644
--- a/src/rviz/default_plugin/point_cloud2_display.cpp
+++ b/src/rviz/default_plugin/point_cloud2_display.cpp
@@ -27,8 +27,8 @@
  * POSSIBILITY OF SUCH DAMAGE.
  */
 
-#include <OGRE/OgreSceneNode.h>
-#include <OGRE/OgreSceneManager.h>
+#include <OgreSceneNode.h>
+#include <OgreSceneManager.h>
 
 #include <ros/time.h>
 
diff --git a/src/rviz/default_plugin/point_cloud_common.cpp b/src/rviz/default_plugin/point_cloud_common.cpp
index 22c4416dbf..79767768ea 100644
--- a/src/rviz/default_plugin/point_cloud_common.cpp
+++ b/src/rviz/default_plugin/point_cloud_common.cpp
@@ -29,9 +29,9 @@
 
 #include <QColor>
 
-#include <OGRE/OgreSceneManager.h>
-#include <OGRE/OgreSceneNode.h>
-#include <OGRE/OgreWireBoundingBox.h>
+#include <OgreSceneManager.h>
+#include <OgreSceneNode.h>
+#include <OgreWireBoundingBox.h>
 
 #include <ros/time.h>
 
diff --git a/src/rviz/default_plugin/point_cloud_display.cpp b/src/rviz/default_plugin/point_cloud_display.cpp
index a3b5224437..cd5b89191d 100644
--- a/src/rviz/default_plugin/point_cloud_display.cpp
+++ b/src/rviz/default_plugin/point_cloud_display.cpp
@@ -27,8 +27,8 @@
  * POSSIBILITY OF SUCH DAMAGE.
  */
 
-#include <OGRE/OgreSceneNode.h>
-#include <OGRE/OgreSceneManager.h>
+#include <OgreSceneNode.h>
+#include <OgreSceneManager.h>
 
 #include <ros/time.h>
 
diff --git a/src/rviz/default_plugin/point_cloud_transformer.h b/src/rviz/default_plugin/point_cloud_transformer.h
index d4a480f7df..f20b90ce7a 100644
--- a/src/rviz/default_plugin/point_cloud_transformer.h
+++ b/src/rviz/default_plugin/point_cloud_transformer.h
@@ -34,8 +34,8 @@
 
 #include <ros/message_forward.h>
 
-#include <OGRE/OgreVector3.h>
-#include <OGRE/OgreColourValue.h>
+#include <OgreVector3.h>
+#include <OgreColourValue.h>
 
 #include <rviz/ogre_helpers/point_cloud.h>
 
diff --git a/src/rviz/default_plugin/point_cloud_transformers.cpp b/src/rviz/default_plugin/point_cloud_transformers.cpp
index c51e38f683..c7ad05f944 100644
--- a/src/rviz/default_plugin/point_cloud_transformers.cpp
+++ b/src/rviz/default_plugin/point_cloud_transformers.cpp
@@ -27,9 +27,9 @@
  * POSSIBILITY OF SUCH DAMAGE.
  */
 
-#include <OGRE/OgreColourValue.h>
-#include <OGRE/OgreMatrix4.h>
-#include <OGRE/OgreVector3.h>
+#include <OgreColourValue.h>
+#include <OgreMatrix4.h>
+#include <OgreVector3.h>
 
 #include "rviz/properties/bool_property.h"
 #include "rviz/properties/color_property.h"
diff --git a/src/rviz/default_plugin/point_display.cpp b/src/rviz/default_plugin/point_display.cpp
index 271ee10506..4668660535 100644
--- a/src/rviz/default_plugin/point_display.cpp
+++ b/src/rviz/default_plugin/point_display.cpp
@@ -1,5 +1,5 @@
-#include <OGRE/OgreSceneNode.h>
-#include <OGRE/OgreSceneManager.h>
+#include <OgreSceneNode.h>
+#include <OgreSceneManager.h>
 
 #include <rviz/visualization_manager.h>
 #include <rviz/properties/color_property.h>
diff --git a/src/rviz/default_plugin/point_visual.cpp b/src/rviz/default_plugin/point_visual.cpp
index bc4f721f8f..7cfc0bdd33 100644
--- a/src/rviz/default_plugin/point_visual.cpp
+++ b/src/rviz/default_plugin/point_visual.cpp
@@ -1,6 +1,6 @@
-#include <OGRE/OgreVector3.h>
-#include <OGRE/OgreSceneNode.h>
-#include <OGRE/OgreSceneManager.h>
+#include <OgreVector3.h>
+#include <OgreSceneNode.h>
+#include <OgreSceneManager.h>
 
 #include <rviz/ogre_helpers/shape.h>
 
diff --git a/src/rviz/default_plugin/polygon_display.cpp b/src/rviz/default_plugin/polygon_display.cpp
index 08b7372c73..68200f4320 100644
--- a/src/rviz/default_plugin/polygon_display.cpp
+++ b/src/rviz/default_plugin/polygon_display.cpp
@@ -27,10 +27,10 @@
  * POSSIBILITY OF SUCH DAMAGE.
  */
 
-#include <OGRE/OgreSceneNode.h>
-#include <OGRE/OgreSceneManager.h>
-#include <OGRE/OgreManualObject.h>
-#include <OGRE/OgreBillboardSet.h>
+#include <OgreSceneNode.h>
+#include <OgreSceneManager.h>
+#include <OgreManualObject.h>
+#include <OgreBillboardSet.h>
 
 #include "rviz/display_context.h"
 #include "rviz/frame_manager.h"
diff --git a/src/rviz/default_plugin/pose_array_display.cpp b/src/rviz/default_plugin/pose_array_display.cpp
index 6b2ef54d90..ff4ac9ca62 100644
--- a/src/rviz/default_plugin/pose_array_display.cpp
+++ b/src/rviz/default_plugin/pose_array_display.cpp
@@ -27,9 +27,9 @@
  * POSSIBILITY OF SUCH DAMAGE.
  */
 
-#include <OGRE/OgreManualObject.h>
-#include <OGRE/OgreSceneManager.h>
-#include <OGRE/OgreSceneNode.h>
+#include <OgreManualObject.h>
+#include <OgreSceneManager.h>
+#include <OgreSceneNode.h>
 
 #include "rviz/display_context.h"
 #include "rviz/frame_manager.h"
diff --git a/src/rviz/default_plugin/pose_display.cpp b/src/rviz/default_plugin/pose_display.cpp
index 89e7ce8672..46b2c92a48 100644
--- a/src/rviz/default_plugin/pose_display.cpp
+++ b/src/rviz/default_plugin/pose_display.cpp
@@ -27,8 +27,8 @@
  * POSSIBILITY OF SUCH DAMAGE.
  */
 
-#include <OGRE/OgreEntity.h>
-#include <OGRE/OgreSceneNode.h>
+#include <OgreEntity.h>
+#include <OgreSceneNode.h>
 
 #include "rviz/display_context.h"
 #include "rviz/frame_manager.h"
diff --git a/src/rviz/default_plugin/range_display.cpp b/src/rviz/default_plugin/range_display.cpp
index 7e12d5a8b8..cc108de8be 100644
--- a/src/rviz/default_plugin/range_display.cpp
+++ b/src/rviz/default_plugin/range_display.cpp
@@ -27,8 +27,8 @@
  * POSSIBILITY OF SUCH DAMAGE.
  */
 
-#include <OGRE/OgreSceneNode.h>
-#include <OGRE/OgreSceneManager.h>
+#include <OgreSceneNode.h>
+#include <OgreSceneManager.h>
 
 #include "rviz/display_context.h"
 #include "rviz/frame_manager.h"
diff --git a/src/rviz/default_plugin/robot_model_display.cpp b/src/rviz/default_plugin/robot_model_display.cpp
index 7ab087f76f..fbd3877736 100644
--- a/src/rviz/default_plugin/robot_model_display.cpp
+++ b/src/rviz/default_plugin/robot_model_display.cpp
@@ -27,8 +27,8 @@
  * POSSIBILITY OF SUCH DAMAGE.
  */
 
-#include <OGRE/OgreSceneNode.h>
-#include <OGRE/OgreSceneManager.h>
+#include <OgreSceneNode.h>
+#include <OgreSceneManager.h>
 
 #include <urdf/model.h>
 
diff --git a/src/rviz/default_plugin/robot_model_display.h b/src/rviz/default_plugin/robot_model_display.h
index 87f7f64e9f..57e5b1d38b 100644
--- a/src/rviz/default_plugin/robot_model_display.h
+++ b/src/rviz/default_plugin/robot_model_display.h
@@ -32,7 +32,7 @@
 
 #include "rviz/display.h"
 
-#include <OGRE/OgreVector3.h>
+#include <OgreVector3.h>
 
 #include <map>
 
diff --git a/src/rviz/default_plugin/temperature_display.cpp b/src/rviz/default_plugin/temperature_display.cpp
index 2b3a04aac4..e57c3b9844 100644
--- a/src/rviz/default_plugin/temperature_display.cpp
+++ b/src/rviz/default_plugin/temperature_display.cpp
@@ -27,8 +27,8 @@
  * POSSIBILITY OF SUCH DAMAGE.
  */
 
-#include <OGRE/OgreSceneNode.h>
-#include <OGRE/OgreSceneManager.h>
+#include <OgreSceneNode.h>
+#include <OgreSceneManager.h>
 
 #include <ros/time.h>
 
diff --git a/src/rviz/default_plugin/tf_display.cpp b/src/rviz/default_plugin/tf_display.cpp
index 57ada8ab2f..e77b073b8a 100644
--- a/src/rviz/default_plugin/tf_display.cpp
+++ b/src/rviz/default_plugin/tf_display.cpp
@@ -29,8 +29,8 @@
 
 #include <boost/bind.hpp>
 
-#include <OGRE/OgreSceneNode.h>
-#include <OGRE/OgreSceneManager.h>
+#include <OgreSceneNode.h>
+#include <OgreSceneManager.h>
 
 #include <tf/transform_listener.h>
 
diff --git a/src/rviz/default_plugin/tf_display.h b/src/rviz/default_plugin/tf_display.h
index 027377422a..1260c5bb10 100644
--- a/src/rviz/default_plugin/tf_display.h
+++ b/src/rviz/default_plugin/tf_display.h
@@ -33,8 +33,8 @@
 #include <map>
 #include <set>
 
-#include <OGRE/OgreQuaternion.h>
-#include <OGRE/OgreVector3.h>
+#include <OgreQuaternion.h>
+#include <OgreVector3.h>
 
 #include "rviz/selection/forwards.h"
 
diff --git a/src/rviz/default_plugin/tools/focus_tool.cpp b/src/rviz/default_plugin/tools/focus_tool.cpp
index 0f27e21d11..1ae6f9d75f 100644
--- a/src/rviz/default_plugin/tools/focus_tool.cpp
+++ b/src/rviz/default_plugin/tools/focus_tool.cpp
@@ -27,8 +27,8 @@
  * POSSIBILITY OF SUCH DAMAGE.
  */
 
-#include <OGRE/OgreRay.h>
-#include <OGRE/OgreVector3.h>
+#include <OgreRay.h>
+#include <OgreVector3.h>
 
 #include "rviz/viewport_mouse_event.h"
 #include "rviz/load_resource.h"
diff --git a/src/rviz/default_plugin/tools/interaction_tool.cpp b/src/rviz/default_plugin/tools/interaction_tool.cpp
index d846654dfc..a88641fa53 100644
--- a/src/rviz/default_plugin/tools/interaction_tool.cpp
+++ b/src/rviz/default_plugin/tools/interaction_tool.cpp
@@ -27,11 +27,11 @@
  * POSSIBILITY OF SUCH DAMAGE.
  */
 
-#include <OGRE/OgreCamera.h>
-#include <OGRE/OgrePlane.h>
-#include <OGRE/OgreRay.h>
-#include <OGRE/OgreSceneNode.h>
-#include <OGRE/OgreViewport.h>
+#include <OgreCamera.h>
+#include <OgrePlane.h>
+#include <OgreRay.h>
+#include <OgreSceneNode.h>
+#include <OgreViewport.h>
 
 #include "rviz/render_panel.h"
 #include "rviz/selection/selection_handler.h"
diff --git a/src/rviz/default_plugin/tools/measure_tool.h b/src/rviz/default_plugin/tools/measure_tool.h
index 8d32b127f4..acf0344072 100644
--- a/src/rviz/default_plugin/tools/measure_tool.h
+++ b/src/rviz/default_plugin/tools/measure_tool.h
@@ -38,7 +38,7 @@
 
 #include "rviz/tool.h"
 
-#include <OGRE/OgreVector3.h>
+#include <OgreVector3.h>
 
 namespace rviz
 {
diff --git a/src/rviz/default_plugin/tools/point_tool.cpp b/src/rviz/default_plugin/tools/point_tool.cpp
index 4816e4ccbc..f520ee1a86 100644
--- a/src/rviz/default_plugin/tools/point_tool.cpp
+++ b/src/rviz/default_plugin/tools/point_tool.cpp
@@ -27,8 +27,8 @@
  * POSSIBILITY OF SUCH DAMAGE.
  */
 
-#include <OGRE/OgreRay.h>
-#include <OGRE/OgreVector3.h>
+#include <OgreRay.h>
+#include <OgreVector3.h>
 
 #include "rviz/viewport_mouse_event.h"
 #include "rviz/load_resource.h"
diff --git a/src/rviz/default_plugin/tools/pose_tool.cpp b/src/rviz/default_plugin/tools/pose_tool.cpp
index 3aca78b939..5efed334e0 100644
--- a/src/rviz/default_plugin/tools/pose_tool.cpp
+++ b/src/rviz/default_plugin/tools/pose_tool.cpp
@@ -27,10 +27,10 @@
  * POSSIBILITY OF SUCH DAMAGE.
  */
 
-#include <OGRE/OgrePlane.h>
-#include <OGRE/OgreRay.h>
-#include <OGRE/OgreSceneNode.h>
-#include <OGRE/OgreViewport.h>
+#include <OgrePlane.h>
+#include <OgreRay.h>
+#include <OgreSceneNode.h>
+#include <OgreViewport.h>
 
 #include "rviz/geometry.h"
 #include "rviz/ogre_helpers/arrow.h"
diff --git a/src/rviz/default_plugin/tools/pose_tool.h b/src/rviz/default_plugin/tools/pose_tool.h
index 7f721f2af7..6a60ee155d 100644
--- a/src/rviz/default_plugin/tools/pose_tool.h
+++ b/src/rviz/default_plugin/tools/pose_tool.h
@@ -30,7 +30,7 @@
 #ifndef RVIZ_POSE_TOOL_H
 #define RVIZ_POSE_TOOL_H
 
-#include <OGRE/OgreVector3.h>
+#include <OgreVector3.h>
 
 #include <QCursor>
 
diff --git a/src/rviz/default_plugin/tools/selection_tool.cpp b/src/rviz/default_plugin/tools/selection_tool.cpp
index 86ebd14073..73264e4f93 100644
--- a/src/rviz/default_plugin/tools/selection_tool.cpp
+++ b/src/rviz/default_plugin/tools/selection_tool.cpp
@@ -29,16 +29,16 @@
 
 #include <QKeyEvent>
 
-#include <OGRE/OgreRay.h>
-#include <OGRE/OgreSceneManager.h>
-#include <OGRE/OgreCamera.h>
-#include <OGRE/OgreMovableObject.h>
-#include <OGRE/OgreRectangle2D.h>
-#include <OGRE/OgreSceneNode.h>
-#include <OGRE/OgreViewport.h>
-#include <OGRE/OgreMaterialManager.h>
-#include <OGRE/OgreTexture.h>
-#include <OGRE/OgreTextureManager.h>
+#include <OgreRay.h>
+#include <OgreSceneManager.h>
+#include <OgreCamera.h>
+#include <OgreMovableObject.h>
+#include <OgreRectangle2D.h>
+#include <OgreSceneNode.h>
+#include <OgreViewport.h>
+#include <OgreMaterialManager.h>
+#include <OgreTexture.h>
+#include <OgreTextureManager.h>
 
 #include <ros/time.h>
 
diff --git a/src/rviz/default_plugin/view_controllers/fixed_orientation_ortho_view_controller.cpp b/src/rviz/default_plugin/view_controllers/fixed_orientation_ortho_view_controller.cpp
index b974e929ca..f3bfddeb3d 100644
--- a/src/rviz/default_plugin/view_controllers/fixed_orientation_ortho_view_controller.cpp
+++ b/src/rviz/default_plugin/view_controllers/fixed_orientation_ortho_view_controller.cpp
@@ -27,12 +27,12 @@
  * POSSIBILITY OF SUCH DAMAGE.
  */
 
-#include <OGRE/OgreCamera.h>
-#include <OGRE/OgreQuaternion.h>
-#include <OGRE/OgreSceneManager.h>
-#include <OGRE/OgreSceneNode.h>
-#include <OGRE/OgreVector3.h>
-#include <OGRE/OgreViewport.h>
+#include <OgreCamera.h>
+#include <OgreQuaternion.h>
+#include <OgreSceneManager.h>
+#include <OgreSceneNode.h>
+#include <OgreVector3.h>
+#include <OgreViewport.h>
 
 #include "rviz/display_context.h"
 #include "rviz/ogre_helpers/orthographic.h"
diff --git a/src/rviz/default_plugin/view_controllers/fixed_orientation_ortho_view_controller.h b/src/rviz/default_plugin/view_controllers/fixed_orientation_ortho_view_controller.h
index 7e2fa4bae6..4a6c362a33 100644
--- a/src/rviz/default_plugin/view_controllers/fixed_orientation_ortho_view_controller.h
+++ b/src/rviz/default_plugin/view_controllers/fixed_orientation_ortho_view_controller.h
@@ -32,7 +32,7 @@
 
 #include "rviz/frame_position_tracking_view_controller.h"
 
-#include <OGRE/OgreQuaternion.h>
+#include <OgreQuaternion.h>
 
 namespace rviz
 {
diff --git a/src/rviz/default_plugin/view_controllers/fps_view_controller.cpp b/src/rviz/default_plugin/view_controllers/fps_view_controller.cpp
index 5ccae13ad5..b18bafdfa1 100644
--- a/src/rviz/default_plugin/view_controllers/fps_view_controller.cpp
+++ b/src/rviz/default_plugin/view_controllers/fps_view_controller.cpp
@@ -27,12 +27,12 @@
  * POSSIBILITY OF SUCH DAMAGE.
  */
 
-#include <OGRE/OgreViewport.h>
-#include <OGRE/OgreQuaternion.h>
-#include <OGRE/OgreVector3.h>
-#include <OGRE/OgreSceneNode.h>
-#include <OGRE/OgreSceneManager.h>
-#include <OGRE/OgreCamera.h>
+#include <OgreViewport.h>
+#include <OgreQuaternion.h>
+#include <OgreVector3.h>
+#include <OgreSceneNode.h>
+#include <OgreSceneManager.h>
+#include <OgreCamera.h>
 
 #include "rviz/uniform_string_stream.h"
 #include "rviz/display_context.h"
diff --git a/src/rviz/default_plugin/view_controllers/fps_view_controller.h b/src/rviz/default_plugin/view_controllers/fps_view_controller.h
index 5685442d48..7315f369a8 100644
--- a/src/rviz/default_plugin/view_controllers/fps_view_controller.h
+++ b/src/rviz/default_plugin/view_controllers/fps_view_controller.h
@@ -30,8 +30,8 @@
 #ifndef RVIZ_FPS_VIEW_CONTROLLER_H
 #define RVIZ_FPS_VIEW_CONTROLLER_H
 
-#include <OGRE/OgreVector3.h>
-#include <OGRE/OgreQuaternion.h>
+#include <OgreVector3.h>
+#include <OgreQuaternion.h>
 
 #include "rviz/frame_position_tracking_view_controller.h"
 
diff --git a/src/rviz/default_plugin/view_controllers/orbit_view_controller.cpp b/src/rviz/default_plugin/view_controllers/orbit_view_controller.cpp
index c635877ab6..121baa3c84 100644
--- a/src/rviz/default_plugin/view_controllers/orbit_view_controller.cpp
+++ b/src/rviz/default_plugin/view_controllers/orbit_view_controller.cpp
@@ -29,12 +29,12 @@
 
 #include <stdint.h>
 
-#include <OGRE/OgreCamera.h>
-#include <OGRE/OgreQuaternion.h>
-#include <OGRE/OgreSceneManager.h>
-#include <OGRE/OgreSceneNode.h>
-#include <OGRE/OgreVector3.h>
-#include <OGRE/OgreViewport.h>
+#include <OgreCamera.h>
+#include <OgreQuaternion.h>
+#include <OgreSceneManager.h>
+#include <OgreSceneNode.h>
+#include <OgreVector3.h>
+#include <OgreViewport.h>
 
 #include "rviz/display_context.h"
 #include "rviz/geometry.h"
diff --git a/src/rviz/default_plugin/view_controllers/orbit_view_controller.h b/src/rviz/default_plugin/view_controllers/orbit_view_controller.h
index 8aed9023d4..62c4d7b8b9 100644
--- a/src/rviz/default_plugin/view_controllers/orbit_view_controller.h
+++ b/src/rviz/default_plugin/view_controllers/orbit_view_controller.h
@@ -30,7 +30,7 @@
 #ifndef RVIZ_ORBIT_VIEW_CONTROLLER_H
 #define RVIZ_ORBIT_VIEW_CONTROLLER_H
 
-#include <OGRE/OgreVector3.h>
+#include <OgreVector3.h>
 
 #include <QCursor>
 
diff --git a/src/rviz/default_plugin/view_controllers/xy_orbit_view_controller.cpp b/src/rviz/default_plugin/view_controllers/xy_orbit_view_controller.cpp
index 30133b7b03..9e16f98ceb 100644
--- a/src/rviz/default_plugin/view_controllers/xy_orbit_view_controller.cpp
+++ b/src/rviz/default_plugin/view_controllers/xy_orbit_view_controller.cpp
@@ -31,13 +31,13 @@
 
 #include <ros/ros.h>
 
-#include <OGRE/OgreCamera.h>
-#include <OGRE/OgrePlane.h>
-#include <OGRE/OgreQuaternion.h>
-#include <OGRE/OgreRay.h>
-#include <OGRE/OgreSceneNode.h>
-#include <OGRE/OgreVector3.h>
-#include <OGRE/OgreViewport.h>
+#include <OgreCamera.h>
+#include <OgrePlane.h>
+#include <OgreQuaternion.h>
+#include <OgreRay.h>
+#include <OgreSceneNode.h>
+#include <OgreVector3.h>
+#include <OgreViewport.h>
 
 #include "rviz/display_context.h"
 #include "rviz/ogre_helpers/shape.h"
diff --git a/src/rviz/default_plugin/view_controllers/xy_orbit_view_controller.h b/src/rviz/default_plugin/view_controllers/xy_orbit_view_controller.h
index 142ef81fff..f09880cc12 100644
--- a/src/rviz/default_plugin/view_controllers/xy_orbit_view_controller.h
+++ b/src/rviz/default_plugin/view_controllers/xy_orbit_view_controller.h
@@ -32,7 +32,7 @@
 
 #include "rviz/default_plugin/view_controllers/orbit_view_controller.h"
 
-#include <OGRE/OgreVector3.h>
+#include <OgreVector3.h>
 
 namespace Ogre
 {
diff --git a/src/rviz/default_plugin/wrench_display.cpp b/src/rviz/default_plugin/wrench_display.cpp
index bee22f9a06..6a83e68295 100644
--- a/src/rviz/default_plugin/wrench_display.cpp
+++ b/src/rviz/default_plugin/wrench_display.cpp
@@ -1,5 +1,5 @@
-#include <OGRE/OgreSceneNode.h>
-#include <OGRE/OgreSceneManager.h>
+#include <OgreSceneNode.h>
+#include <OgreSceneManager.h>
 
 #include <rviz/visualization_manager.h>
 #include <rviz/frame_manager.h>
diff --git a/src/rviz/default_plugin/wrench_visual.cpp b/src/rviz/default_plugin/wrench_visual.cpp
index b1c156dec0..d24934a2d3 100644
--- a/src/rviz/default_plugin/wrench_visual.cpp
+++ b/src/rviz/default_plugin/wrench_visual.cpp
@@ -1,6 +1,6 @@
-#include <OGRE/OgreVector3.h>
-#include <OGRE/OgreSceneNode.h>
-#include <OGRE/OgreSceneManager.h>
+#include <OgreVector3.h>
+#include <OgreSceneNode.h>
+#include <OgreSceneManager.h>
 
 #include <rviz/ogre_helpers/arrow.h>
 #include <rviz/ogre_helpers/billboard_line.h>
diff --git a/src/rviz/display.cpp b/src/rviz/display.cpp
index dd1e4a71cc..bb46f94a92 100644
--- a/src/rviz/display.cpp
+++ b/src/rviz/display.cpp
@@ -36,8 +36,8 @@
 #include <QMetaObject>
 #include <QWidget>
 
-#include <OGRE/OgreSceneManager.h>
-#include <OGRE/OgreSceneNode.h>
+#include <OgreSceneManager.h>
+#include <OgreSceneNode.h>
 
 #include "rviz/display_context.h"
 #include "rviz/ogre_helpers/apply_visibility_bits.h"
diff --git a/src/rviz/frame_manager.h b/src/rviz/frame_manager.h
index 3fbe6f05fe..a314776eb2 100644
--- a/src/rviz/frame_manager.h
+++ b/src/rviz/frame_manager.h
@@ -36,8 +36,8 @@
 
 #include <ros/time.h>
 
-#include <OGRE/OgreVector3.h>
-#include <OGRE/OgreQuaternion.h>
+#include <OgreVector3.h>
+#include <OgreQuaternion.h>
 
 #include <boost/thread/mutex.hpp>
 
diff --git a/src/rviz/frame_position_tracking_view_controller.cpp b/src/rviz/frame_position_tracking_view_controller.cpp
index 7cb7a72f99..1596b247fb 100644
--- a/src/rviz/frame_position_tracking_view_controller.cpp
+++ b/src/rviz/frame_position_tracking_view_controller.cpp
@@ -27,9 +27,9 @@
  * POSSIBILITY OF SUCH DAMAGE.
  */
 
-#include <OGRE/OgreCamera.h>
-#include <OGRE/OgreSceneManager.h>
-#include <OGRE/OgreSceneNode.h>
+#include <OgreCamera.h>
+#include <OgreSceneManager.h>
+#include <OgreSceneNode.h>
 
 #include "rviz/display_context.h"
 #include "rviz/frame_manager.h"
diff --git a/src/rviz/frame_position_tracking_view_controller.h b/src/rviz/frame_position_tracking_view_controller.h
index ed63dd8982..f76d2e848c 100644
--- a/src/rviz/frame_position_tracking_view_controller.h
+++ b/src/rviz/frame_position_tracking_view_controller.h
@@ -30,8 +30,8 @@
 #ifndef RVIZ_FRAME_POSITION_TRACKING_VIEW_CONTROLLER_H
 #define RVIZ_FRAME_POSITION_TRACKING_VIEW_CONTROLLER_H
 
-#include <OGRE/OgreQuaternion.h>
-#include <OGRE/OgreVector3.h>
+#include <OgreQuaternion.h>
+#include <OgreVector3.h>
 
 #include "rviz/view_controller.h"
 
diff --git a/src/rviz/geometry.cpp b/src/rviz/geometry.cpp
index ba0ef19266..e4fbec10e2 100644
--- a/src/rviz/geometry.cpp
+++ b/src/rviz/geometry.cpp
@@ -27,11 +27,11 @@
  * POSSIBILITY OF SUCH DAMAGE.
  */
 
-#include <OGRE/OgreRay.h>
-#include <OGRE/OgrePlane.h>
-#include <OGRE/OgreCamera.h>
-#include <OGRE/OgreSceneNode.h>
-#include <OGRE/OgreViewport.h>
+#include <OgreRay.h>
+#include <OgrePlane.h>
+#include <OgreCamera.h>
+#include <OgreSceneNode.h>
+#include <OgreViewport.h>
 
 #include "geometry.h"
 
diff --git a/src/rviz/image/ros_image_texture.cpp b/src/rviz/image/ros_image_texture.cpp
index 71b97c2e28..f694622298 100644
--- a/src/rviz/image/ros_image_texture.cpp
+++ b/src/rviz/image/ros_image_texture.cpp
@@ -35,7 +35,7 @@
 #include <boost/algorithm/string/erase.hpp>
 #include <boost/foreach.hpp>
 
-#include <OGRE/OgreTextureManager.h>
+#include <OgreTextureManager.h>
 
 #include <sensor_msgs/image_encodings.h>
 
diff --git a/src/rviz/image/ros_image_texture.h b/src/rviz/image/ros_image_texture.h
index ab19622763..58f889ef98 100644
--- a/src/rviz/image/ros_image_texture.h
+++ b/src/rviz/image/ros_image_texture.h
@@ -32,8 +32,8 @@
 
 #include <sensor_msgs/Image.h>
 
-#include <OGRE/OgreTexture.h>
-#include <OGRE/OgreImage.h>
+#include <OgreTexture.h>
+#include <OgreImage.h>
 
 #include <boost/shared_ptr.hpp>
 #include <boost/thread/mutex.hpp>
diff --git a/src/rviz/mesh_loader.cpp b/src/rviz/mesh_loader.cpp
index 3082934055..db078fece5 100644
--- a/src/rviz/mesh_loader.cpp
+++ b/src/rviz/mesh_loader.cpp
@@ -34,17 +34,17 @@
 
 #include "ogre_helpers/stl_loader.h"
 
-#include <OGRE/OgreMeshManager.h>
-#include <OGRE/OgreTextureManager.h>
-#include <OGRE/OgreMaterialManager.h>
-#include <OGRE/OgreTexture.h>
-#include <OGRE/OgrePass.h>
-#include <OGRE/OgreTechnique.h>
-#include <OGRE/OgreMaterial.h>
-#include <OGRE/OgreTextureUnitState.h>
-#include <OGRE/OgreMeshSerializer.h>
-#include <OGRE/OgreSubMesh.h>
-#include <OGRE/OgreHardwareBufferManager.h>
+#include <OgreMeshManager.h>
+#include <OgreTextureManager.h>
+#include <OgreMaterialManager.h>
+#include <OgreTexture.h>
+#include <OgrePass.h>
+#include <OgreTechnique.h>
+#include <OgreMaterial.h>
+#include <OgreTextureUnitState.h>
+#include <OgreMeshSerializer.h>
+#include <OgreSubMesh.h>
+#include <OgreHardwareBufferManager.h>
 
 #include <tinyxml.h>
 
diff --git a/src/rviz/mesh_loader.h b/src/rviz/mesh_loader.h
index 88aea4d31d..c729003807 100644
--- a/src/rviz/mesh_loader.h
+++ b/src/rviz/mesh_loader.h
@@ -30,7 +30,7 @@
 #ifndef RVIZ_MESH_LOADER_H
 #define RVIZ_MESH_LOADER_H
 
-#include <OGRE/OgreMesh.h>
+#include <OgreMesh.h>
 
 namespace rviz
 {
diff --git a/src/rviz/message_filter_display.h b/src/rviz/message_filter_display.h
index 54e696e952..2d3eea7957 100644
--- a/src/rviz/message_filter_display.h
+++ b/src/rviz/message_filter_display.h
@@ -29,8 +29,8 @@
 #ifndef MESSAGE_FILTER_DISPLAY_H
 #define MESSAGE_FILTER_DISPLAY_H
 
-#include <OGRE/OgreSceneManager.h>
-#include <OGRE/OgreSceneNode.h>
+#include <OgreSceneManager.h>
+#include <OgreSceneNode.h>
 
 #ifndef Q_MOC_RUN
 #include <message_filters/subscriber.h>
diff --git a/src/rviz/msg_conversions.h b/src/rviz/msg_conversions.h
index aa1c57e385..cbeaa8a381 100644
--- a/src/rviz/msg_conversions.h
+++ b/src/rviz/msg_conversions.h
@@ -29,8 +29,8 @@
 #ifndef MSG_CONVERSIONS_H
 #define MSG_CONVERSIONS_H
 
-#include "OGRE/OgreVector3.h"
-#include "OGRE/OgreQuaternion.h"
+#include "OgreVector3.h"
+#include "OgreQuaternion.h"
 
 #include <geometry_msgs/Point.h>
 #include <geometry_msgs/Vector3.h>
diff --git a/src/rviz/ogre_helpers/apply_visibility_bits.cpp b/src/rviz/ogre_helpers/apply_visibility_bits.cpp
index 3f6bfc1db2..5e6b356201 100644
--- a/src/rviz/ogre_helpers/apply_visibility_bits.cpp
+++ b/src/rviz/ogre_helpers/apply_visibility_bits.cpp
@@ -29,8 +29,8 @@
 
 #include <stdint.h>
 
-#include <OGRE/OgreMovableObject.h>
-#include <OGRE/OgreSceneNode.h>
+#include <OgreMovableObject.h>
+#include <OgreSceneNode.h>
 
 namespace rviz
 {
diff --git a/src/rviz/ogre_helpers/arrow.cpp b/src/rviz/ogre_helpers/arrow.cpp
index 13453250f6..651dea7b23 100644
--- a/src/rviz/ogre_helpers/arrow.cpp
+++ b/src/rviz/ogre_helpers/arrow.cpp
@@ -30,10 +30,10 @@
 #include "arrow.h"
 #include "shape.h"
 
-#include <OGRE/OgreSceneManager.h>
-#include <OGRE/OgreSceneNode.h>
-#include <OGRE/OgreVector3.h>
-#include <OGRE/OgreQuaternion.h>
+#include <OgreSceneManager.h>
+#include <OgreSceneNode.h>
+#include <OgreVector3.h>
+#include <OgreQuaternion.h>
 
 #include <sstream>
 
diff --git a/src/rviz/ogre_helpers/axes.cpp b/src/rviz/ogre_helpers/axes.cpp
index 205d6fe6be..ad971303a8 100644
--- a/src/rviz/ogre_helpers/axes.cpp
+++ b/src/rviz/ogre_helpers/axes.cpp
@@ -30,10 +30,10 @@
 #include "axes.h"
 #include "shape.h"
 
-#include <OGRE/OgreSceneManager.h>
-#include <OGRE/OgreSceneNode.h>
-#include <OGRE/OgreVector3.h>
-#include <OGRE/OgreQuaternion.h>
+#include <OgreSceneManager.h>
+#include <OgreSceneNode.h>
+#include <OgreVector3.h>
+#include <OgreQuaternion.h>
 
 #include <sstream>
 
diff --git a/src/rviz/ogre_helpers/billboard_line.cpp b/src/rviz/ogre_helpers/billboard_line.cpp
index 5bebdd2dee..0c8f522f9a 100644
--- a/src/rviz/ogre_helpers/billboard_line.cpp
+++ b/src/rviz/ogre_helpers/billboard_line.cpp
@@ -29,12 +29,12 @@
 
 #include "billboard_line.h"
 
-#include <OGRE/OgreSceneManager.h>
-#include <OGRE/OgreSceneNode.h>
-#include <OGRE/OgreVector3.h>
-#include <OGRE/OgreQuaternion.h>
-#include <OGRE/OgreBillboardChain.h>
-#include <OGRE/OgreMaterialManager.h>
+#include <OgreSceneManager.h>
+#include <OgreSceneNode.h>
+#include <OgreVector3.h>
+#include <OgreQuaternion.h>
+#include <OgreBillboardChain.h>
+#include <OgreMaterialManager.h>
 
 #include <sstream>
 
diff --git a/src/rviz/ogre_helpers/billboard_line.h b/src/rviz/ogre_helpers/billboard_line.h
index 6e75aef57b..2623e56ebb 100644
--- a/src/rviz/ogre_helpers/billboard_line.h
+++ b/src/rviz/ogre_helpers/billboard_line.h
@@ -35,9 +35,9 @@
 #include <stdint.h>
 
 #include <vector>
-#include <OGRE/OgreVector3.h>
-#include <OGRE/OgreColourValue.h>
-#include <OGRE/OgreMaterial.h>
+#include <OgreVector3.h>
+#include <OgreColourValue.h>
+#include <OgreMaterial.h>
 
 namespace Ogre
 {
diff --git a/src/rviz/ogre_helpers/camera_base.cpp b/src/rviz/ogre_helpers/camera_base.cpp
index 758bba3344..04f918fd1d 100644
--- a/src/rviz/ogre_helpers/camera_base.cpp
+++ b/src/rviz/ogre_helpers/camera_base.cpp
@@ -29,11 +29,11 @@
 
 #include "camera_base.h"
 
-#include <OGRE/OgreCamera.h>
-#include <OGRE/OgreSceneManager.h>
-#include <OGRE/OgreSceneNode.h>
-#include <OGRE/OgreVector3.h>
-#include <OGRE/OgreQuaternion.h>
+#include <OgreCamera.h>
+#include <OgreSceneManager.h>
+#include <OgreSceneNode.h>
+#include <OgreVector3.h>
+#include <OgreQuaternion.h>
 
 #include <stdint.h>
 #include <sstream>
diff --git a/src/rviz/ogre_helpers/camera_base.h b/src/rviz/ogre_helpers/camera_base.h
index ebcb0b2bf8..c310cab853 100644
--- a/src/rviz/ogre_helpers/camera_base.h
+++ b/src/rviz/ogre_helpers/camera_base.h
@@ -30,8 +30,8 @@
 #ifndef OGRE_TOOLS_CAMERA_BASE_H_
 #define OGRE_TOOLS_CAMERA_BASE_H_
 
-#include <OGRE/OgreVector3.h>
-#include <OGRE/OgreQuaternion.h>
+#include <OgreVector3.h>
+#include <OgreQuaternion.h>
 
 namespace Ogre
 {
diff --git a/src/rviz/ogre_helpers/grid.cpp b/src/rviz/ogre_helpers/grid.cpp
index d2aacc04e4..865e64552e 100644
--- a/src/rviz/ogre_helpers/grid.cpp
+++ b/src/rviz/ogre_helpers/grid.cpp
@@ -30,12 +30,12 @@
 #include "grid.h"
 #include "billboard_line.h"
 
-#include <OGRE/OgreSceneManager.h>
-#include <OGRE/OgreSceneNode.h>
-#include <OGRE/OgreVector3.h>
-#include <OGRE/OgreQuaternion.h>
-#include <OGRE/OgreManualObject.h>
-#include <OGRE/OgreMaterialManager.h>
+#include <OgreSceneManager.h>
+#include <OgreSceneNode.h>
+#include <OgreVector3.h>
+#include <OgreQuaternion.h>
+#include <OgreManualObject.h>
+#include <OgreMaterialManager.h>
 
 #include <sstream>
 
diff --git a/src/rviz/ogre_helpers/grid.h b/src/rviz/ogre_helpers/grid.h
index 6a52eb1f07..68eb10f1b8 100644
--- a/src/rviz/ogre_helpers/grid.h
+++ b/src/rviz/ogre_helpers/grid.h
@@ -34,8 +34,8 @@
 
 #include <vector>
 
-#include <OGRE/OgreColourValue.h>
-#include <OGRE/OgreMaterial.h>
+#include <OgreColourValue.h>
+#include <OgreMaterial.h>
 
 namespace Ogre
 {
diff --git a/src/rviz/ogre_helpers/initialization.cpp b/src/rviz/ogre_helpers/initialization.cpp
index fecd5daf1f..7e37efb178 100644
--- a/src/rviz/ogre_helpers/initialization.cpp
+++ b/src/rviz/ogre_helpers/initialization.cpp
@@ -1,7 +1,7 @@
 #include "initialization.h"
 
-#include <OGRE/OgreRoot.h>
-#include <OGRE/OgreRenderSystem.h>
+#include <OgreRoot.h>
+#include <OgreRenderSystem.h>
 
 #include <exception>
 #include <stdexcept>
diff --git a/src/rviz/ogre_helpers/line.cpp b/src/rviz/ogre_helpers/line.cpp
index c931346bfa..60945ba38c 100644
--- a/src/rviz/ogre_helpers/line.cpp
+++ b/src/rviz/ogre_helpers/line.cpp
@@ -31,10 +31,10 @@
 
 #include <sstream>
 
-#include <OGRE/OgreSceneNode.h>
-#include <OGRE/OgreSceneManager.h>
-#include <OGRE/OgreManualObject.h>
-#include <OGRE/OgreMaterialManager.h>
+#include <OgreSceneNode.h>
+#include <OgreSceneManager.h>
+#include <OgreManualObject.h>
+#include <OgreMaterialManager.h>
 
 namespace rviz
 {
diff --git a/src/rviz/ogre_helpers/line.h b/src/rviz/ogre_helpers/line.h
index 51681bf076..1e67944ed7 100644
--- a/src/rviz/ogre_helpers/line.h
+++ b/src/rviz/ogre_helpers/line.h
@@ -32,8 +32,8 @@
 
 #include "object.h"
 
-#include <OGRE/OgreSceneNode.h>
-#include <OGRE/OgreMaterial.h>
+#include <OgreSceneNode.h>
+#include <OgreMaterial.h>
 
 namespace Ogre
 {
diff --git a/src/rviz/ogre_helpers/mesh_shape.cpp b/src/rviz/ogre_helpers/mesh_shape.cpp
index ffa0e220ad..63a38b14d3 100644
--- a/src/rviz/ogre_helpers/mesh_shape.cpp
+++ b/src/rviz/ogre_helpers/mesh_shape.cpp
@@ -29,11 +29,11 @@
 
 #include "mesh_shape.h"
 
-#include <OGRE/OgreSceneManager.h>
-#include <OGRE/OgreSceneNode.h>
-#include <OGRE/OgreEntity.h>
-#include <OGRE/OgreMaterialManager.h>
-#include <OGRE/OgreManualObject.h>
+#include <OgreSceneManager.h>
+#include <OgreSceneNode.h>
+#include <OgreEntity.h>
+#include <OgreMaterialManager.h>
+#include <OgreManualObject.h>
 
 #include <ros/console.h>
 #include <boost/lexical_cast.hpp>
diff --git a/src/rviz/ogre_helpers/movable_text.cpp b/src/rviz/ogre_helpers/movable_text.cpp
index 72d8fb0822..3a254b38d0 100644
--- a/src/rviz/ogre_helpers/movable_text.cpp
+++ b/src/rviz/ogre_helpers/movable_text.cpp
@@ -40,14 +40,14 @@
 
 #include "movable_text.h"
 
-#include "OGRE/OgreVector3.h"
-#include "OGRE/OgreQuaternion.h"
-#include "OGRE/OgreRoot.h"
-#include "OGRE/OgreCamera.h"
-#include "OGRE/OgreSceneNode.h"
-#include "OGRE/OgreMaterialManager.h"
-#include "OGRE/OgreHardwareBufferManager.h"
-#include "OGRE/OgreFontManager.h"
+#include "OgreVector3.h"
+#include "OgreQuaternion.h"
+#include "OgreRoot.h"
+#include "OgreCamera.h"
+#include "OgreSceneNode.h"
+#include "OgreMaterialManager.h"
+#include "OgreHardwareBufferManager.h"
+#include "OgreFontManager.h"
 
 #include <sstream>
 
diff --git a/src/rviz/ogre_helpers/movable_text.h b/src/rviz/ogre_helpers/movable_text.h
index 9746943fe8..3405619cd6 100644
--- a/src/rviz/ogre_helpers/movable_text.h
+++ b/src/rviz/ogre_helpers/movable_text.h
@@ -41,10 +41,10 @@
 #ifndef OGRE_TOOLS_MOVABLE_TEXT_H
 #define OGRE_TOOLS_MOVABLE_TEXT_H
 
-#include <OGRE/OgreMovableObject.h>
-#include <OGRE/OgreRenderable.h>
-#include <OGRE/OgreVector3.h>
-#include <OGRE/OgreQuaternion.h>
+#include <OgreMovableObject.h>
+#include <OgreRenderable.h>
+#include <OgreVector3.h>
+#include <OgreQuaternion.h>
 
 namespace Ogre
 {
diff --git a/src/rviz/ogre_helpers/ogre_logging.cpp b/src/rviz/ogre_helpers/ogre_logging.cpp
index 6a7ea363ed..082123c5b8 100644
--- a/src/rviz/ogre_helpers/ogre_logging.cpp
+++ b/src/rviz/ogre_helpers/ogre_logging.cpp
@@ -27,8 +27,8 @@
  * POSSIBILITY OF SUCH DAMAGE.
  */
 
-#include <OGRE/OgreLogManager.h>
-#include <OGRE/OgreLog.h>
+#include <OgreLogManager.h>
+#include <OgreLog.h>
 
 #include <ros/ros.h>
 
diff --git a/src/rviz/ogre_helpers/ogre_render_queue_clearer.cpp b/src/rviz/ogre_helpers/ogre_render_queue_clearer.cpp
index ba2085ed38..651827d5a7 100644
--- a/src/rviz/ogre_helpers/ogre_render_queue_clearer.cpp
+++ b/src/rviz/ogre_helpers/ogre_render_queue_clearer.cpp
@@ -29,8 +29,8 @@
 
 #include "ogre_render_queue_clearer.h"
 
-#include <OGRE/OgreRoot.h>
-#include <OGRE/OgrePass.h>
+#include <OgreRoot.h>
+#include <OgrePass.h>
 
 namespace rviz
 {
diff --git a/src/rviz/ogre_helpers/ogre_render_queue_clearer.h b/src/rviz/ogre_helpers/ogre_render_queue_clearer.h
index 92b06de9c7..ab2929e943 100644
--- a/src/rviz/ogre_helpers/ogre_render_queue_clearer.h
+++ b/src/rviz/ogre_helpers/ogre_render_queue_clearer.h
@@ -30,7 +30,7 @@
 #ifndef OGRERENDERQUEUECLEARER_H_
 #define OGRERENDERQUEUECLEARER_H_
 
-#include <OGRE/OgreFrameListener.h>
+#include <OgreFrameListener.h>
 
 namespace rviz
 {
diff --git a/src/rviz/ogre_helpers/orbit_camera.cpp b/src/rviz/ogre_helpers/orbit_camera.cpp
index 1698b14e41..c716ea7d97 100644
--- a/src/rviz/ogre_helpers/orbit_camera.cpp
+++ b/src/rviz/ogre_helpers/orbit_camera.cpp
@@ -30,12 +30,12 @@
 #include "orbit_camera.h"
 #include "shape.h"
 
-#include <OGRE/OgreCamera.h>
-#include <OGRE/OgreSceneManager.h>
-#include <OGRE/OgreSceneNode.h>
-#include <OGRE/OgreVector3.h>
-#include <OGRE/OgreQuaternion.h>
-#include <OGRE/OgreViewport.h>
+#include <OgreCamera.h>
+#include <OgreSceneManager.h>
+#include <OgreSceneNode.h>
+#include <OgreVector3.h>
+#include <OgreQuaternion.h>
+#include <OgreViewport.h>
 
 #include <stdint.h>
 #include <sstream>
diff --git a/src/rviz/ogre_helpers/orbit_camera.h b/src/rviz/ogre_helpers/orbit_camera.h
index 8191f5a2c3..ee760bc760 100644
--- a/src/rviz/ogre_helpers/orbit_camera.h
+++ b/src/rviz/ogre_helpers/orbit_camera.h
@@ -31,7 +31,7 @@
 #define OGRE_TOOLS_ORBIT_CAMERA_H_
 
 #include "camera_base.h"
-#include <OGRE/OgreVector3.h>
+#include <OgreVector3.h>
 
 namespace Ogre
 {
diff --git a/src/rviz/ogre_helpers/orthographic.cpp b/src/rviz/ogre_helpers/orthographic.cpp
index 865b766ebb..8be370e297 100644
--- a/src/rviz/ogre_helpers/orthographic.cpp
+++ b/src/rviz/ogre_helpers/orthographic.cpp
@@ -29,7 +29,7 @@
 
 #include "orthographic.h"
 
-#include <OGRE/OgreMatrix4.h>
+#include <OgreMatrix4.h>
 
 namespace rviz
 {
diff --git a/src/rviz/ogre_helpers/point_cloud.cpp b/src/rviz/ogre_helpers/point_cloud.cpp
index f61402421b..326cb4e79d 100644
--- a/src/rviz/ogre_helpers/point_cloud.cpp
+++ b/src/rviz/ogre_helpers/point_cloud.cpp
@@ -30,16 +30,16 @@
 #include "point_cloud.h"
 #include <ros/assert.h>
 
-#include <OGRE/OgreSceneManager.h>
-#include <OGRE/OgreSceneNode.h>
-#include <OGRE/OgreVector3.h>
-#include <OGRE/OgreQuaternion.h>
-#include <OGRE/OgreManualObject.h>
-#include <OGRE/OgreMaterialManager.h>
-#include <OGRE/OgreBillboardSet.h>
-#include <OGRE/OgreBillboard.h>
-#include <OGRE/OgreTexture.h>
-#include <OGRE/OgreTextureManager.h>
+#include <OgreSceneManager.h>
+#include <OgreSceneNode.h>
+#include <OgreVector3.h>
+#include <OgreQuaternion.h>
+#include <OgreManualObject.h>
+#include <OgreMaterialManager.h>
+#include <OgreBillboardSet.h>
+#include <OgreBillboard.h>
+#include <OgreTexture.h>
+#include <OgreTextureManager.h>
 
 #include <sstream>
 
diff --git a/src/rviz/ogre_helpers/point_cloud.h b/src/rviz/ogre_helpers/point_cloud.h
index 835a3d3c3e..f907d17e2d 100644
--- a/src/rviz/ogre_helpers/point_cloud.h
+++ b/src/rviz/ogre_helpers/point_cloud.h
@@ -30,15 +30,15 @@
 #ifndef OGRE_TOOLS_OGRE_POINT_CLOUD_H
 #define OGRE_TOOLS_OGRE_POINT_CLOUD_H
 
-#include <OGRE/OgreSimpleRenderable.h>
-#include <OGRE/OgreMovableObject.h>
-#include <OGRE/OgreString.h>
-#include <OGRE/OgreAxisAlignedBox.h>
-#include <OGRE/OgreVector3.h>
-#include <OGRE/OgreMaterial.h>
-#include <OGRE/OgreColourValue.h>
-#include <OGRE/OgreRoot.h>
-#include <OGRE/OgreHardwareBufferManager.h>
+#include <OgreSimpleRenderable.h>
+#include <OgreMovableObject.h>
+#include <OgreString.h>
+#include <OgreAxisAlignedBox.h>
+#include <OgreVector3.h>
+#include <OgreMaterial.h>
+#include <OgreColourValue.h>
+#include <OgreRoot.h>
+#include <OgreHardwareBufferManager.h>
 
 #include <stdint.h>
 
diff --git a/src/rviz/ogre_helpers/qt_ogre_render_window.cpp b/src/rviz/ogre_helpers/qt_ogre_render_window.cpp
index e16e689935..4d23be74d4 100644
--- a/src/rviz/ogre_helpers/qt_ogre_render_window.cpp
+++ b/src/rviz/ogre_helpers/qt_ogre_render_window.cpp
@@ -30,12 +30,12 @@
 #include "orthographic.h"
 #include "render_system.h"
 
-#include <OGRE/OgreRoot.h>
-#include <OGRE/OgreViewport.h>
-#include <OGRE/OgreCamera.h>
-#include <OGRE/OgreRenderWindow.h>
-#include <OGRE/OgreStringConverter.h>
-#include <OGRE/OgreGpuProgramManager.h>
+#include <OgreRoot.h>
+#include <OgreViewport.h>
+#include <OgreCamera.h>
+#include <OgreRenderWindow.h>
+#include <OgreStringConverter.h>
+#include <OgreGpuProgramManager.h>
 
 #include <ros/console.h>
 #include <ros/assert.h>
diff --git a/src/rviz/ogre_helpers/qt_ogre_render_window.h b/src/rviz/ogre_helpers/qt_ogre_render_window.h
index 1e361ccd69..5ca936f707 100644
--- a/src/rviz/ogre_helpers/qt_ogre_render_window.h
+++ b/src/rviz/ogre_helpers/qt_ogre_render_window.h
@@ -33,7 +33,7 @@
 
 #include "render_widget.h"
 
-#include <OGRE/OgreColourValue.h>
+#include <OgreColourValue.h>
 
 namespace Ogre
 {
diff --git a/src/rviz/ogre_helpers/render_system.cpp b/src/rviz/ogre_helpers/render_system.cpp
index 6b6d9d6007..de43f63035 100644
--- a/src/rviz/ogre_helpers/render_system.cpp
+++ b/src/rviz/ogre_helpers/render_system.cpp
@@ -46,7 +46,7 @@
 #include <ros/package.h> // This dependency should be moved out of here, it is just used for a search path.
 #include <ros/console.h>
 
-#include <OGRE/OgreRenderWindow.h>
+#include <OgreRenderWindow.h>
 
 #include "rviz/env_config.h"
 #include "rviz/ogre_helpers/ogre_logging.h"
diff --git a/src/rviz/ogre_helpers/render_system.h b/src/rviz/ogre_helpers/render_system.h
index ff7d4a6606..32673f4253 100644
--- a/src/rviz/ogre_helpers/render_system.h
+++ b/src/rviz/ogre_helpers/render_system.h
@@ -29,7 +29,7 @@
 #ifndef RENDER_SYSTEM_H
 #define RENDER_SYSTEM_H
 
-#include <OGRE/OgreRoot.h>
+#include <OgreRoot.h>
 #include <stdint.h>
 
 namespace rviz
diff --git a/src/rviz/ogre_helpers/render_widget.cpp b/src/rviz/ogre_helpers/render_widget.cpp
index 9a0201c119..709b1ed171 100644
--- a/src/rviz/ogre_helpers/render_widget.cpp
+++ b/src/rviz/ogre_helpers/render_widget.cpp
@@ -30,7 +30,7 @@
 #include "ogre_helpers/render_widget.h"
 #include "ogre_helpers/render_system.h"
 
-#include <OGRE/OgreRenderWindow.h>
+#include <OgreRenderWindow.h>
 
 #include <QtGlobal>
 #include <QApplication>
diff --git a/src/rviz/ogre_helpers/shape.cpp b/src/rviz/ogre_helpers/shape.cpp
index 0e1058d645..858f1916dd 100644
--- a/src/rviz/ogre_helpers/shape.cpp
+++ b/src/rviz/ogre_helpers/shape.cpp
@@ -30,13 +30,13 @@
 #include "shape.h"
 #include <ros/assert.h>
 
-#include <OGRE/OgreSceneManager.h>
-#include <OGRE/OgreSceneNode.h>
-#include <OGRE/OgreVector3.h>
-#include <OGRE/OgreQuaternion.h>
-#include <OGRE/OgreEntity.h>
-#include <OGRE/OgreMaterialManager.h>
-#include <OGRE/OgreTextureManager.h>
+#include <OgreSceneManager.h>
+#include <OgreSceneNode.h>
+#include <OgreVector3.h>
+#include <OgreQuaternion.h>
+#include <OgreEntity.h>
+#include <OgreMaterialManager.h>
+#include <OgreTextureManager.h>
 #include <stdint.h>
 
 namespace rviz
diff --git a/src/rviz/ogre_helpers/shape.h b/src/rviz/ogre_helpers/shape.h
index 2407d6b54e..5011a82eae 100644
--- a/src/rviz/ogre_helpers/shape.h
+++ b/src/rviz/ogre_helpers/shape.h
@@ -32,8 +32,8 @@
 
 #include "object.h"
 
-#include <OGRE/OgreMaterial.h>
-#include <OGRE/OgreVector3.h>
+#include <OgreMaterial.h>
+#include <OgreVector3.h>
 
 namespace Ogre
 {
diff --git a/src/rviz/ogre_helpers/stl_loader.cpp b/src/rviz/ogre_helpers/stl_loader.cpp
index f2dfa7439a..5ef2d57e34 100644
--- a/src/rviz/ogre_helpers/stl_loader.cpp
+++ b/src/rviz/ogre_helpers/stl_loader.cpp
@@ -30,7 +30,7 @@
 #include "stl_loader.h"
 #include <ros/console.h>
 
-#include <OGRE/OgreManualObject.h>
+#include <OgreManualObject.h>
 
 namespace ogre_tools
 {
diff --git a/src/rviz/ogre_helpers/stl_loader.h b/src/rviz/ogre_helpers/stl_loader.h
index 74503f2a48..ccc6d888c1 100644
--- a/src/rviz/ogre_helpers/stl_loader.h
+++ b/src/rviz/ogre_helpers/stl_loader.h
@@ -30,8 +30,8 @@
 #ifndef OGRE_TOOLS_STL_LOADER_H
 #define OGRE_TOOLS_STL_LOADER_H
 
-#include <OGRE/OgreVector3.h>
-#include <OGRE/OgreMesh.h>
+#include <OgreVector3.h>
+#include <OgreMesh.h>
 
 #include <vector>
 #include <stdint.h>
diff --git a/src/rviz/properties/parse_color.h b/src/rviz/properties/parse_color.h
index ae1d74cf32..d1853b38cd 100644
--- a/src/rviz/properties/parse_color.h
+++ b/src/rviz/properties/parse_color.h
@@ -32,7 +32,7 @@
 #include <QColor>
 #include <QString>
 
-#include <OGRE/OgreColourValue.h>
+#include <OgreColourValue.h>
 
 namespace rviz
 {
diff --git a/src/rviz/properties/quaternion_property.h b/src/rviz/properties/quaternion_property.h
index 2e278b6d47..08082e4698 100644
--- a/src/rviz/properties/quaternion_property.h
+++ b/src/rviz/properties/quaternion_property.h
@@ -29,7 +29,7 @@
 #ifndef QUATERNION_PROPERTY_H
 #define QUATERNION_PROPERTY_H
 
-#include <OGRE/OgreQuaternion.h>
+#include <OgreQuaternion.h>
 
 #include "rviz/properties/property.h"
 
diff --git a/src/rviz/properties/vector_property.h b/src/rviz/properties/vector_property.h
index e789ebd766..e7eb00d1f2 100644
--- a/src/rviz/properties/vector_property.h
+++ b/src/rviz/properties/vector_property.h
@@ -29,7 +29,7 @@
 #ifndef VECTOR_PROPERTY_H
 #define VECTOR_PROPERTY_H
 
-#include <OGRE/OgreVector3.h>
+#include <OgreVector3.h>
 
 #include "rviz/properties/property.h"
 
diff --git a/src/rviz/render_panel.cpp b/src/rviz/render_panel.cpp
index a412c015f1..0be7925990 100644
--- a/src/rviz/render_panel.cpp
+++ b/src/rviz/render_panel.cpp
@@ -31,7 +31,7 @@
 #include <QMenu>
 #include <QTimer>
 
-#include <OGRE/OgreSceneManager.h>
+#include <OgreSceneManager.h>
 
 #include "rviz/display.h"
 #include "rviz/view_controller.h"
diff --git a/src/rviz/render_panel.h b/src/rviz/render_panel.h
index 3cce1f41d3..1885fa7c96 100644
--- a/src/rviz/render_panel.h
+++ b/src/rviz/render_panel.h
@@ -32,7 +32,7 @@
 
 #include "ogre_helpers/qt_ogre_render_window.h"
 
-#include <OGRE/OgreSceneManager.h>
+#include <OgreSceneManager.h>
 
 #include <boost/thread/mutex.hpp>
 
diff --git a/src/rviz/robot/robot.cpp b/src/rviz/robot/robot.cpp
index 766b0eb531..5d004763d7 100644
--- a/src/rviz/robot/robot.cpp
+++ b/src/rviz/robot/robot.cpp
@@ -41,12 +41,12 @@
 
 #include <urdf_model/model.h>
 
-#include <OGRE/OgreSceneNode.h>
-#include <OGRE/OgreSceneManager.h>
-#include <OGRE/OgreEntity.h>
-#include <OGRE/OgreMaterialManager.h>
-#include <OGRE/OgreMaterial.h>
-#include <OGRE/OgreResourceGroupManager.h>
+#include <OgreSceneNode.h>
+#include <OgreSceneManager.h>
+#include <OgreEntity.h>
+#include <OgreMaterialManager.h>
+#include <OgreMaterial.h>
+#include <OgreResourceGroupManager.h>
 
 #include <ros/console.h>
 #include <ros/assert.h>
diff --git a/src/rviz/robot/robot.h b/src/rviz/robot/robot.h
index 003578e8f8..d529177ba6 100644
--- a/src/rviz/robot/robot.h
+++ b/src/rviz/robot/robot.h
@@ -35,9 +35,9 @@
 #include <string>
 #include <map>
 
-#include <OGRE/OgreVector3.h>
-#include <OGRE/OgreQuaternion.h>
-#include <OGRE/OgreAny.h>
+#include <OgreVector3.h>
+#include <OgreQuaternion.h>
+#include <OgreAny.h>
 
 namespace Ogre
 {
diff --git a/src/rviz/robot/robot_joint.cpp b/src/rviz/robot/robot_joint.cpp
index 71d5518099..6538fd0743 100644
--- a/src/rviz/robot/robot_joint.cpp
+++ b/src/rviz/robot/robot_joint.cpp
@@ -31,7 +31,7 @@
 #include "rviz/robot/robot_link.h"
 #include "rviz/robot/robot.h"
 
-#include <OGRE/OgreSceneNode.h>
+#include <OgreSceneNode.h>
 
 #include "rviz/properties/vector_property.h"
 #include "rviz/properties/quaternion_property.h"
diff --git a/src/rviz/robot/robot_joint.h b/src/rviz/robot/robot_joint.h
index 1d34e5d794..4835fe5e8c 100644
--- a/src/rviz/robot/robot_joint.h
+++ b/src/rviz/robot/robot_joint.h
@@ -35,10 +35,10 @@
 
 #include <QObject>
 
-#include <OGRE/OgreVector3.h>
-#include <OGRE/OgreQuaternion.h>
-#include <OGRE/OgreAny.h>
-#include <OGRE/OgreMaterial.h>
+#include <OgreVector3.h>
+#include <OgreQuaternion.h>
+#include <OgreAny.h>
+#include <OgreMaterial.h>
 
 #include "rviz/ogre_helpers/object.h"
 #include "rviz/selection/forwards.h"
diff --git a/src/rviz/robot/robot_link.cpp b/src/rviz/robot/robot_link.cpp
index b34eaf97e9..3e2c62e89b 100644
--- a/src/rviz/robot/robot_link.cpp
+++ b/src/rviz/robot/robot_link.cpp
@@ -29,14 +29,14 @@
 
 #include <boost/filesystem.hpp>
 
-#include <OGRE/OgreEntity.h>
-#include <OGRE/OgreMaterial.h>
-#include <OGRE/OgreMaterialManager.h>
-#include <OGRE/OgreRibbonTrail.h>
-#include <OGRE/OgreSceneManager.h>
-#include <OGRE/OgreSceneNode.h>
-#include <OGRE/OgreSubEntity.h>
-#include <OGRE/OgreTextureManager.h>
+#include <OgreEntity.h>
+#include <OgreMaterial.h>
+#include <OgreMaterialManager.h>
+#include <OgreRibbonTrail.h>
+#include <OgreSceneManager.h>
+#include <OgreSceneNode.h>
+#include <OgreSubEntity.h>
+#include <OgreTextureManager.h>
 
 #include <ros/console.h>
 
diff --git a/src/rviz/robot/robot_link.h b/src/rviz/robot/robot_link.h
index 834dfd1e50..b2b3ccb8d0 100644
--- a/src/rviz/robot/robot_link.h
+++ b/src/rviz/robot/robot_link.h
@@ -35,10 +35,10 @@
 
 #include <QObject>
 
-#include <OGRE/OgreVector3.h>
-#include <OGRE/OgreQuaternion.h>
-#include <OGRE/OgreAny.h>
-#include <OGRE/OgreMaterial.h>
+#include <OgreVector3.h>
+#include <OgreQuaternion.h>
+#include <OgreAny.h>
+#include <OgreMaterial.h>
 
 #include "rviz/ogre_helpers/object.h"
 #include "rviz/selection/forwards.h"
diff --git a/src/rviz/robot/tf_link_updater.cpp b/src/rviz/robot/tf_link_updater.cpp
index 2ddae63b3f..761c51ef6c 100644
--- a/src/rviz/robot/tf_link_updater.cpp
+++ b/src/rviz/robot/tf_link_updater.cpp
@@ -32,8 +32,8 @@
 
 #include <tf/tf.h>
 
-#include <OGRE/OgreVector3.h>
-#include <OGRE/OgreQuaternion.h>
+#include <OgreVector3.h>
+#include <OgreQuaternion.h>
 
 namespace rviz
 {
diff --git a/src/rviz/selection/forwards.h b/src/rviz/selection/forwards.h
index 5dc599918b..b177c8b115 100644
--- a/src/rviz/selection/forwards.h
+++ b/src/rviz/selection/forwards.h
@@ -34,8 +34,8 @@
 #include <set>
 #include <map>
 #include <boost/unordered_map.hpp>
-#include <OGRE/OgrePixelFormat.h>
-#include <OGRE/OgreColourValue.h>
+#include <OgrePixelFormat.h>
+#include <OgreColourValue.h>
 
 #include <ros/console.h>
 
diff --git a/src/rviz/selection/selection_handler.cpp b/src/rviz/selection/selection_handler.cpp
index 85ffe330dd..50f138bf35 100644
--- a/src/rviz/selection/selection_handler.cpp
+++ b/src/rviz/selection/selection_handler.cpp
@@ -34,12 +34,12 @@
 
 #include <ros/assert.h>
 
-#include <OGRE/OgreSceneNode.h>
-#include <OGRE/OgreSceneManager.h>
-#include <OGRE/OgreManualObject.h>
-#include <OGRE/OgreWireBoundingBox.h>
-#include <OGRE/OgreEntity.h>
-#include <OGRE/OgreSubEntity.h>
+#include <OgreSceneNode.h>
+#include <OgreSceneManager.h>
+#include <OgreManualObject.h>
+#include <OgreWireBoundingBox.h>
+#include <OgreEntity.h>
+#include <OgreSubEntity.h>
 
 #include "rviz/selection/selection_manager.h"
 
diff --git a/src/rviz/selection/selection_handler.h b/src/rviz/selection/selection_handler.h
index 28e15a074b..fd2f19fb80 100644
--- a/src/rviz/selection/selection_handler.h
+++ b/src/rviz/selection/selection_handler.h
@@ -36,7 +36,7 @@
 #include <boost/shared_ptr.hpp>
 #include <boost/unordered_map.hpp>
 
-#include <OGRE/OgreMovableObject.h>
+#include <OgreMovableObject.h>
 
 #include "rviz/selection/forwards.h"
 #include "rviz/selection/selection_handler.h"
diff --git a/src/rviz/selection/selection_manager.cpp b/src/rviz/selection/selection_manager.cpp
index f4fbf62d68..ac67b51b3a 100644
--- a/src/rviz/selection/selection_manager.cpp
+++ b/src/rviz/selection/selection_manager.cpp
@@ -31,20 +31,20 @@
 
 #include <QTimer>
 
-#include <OGRE/OgreCamera.h>
-#include <OGRE/OgreEntity.h>
-#include <OGRE/OgreHardwarePixelBuffer.h>
-#include <OGRE/OgreManualObject.h>
-#include <OGRE/OgreMaterialManager.h>
-#include <OGRE/OgreRenderSystem.h>
-#include <OGRE/OgreRenderTexture.h>
-#include <OGRE/OgreRoot.h>
-#include <OGRE/OgreSceneManager.h>
-#include <OGRE/OgreSceneNode.h>
-#include <OGRE/OgreSubEntity.h>
-#include <OGRE/OgreTextureManager.h>
-#include <OGRE/OgreViewport.h>
-#include <OGRE/OgreWireBoundingBox.h>
+#include <OgreCamera.h>
+#include <OgreEntity.h>
+#include <OgreHardwarePixelBuffer.h>
+#include <OgreManualObject.h>
+#include <OgreMaterialManager.h>
+#include <OgreRenderSystem.h>
+#include <OgreRenderTexture.h>
+#include <OgreRoot.h>
+#include <OgreSceneManager.h>
+#include <OgreSceneNode.h>
+#include <OgreSubEntity.h>
+#include <OgreTextureManager.h>
+#include <OgreViewport.h>
+#include <OgreWireBoundingBox.h>
 
 #include <sensor_msgs/image_encodings.h>
 #include <sensor_msgs/Image.h>
diff --git a/src/rviz/selection/selection_manager.h b/src/rviz/selection/selection_manager.h
index 5bdc4a38d9..ff46793a52 100644
--- a/src/rviz/selection/selection_manager.h
+++ b/src/rviz/selection/selection_manager.h
@@ -41,11 +41,11 @@
 #include <boost/unordered_map.hpp>
 #include <boost/thread/recursive_mutex.hpp>
 
-#include <OGRE/OgreTexture.h>
-#include <OGRE/OgreMaterial.h>
-#include <OGRE/OgreMaterialManager.h>
-#include <OGRE/OgreMovableObject.h>
-#include <OGRE/OgreRenderQueueListener.h>
+#include <OgreTexture.h>
+#include <OgreMaterial.h>
+#include <OgreMaterialManager.h>
+#include <OgreMovableObject.h>
+#include <OgreRenderQueueListener.h>
 
 #include <vector>
 #include <set>
diff --git a/src/rviz/validate_floats.h b/src/rviz/validate_floats.h
index ded8e6c6a9..60931ac72e 100644
--- a/src/rviz/validate_floats.h
+++ b/src/rviz/validate_floats.h
@@ -38,8 +38,8 @@
 #include <geometry_msgs/PoseStamped.h>
 #include <geometry_msgs/Twist.h>
 #include <std_msgs/ColorRGBA.h>
-#include <OGRE/OgreVector3.h>
-#include <OGRE/OgreQuaternion.h>
+#include <OgreVector3.h>
+#include <OgreQuaternion.h>
 
 #include <boost/array.hpp>
 
diff --git a/src/rviz/view_controller.cpp b/src/rviz/view_controller.cpp
index 7c637baec9..fb43c14eb4 100644
--- a/src/rviz/view_controller.cpp
+++ b/src/rviz/view_controller.cpp
@@ -31,9 +31,9 @@
 #include <QFont>
 #include <QKeyEvent>
 
-#include <OGRE/OgreCamera.h>
-#include <OGRE/OgreSceneManager.h>
-#include <OGRE/OgreSceneNode.h>
+#include <OgreCamera.h>
+#include <OgreSceneManager.h>
+#include <OgreSceneNode.h>
 
 #include "rviz/display_context.h"
 #include "rviz/frame_manager.h"
diff --git a/src/rviz/visualization_frame.cpp b/src/rviz/visualization_frame.cpp
index 2c4acc1545..1da53fae9d 100644
--- a/src/rviz/visualization_frame.cpp
+++ b/src/rviz/visualization_frame.cpp
@@ -57,8 +57,8 @@
 #include <ros/package.h>
 #include <ros/init.h>
 
-#include <OGRE/OgreRenderWindow.h>
-#include <OGRE/OgreMeshManager.h>
+#include <OgreRenderWindow.h>
+#include <OgreMeshManager.h>
 
 #include <ogre_helpers/initialization.h>
 
diff --git a/src/rviz/visualization_manager.cpp b/src/rviz/visualization_manager.cpp
index def41cee9c..74b04e8e55 100644
--- a/src/rviz/visualization_manager.cpp
+++ b/src/rviz/visualization_manager.cpp
@@ -36,14 +36,14 @@
 
 #include <boost/bind.hpp>
 
-#include <OGRE/OgreRoot.h>
-#include <OGRE/OgreSceneManager.h>
-#include <OGRE/OgreSceneNode.h>
-#include <OGRE/OgreLight.h>
-#include <OGRE/OgreViewport.h>
-#include <OGRE/OgreMaterialManager.h>
-#include <OGRE/OgreMaterial.h>
-#include <OGRE/OgreRenderWindow.h>
+#include <OgreRoot.h>
+#include <OgreSceneManager.h>
+#include <OgreSceneNode.h>
+#include <OgreLight.h>
+#include <OgreViewport.h>
+#include <OgreMaterialManager.h>
+#include <OgreMaterial.h>
+#include <OgreRenderWindow.h>
 
 #include <boost/filesystem.hpp>
 
diff --git a/src/rviz/visualizer_app.cpp b/src/rviz/visualizer_app.cpp
index 88c4e51980..b4dedef7f0 100644
--- a/src/rviz/visualizer_app.cpp
+++ b/src/rviz/visualizer_app.cpp
@@ -32,9 +32,9 @@
 
 #include <boost/program_options.hpp>
 
-#include <OGRE/OgreMaterialManager.h>
-#include <OGRE/OgreGpuProgramManager.h>
-#include <OGRE/OgreHighLevelGpuProgramManager.h>
+#include <OgreMaterialManager.h>
+#include <OgreGpuProgramManager.h>
+#include <OgreHighLevelGpuProgramManager.h>
 #include <std_srvs/Empty.h>
 
 #ifdef Q_OS_MAC
diff --git a/src/test/render_points_test.h b/src/test/render_points_test.h
index 4c4214b102..b14e13a188 100644
--- a/src/test/render_points_test.h
+++ b/src/test/render_points_test.h
@@ -43,10 +43,10 @@
 #include "rviz/ogre_helpers/billboard_line.h"
 #include "rviz/ogre_helpers/render_system.h"
 
-#include <OGRE/OgreRoot.h>
-#include <OGRE/OgreSceneManager.h>
-#include <OGRE/OgreViewport.h>
-#include <OGRE/OgreLight.h>
+#include <OgreRoot.h>
+#include <OgreSceneManager.h>
+#include <OgreViewport.h>
+#include <OgreLight.h>
 
 #include <ros/time.h>
 
diff --git a/src/test/two_render_widgets.cpp b/src/test/two_render_widgets.cpp
index 42a252400e..8cb630d9cb 100644
--- a/src/test/two_render_widgets.cpp
+++ b/src/test/two_render_widgets.cpp
@@ -35,8 +35,8 @@
 #include <QVBoxLayout>
 #include <QPushButton>
 
-#include <OGRE/OgreRenderWindow.h>
-#include <OGRE/OgreEntity.h>
+#include <OgreRenderWindow.h>
+#include <OgreEntity.h>
 
 using namespace rviz;