diff --git a/rviz_common/include/rviz_common/interaction/selection_renderer.hpp b/rviz_common/include/rviz_common/interaction/selection_renderer.hpp
index 6088c6f59..e821c41fb 100644
--- a/rviz_common/include/rviz_common/interaction/selection_renderer.hpp
+++ b/rviz_common/include/rviz_common/interaction/selection_renderer.hpp
@@ -35,6 +35,7 @@
 #include <memory>
 #include <string>
 
+#include <OgreMaterial.h>
 #include <OgreMaterialManager.h>
 #include <OgreRenderQueueListener.h>
 
diff --git a/rviz_common/src/rviz_common/interaction/selection_renderer.cpp b/rviz_common/src/rviz_common/interaction/selection_renderer.cpp
index c8d8a834e..10c41c1f5 100644
--- a/rviz_common/src/rviz_common/interaction/selection_renderer.cpp
+++ b/rviz_common/src/rviz_common/interaction/selection_renderer.cpp
@@ -37,6 +37,7 @@
 
 #include <OgreCamera.h>
 #include <OgreHardwarePixelBuffer.h>
+#include <OgreMaterial.h>
 #include <OgreMaterialManager.h>
 #include <OgreRectangle2D.h>
 #include <OgreRenderTexture.h>
diff --git a/rviz_default_plugins/include/rviz_default_plugins/displays/marker/marker_common.hpp b/rviz_default_plugins/include/rviz_default_plugins/displays/marker/marker_common.hpp
index a881bb48f..1d9dc3027 100644
--- a/rviz_default_plugins/include/rviz_default_plugins/displays/marker/marker_common.hpp
+++ b/rviz_default_plugins/include/rviz_default_plugins/displays/marker/marker_common.hpp
@@ -40,6 +40,7 @@
 #include <vector>
 #include <utility>
 
+#include <OgreMaterial.h>
 #include <OgreSceneNode.h>
 
 #include <QString>  // NOLINT: cpplint is unable to handle the include order here
diff --git a/rviz_ogre_vendor/CMakeLists.txt b/rviz_ogre_vendor/CMakeLists.txt
index 353a0e6c2..27d186a17 100644
--- a/rviz_ogre_vendor/CMakeLists.txt
+++ b/rviz_ogre_vendor/CMakeLists.txt
@@ -44,7 +44,7 @@ endif()
 
 ament_vendor(ogre_vendor
   VCS_URL https://github.com/OGRECave/ogre.git
-  VCS_VERSION v1.12.10
+  VCS_VERSION v14.5.1
   CMAKE_ARGS
     -DOGRE_STATIC:BOOL=OFF
     -DOGRE_INSTALL_PDB:BOOL=OFF
@@ -70,7 +70,7 @@ ament_vendor(ogre_vendor
     -DOGRE_MANGLE_NAME_OF_LIBRARIES_USED_BY_RVIZ:BOOL=${RVIZ_OGRE_VENDOR_MANGLE_NAME_OF_LIBRARIES_USED_BY_RVIZ}
     "-DCMAKE_CXX_FLAGS=${OGRE_CXX_FLAGS}"
     ${OGRE_CMAKE_ARGS}
-  PATCHES patches
+  # PATCHES patches
 )
 
 if(BUILD_TESTING)
diff --git a/rviz_ogre_vendor/rviz_ogre_vendor-extras.cmake.in b/rviz_ogre_vendor/rviz_ogre_vendor-extras.cmake.in
index 08bd346c0..f4237215a 100644
--- a/rviz_ogre_vendor/rviz_ogre_vendor-extras.cmake.in
+++ b/rviz_ogre_vendor/rviz_ogre_vendor-extras.cmake.in
@@ -67,7 +67,7 @@ foreach(_lib IN LISTS OGRE_LIBRARIES)
 
     set_property(TARGET rviz_ogre_vendor::OgreMain
       PROPERTY
-        INTERFACE_INCLUDE_DIRECTORIES ${OGRE_INCLUDE_DIRS}
+        INTERFACE_INCLUDE_DIRECTORIES ${OGRE_INCLUDE_DIRS} ${OGRE_INCLUDE_DIRS}/RenderSystems/glad
     )
     if(_ogre_main_static_library_abs)
       set_property(TARGET rviz_ogre_vendor::OgreMain APPEND PROPERTY IMPORTED_CONFIGURATIONS RELEASE)
diff --git a/rviz_rendering/include/rviz_rendering/objects/billboard_line.hpp b/rviz_rendering/include/rviz_rendering/objects/billboard_line.hpp
index 56d0facf3..0a46f6704 100644
--- a/rviz_rendering/include/rviz_rendering/objects/billboard_line.hpp
+++ b/rviz_rendering/include/rviz_rendering/objects/billboard_line.hpp
@@ -33,6 +33,7 @@
 #define RVIZ_RENDERING__OBJECTS__BILLBOARD_LINE_HPP_
 
 #include <cstdint>
+#include <functional>
 #include <vector>
 
 #include <OgreBillboardChain.h>
diff --git a/rviz_rendering/include/rviz_rendering/objects/grid.hpp b/rviz_rendering/include/rviz_rendering/objects/grid.hpp
index d297dc0de..9d422bc95 100644
--- a/rviz_rendering/include/rviz_rendering/objects/grid.hpp
+++ b/rviz_rendering/include/rviz_rendering/objects/grid.hpp
@@ -33,6 +33,7 @@
 #define RVIZ_RENDERING__OBJECTS__GRID_HPP_
 
 #include <cstdint>
+#include <functional>
 #include <memory>
 #include <vector>
 
diff --git a/rviz_rendering/src/rviz_rendering/objects/billboard_line.cpp b/rviz_rendering/src/rviz_rendering/objects/billboard_line.cpp
index c7317fa65..86206c553 100644
--- a/rviz_rendering/src/rviz_rendering/objects/billboard_line.cpp
+++ b/rviz_rendering/src/rviz_rendering/objects/billboard_line.cpp
@@ -42,6 +42,7 @@
 #include <iostream>
 #include <stdexcept>
 #include <string>
+#include <sstream>
 
 #include "rviz_rendering/material_manager.hpp"
 
diff --git a/rviz_rendering/src/rviz_rendering/objects/point_cloud.cpp b/rviz_rendering/src/rviz_rendering/objects/point_cloud.cpp
index ca36ddcc3..35039ff82 100644
--- a/rviz_rendering/src/rviz_rendering/objects/point_cloud.cpp
+++ b/rviz_rendering/src/rviz_rendering/objects/point_cloud.cpp
@@ -649,7 +649,7 @@ size_t PointCloud::removePointsFromRenderables(
 
     size_t popped_in_renderable = std::min(
       static_cast<size_t>(number_of_points * vertices_per_point - popped_count),
-      op->vertexData->vertexCount);
+      static_cast<size_t>(op->vertexData->vertexCount));
     op->vertexData->vertexStart += popped_in_renderable;
     op->vertexData->vertexCount -= popped_in_renderable;
 
diff --git a/rviz_rendering/src/rviz_rendering/render_system.cpp b/rviz_rendering/src/rviz_rendering/render_system.cpp
index 9e2fbb481..80f24b0f7 100644
--- a/rviz_rendering/src/rviz_rendering/render_system.cpp
+++ b/rviz_rendering/src/rviz_rendering/render_system.cpp
@@ -242,7 +242,7 @@ RenderSystem::detectGlVersion()
   } else {
     Ogre::RenderSystem * renderSys = ogre_root_->getRenderSystem();
     // createRenderSystemCapabilities() called for side effects only
-    std::unique_ptr<Ogre::RenderSystemCapabilities>(renderSys->createRenderSystemCapabilities());
+    Ogre::Root::getSingleton().getRenderSystem()->getCapabilities();
     const Ogre::RenderSystemCapabilities * caps = renderSys->getCapabilities();
     int major = caps->getDriverVersion().major;
     int minor = caps->getDriverVersion().minor;