diff --git a/rviz_rendering/include/rviz_rendering/logging.hpp b/rviz_rendering/include/rviz_rendering/logging.hpp
index 0072aeaa1..d91f74be7 100644
--- a/rviz_rendering/include/rviz_rendering/logging.hpp
+++ b/rviz_rendering/include/rviz_rendering/logging.hpp
@@ -31,8 +31,6 @@
 #ifndef RVIZ_RENDERING__LOGGING_HPP_
 #define RVIZ_RENDERING__LOGGING_HPP_
 
-#include <memory>
-#include <sstream>
 #include <string>
 
 #include "rviz_rendering/logging_handler.hpp"
diff --git a/rviz_rendering/include/rviz_rendering/material_manager.hpp b/rviz_rendering/include/rviz_rendering/material_manager.hpp
index 502206e78..be4e671de 100644
--- a/rviz_rendering/include/rviz_rendering/material_manager.hpp
+++ b/rviz_rendering/include/rviz_rendering/material_manager.hpp
@@ -32,12 +32,10 @@
 #ifndef RVIZ_RENDERING__MATERIAL_MANAGER_HPP_
 #define RVIZ_RENDERING__MATERIAL_MANAGER_HPP_
 
-#include <string>
-
 #include <OgreColourValue.h>
 #include <OgreMaterialManager.h>
 #include <OgreSceneManager.h>
-
+#include <string>
 #include "rviz_rendering/visibility_control.hpp"
 
 namespace rviz_rendering
diff --git a/rviz_rendering/include/rviz_rendering/objects/axes.hpp b/rviz_rendering/include/rviz_rendering/objects/axes.hpp
index 76eaaa844..3d0bfd4f2 100644
--- a/rviz_rendering/include/rviz_rendering/objects/axes.hpp
+++ b/rviz_rendering/include/rviz_rendering/objects/axes.hpp
@@ -32,13 +32,9 @@
 #ifndef RVIZ_RENDERING__OBJECTS__AXES_HPP_
 #define RVIZ_RENDERING__OBJECTS__AXES_HPP_
 
-#include <cstddef>
-#include <cstdint>
-#include <memory>
-#include <vector>
 
 #include <OgreVector.h>
-
+#include <memory>
 #include "object.hpp"
 #include "shape.hpp"
 #include "rviz_rendering/visibility_control.hpp"
diff --git a/rviz_rendering/include/rviz_rendering/objects/covariance_visual.hpp b/rviz_rendering/include/rviz_rendering/objects/covariance_visual.hpp
index 5b56ef396..2dabdb23d 100644
--- a/rviz_rendering/include/rviz_rendering/objects/covariance_visual.hpp
+++ b/rviz_rendering/include/rviz_rendering/objects/covariance_visual.hpp
@@ -36,6 +36,7 @@
 #include <memory>
 #include <vector>
 
+
 // GCC 11 has a false positive warning about uninitialized variables in Eigen.  There is an open
 // issue about it at https://gitlab.com/libeigen/eigen/-/issues/2304 .  Just disable the warning
 // for Eigen for now.
diff --git a/rviz_rendering/include/rviz_rendering/objects/grid.hpp b/rviz_rendering/include/rviz_rendering/objects/grid.hpp
index d297dc0de..06639a5c3 100644
--- a/rviz_rendering/include/rviz_rendering/objects/grid.hpp
+++ b/rviz_rendering/include/rviz_rendering/objects/grid.hpp
@@ -34,7 +34,6 @@
 
 #include <cstdint>
 #include <memory>
-#include <vector>
 
 #include <OgreColourValue.h>
 #include <OgreMaterial.h>
diff --git a/rviz_rendering/include/rviz_rendering/objects/point_cloud.hpp b/rviz_rendering/include/rviz_rendering/objects/point_cloud.hpp
index 15a4c1c7f..53459c09f 100644
--- a/rviz_rendering/include/rviz_rendering/objects/point_cloud.hpp
+++ b/rviz_rendering/include/rviz_rendering/objects/point_cloud.hpp
@@ -33,8 +33,6 @@
 #define RVIZ_RENDERING__OBJECTS__POINT_CLOUD_HPP_
 
 #include <cstdint>
-#include <deque>
-#include <memory>
 #include <string>
 #include <vector>
 
diff --git a/rviz_rendering/include/rviz_rendering/objects/triangle_polygon.hpp b/rviz_rendering/include/rviz_rendering/objects/triangle_polygon.hpp
index 921c7d979..2d96c5294 100644
--- a/rviz_rendering/include/rviz_rendering/objects/triangle_polygon.hpp
+++ b/rviz_rendering/include/rviz_rendering/objects/triangle_polygon.hpp
@@ -31,7 +31,6 @@
 #ifndef RVIZ_RENDERING__OBJECTS__TRIANGLE_POLYGON_HPP_
 #define RVIZ_RENDERING__OBJECTS__TRIANGLE_POLYGON_HPP_
 
-#include <string>
 
 #include <OgreColourValue.h>
 #include <OgreManualObject.h>
diff --git a/rviz_rendering/include/rviz_rendering/viewport_projection_finder.hpp b/rviz_rendering/include/rviz_rendering/viewport_projection_finder.hpp
index a8043a19e..6d0a6b406 100644
--- a/rviz_rendering/include/rviz_rendering/viewport_projection_finder.hpp
+++ b/rviz_rendering/include/rviz_rendering/viewport_projection_finder.hpp
@@ -33,8 +33,6 @@
 #ifndef RVIZ_RENDERING__VIEWPORT_PROJECTION_FINDER_HPP_
 #define RVIZ_RENDERING__VIEWPORT_PROJECTION_FINDER_HPP_
 
-#include <utility>
-
 #include <OgreVector.h>
 
 #include "rviz_rendering/visibility_control.hpp"
diff --git a/rviz_rendering/src/rviz_rendering/geometry.cpp b/rviz_rendering/src/rviz_rendering/geometry.cpp
index 188180855..2eb8544fd 100644
--- a/rviz_rendering/src/rviz_rendering/geometry.cpp
+++ b/rviz_rendering/src/rviz_rendering/geometry.cpp
@@ -29,8 +29,6 @@
 // POSSIBILITY OF SUCH DAMAGE.
 
 
-#include <utility>
-
 #include <OgreRay.h>
 #include <OgrePlane.h>
 #include <OgreCamera.h>
diff --git a/rviz_rendering/src/rviz_rendering/logging.cpp b/rviz_rendering/src/rviz_rendering/logging.cpp
index 23588efb3..211e5a5f7 100644
--- a/rviz_rendering/src/rviz_rendering/logging.cpp
+++ b/rviz_rendering/src/rviz_rendering/logging.cpp
@@ -31,7 +31,6 @@
 #include "rviz_rendering/logging.hpp"
 
 #include <cstdio>
-#include <memory>
 #include <mutex>
 #include <string>
 
diff --git a/rviz_rendering/src/rviz_rendering/material_manager.cpp b/rviz_rendering/src/rviz_rendering/material_manager.cpp
index 4076b0f8b..4232f45bb 100644
--- a/rviz_rendering/src/rviz_rendering/material_manager.cpp
+++ b/rviz_rendering/src/rviz_rendering/material_manager.cpp
@@ -31,8 +31,6 @@
 
 #include "rviz_rendering/material_manager.hpp"
 
-#include <string>
-
 #include <OgreMaterial.h>
 #include <OgreTechnique.h>
 
diff --git a/rviz_rendering/src/rviz_rendering/mesh_loader.cpp b/rviz_rendering/src/rviz_rendering/mesh_loader.cpp
index 8b1217351..a4fa6e024 100644
--- a/rviz_rendering/src/rviz_rendering/mesh_loader.cpp
+++ b/rviz_rendering/src/rviz_rendering/mesh_loader.cpp
@@ -52,9 +52,9 @@
 #if defined(ASSIMP_UNIFIED_HEADER_NAMES)
 #include "assimp/Importer.hpp"
 #include "assimp/scene.h"
-#include "assimp/postprocess.h"
-#include "assimp/IOStream.hpp"
-#include "assimp/IOSystem.hpp"
+//#include "assimp/postprocess.h"
+//#include "assimp/IOStream.hpp"
+//#include "assimp/IOSystem.hpp"
 #else
 #include "assimp/assimp.hpp"
 #include "assimp/aiScene.h"
diff --git a/rviz_rendering/src/rviz_rendering/mesh_loader_helpers/assimp_loader.cpp b/rviz_rendering/src/rviz_rendering/mesh_loader_helpers/assimp_loader.cpp
index 7e86080b7..594392fd0 100644
--- a/rviz_rendering/src/rviz_rendering/mesh_loader_helpers/assimp_loader.cpp
+++ b/rviz_rendering/src/rviz_rendering/mesh_loader_helpers/assimp_loader.cpp
@@ -34,9 +34,7 @@
 #include <algorithm>
 #include <cctype>
 #include <filesystem>
-#include <memory>
 #include <string>
-#include <vector>
 
 #include <OgreHardwareBufferManager.h>
 #include <OgreMaterial.h>
diff --git a/rviz_rendering/src/rviz_rendering/mesh_loader_helpers/assimp_loader.hpp b/rviz_rendering/src/rviz_rendering/mesh_loader_helpers/assimp_loader.hpp
index a27b07b87..85abe23a3 100644
--- a/rviz_rendering/src/rviz_rendering/mesh_loader_helpers/assimp_loader.hpp
+++ b/rviz_rendering/src/rviz_rendering/mesh_loader_helpers/assimp_loader.hpp
@@ -32,9 +32,7 @@
 #ifndef RVIZ_RENDERING__MESH_LOADER_HELPERS__ASSIMP_LOADER_HPP_
 #define RVIZ_RENDERING__MESH_LOADER_HELPERS__ASSIMP_LOADER_HPP_
 
-#include <memory>
 #include <string>
-#include <vector>
 
 #include "OgreHardwareBufferManager.h"
 #include "OgreMesh.h"
diff --git a/rviz_rendering/src/rviz_rendering/objects/arrow.cpp b/rviz_rendering/src/rviz_rendering/objects/arrow.cpp
index 2be5293d2..d1b2a07bc 100644
--- a/rviz_rendering/src/rviz_rendering/objects/arrow.cpp
+++ b/rviz_rendering/src/rviz_rendering/objects/arrow.cpp
@@ -31,8 +31,6 @@
 
 #include "rviz_rendering/objects/arrow.hpp"
 
-#include <sstream>
-
 #include <OgreQuaternion.h>
 #include <OgreSceneManager.h>
 #include <OgreSceneNode.h>
diff --git a/rviz_rendering/src/rviz_rendering/objects/axes.cpp b/rviz_rendering/src/rviz_rendering/objects/axes.cpp
index bff099326..f612d61d9 100644
--- a/rviz_rendering/src/rviz_rendering/objects/axes.cpp
+++ b/rviz_rendering/src/rviz_rendering/objects/axes.cpp
@@ -31,8 +31,6 @@
 
 #include "rviz_rendering/objects/axes.hpp"
 
-#include <memory>
-#include <sstream>
 
 #include <OgreQuaternion.h>
 #include <OgreSceneManager.h>
diff --git a/rviz_rendering/src/rviz_rendering/objects/billboard_line.cpp b/rviz_rendering/src/rviz_rendering/objects/billboard_line.cpp
index c7317fa65..107ffc6bc 100644
--- a/rviz_rendering/src/rviz_rendering/objects/billboard_line.cpp
+++ b/rviz_rendering/src/rviz_rendering/objects/billboard_line.cpp
@@ -39,9 +39,6 @@
 #include <OgreMaterialManager.h>
 #include <OgreTechnique.h>
 
-#include <iostream>
-#include <stdexcept>
-#include <string>
 
 #include "rviz_rendering/material_manager.hpp"
 
diff --git a/rviz_rendering/src/rviz_rendering/objects/covariance_visual.cpp b/rviz_rendering/src/rviz_rendering/objects/covariance_visual.cpp
index 922cc9074..25ba7c97c 100644
--- a/rviz_rendering/src/rviz_rendering/objects/covariance_visual.cpp
+++ b/rviz_rendering/src/rviz_rendering/objects/covariance_visual.cpp
@@ -32,10 +32,7 @@
 #include "rviz_rendering/objects/covariance_visual.hpp"
 
 #include <cmath>
-#include <memory>
-#include <sstream>
 #include <tuple>
-#include <vector>
 
 #include <OgreEntity.h>
 #include <OgreSceneManager.h>
diff --git a/rviz_rendering/src/rviz_rendering/objects/effort_visual.cpp b/rviz_rendering/src/rviz_rendering/objects/effort_visual.cpp
index 7a180e20f..ee0195e29 100644
--- a/rviz_rendering/src/rviz_rendering/objects/effort_visual.cpp
+++ b/rviz_rendering/src/rviz_rendering/objects/effort_visual.cpp
@@ -31,8 +31,6 @@
 #define _USE_MATH_DEFINES
 #include "rviz_rendering/objects/effort_visual.hpp"
 
-#include <algorithm>
-#include <cmath>
 
 namespace rviz_rendering
 {
diff --git a/rviz_rendering/src/rviz_rendering/objects/grid.cpp b/rviz_rendering/src/rviz_rendering/objects/grid.cpp
index 0207f0135..dd27060ad 100644
--- a/rviz_rendering/src/rviz_rendering/objects/grid.cpp
+++ b/rviz_rendering/src/rviz_rendering/objects/grid.cpp
@@ -31,10 +31,6 @@
 
 #include "rviz_rendering/objects/grid.hpp"
 
-#include <functional>
-#include <memory>
-#include <string>
-
 #include <OgreSceneManager.h>
 #include <OgreSceneNode.h>
 #include <OgreVector.h>
diff --git a/rviz_rendering/src/rviz_rendering/objects/line.cpp b/rviz_rendering/src/rviz_rendering/objects/line.cpp
index b2dbf43e0..87fb2f312 100644
--- a/rviz_rendering/src/rviz_rendering/objects/line.cpp
+++ b/rviz_rendering/src/rviz_rendering/objects/line.cpp
@@ -30,8 +30,6 @@
 
 #include "rviz_rendering/objects/line.hpp"
 
-#include <string>
-
 #include <OgreSceneNode.h>
 #include <OgreSceneManager.h>
 #include <OgreManualObject.h>
diff --git a/rviz_rendering/src/rviz_rendering/objects/movable_text.cpp b/rviz_rendering/src/rviz_rendering/objects/movable_text.cpp
index 397a2cdce..8bb848825 100644
--- a/rviz_rendering/src/rviz_rendering/objects/movable_text.cpp
+++ b/rviz_rendering/src/rviz_rendering/objects/movable_text.cpp
@@ -44,10 +44,6 @@
 
 #include "rviz_rendering/objects/movable_text.hpp"
 
-#include <algorithm>
-#include <limits>
-#include <sstream>
-#include <string>
 
 #include <OgreCamera.h>
 #include <OgreHardwareBufferManager.h>
diff --git a/rviz_rendering/src/rviz_rendering/objects/point_cloud.cpp b/rviz_rendering/src/rviz_rendering/objects/point_cloud.cpp
index ca36ddcc3..6b03e136a 100644
--- a/rviz_rendering/src/rviz_rendering/objects/point_cloud.cpp
+++ b/rviz_rendering/src/rviz_rendering/objects/point_cloud.cpp
@@ -31,10 +31,7 @@
 
 #include "rviz_rendering/objects/point_cloud.hpp"
 
-#include <algorithm>
 #include <cassert>
-#include <sstream>
-#include <vector>
 
 #include <OgreSceneManager.h>
 #include <OgreSceneNode.h>
diff --git a/rviz_rendering/src/rviz_rendering/objects/point_cloud_renderable.cpp b/rviz_rendering/src/rviz_rendering/objects/point_cloud_renderable.cpp
index 8c7773ff2..cce137b13 100644
--- a/rviz_rendering/src/rviz_rendering/objects/point_cloud_renderable.cpp
+++ b/rviz_rendering/src/rviz_rendering/objects/point_cloud_renderable.cpp
@@ -31,8 +31,6 @@
 
 #include "rviz_rendering/objects/point_cloud_renderable.hpp"
 
-#include <algorithm>
-
 #include <OgreCamera.h>
 
 #include "rviz_rendering/objects/point_cloud.hpp"
diff --git a/rviz_rendering/src/rviz_rendering/objects/screw_visual.cpp b/rviz_rendering/src/rviz_rendering/objects/screw_visual.cpp
index d149256ef..6d1389c70 100644
--- a/rviz_rendering/src/rviz_rendering/objects/screw_visual.cpp
+++ b/rviz_rendering/src/rviz_rendering/objects/screw_visual.cpp
@@ -32,9 +32,6 @@
 #include <OgreSceneNode.h>
 #include <OgreSceneManager.h>
 
-#include <cmath>
-#include <stdexcept>
-#include <memory>
 
 #include "rviz_rendering/objects/arrow.hpp"
 #include "rviz_rendering/objects/billboard_line.hpp"
diff --git a/rviz_rendering/src/rviz_rendering/objects/shape.cpp b/rviz_rendering/src/rviz_rendering/objects/shape.cpp
index 4369ea304..23b6ec517 100644
--- a/rviz_rendering/src/rviz_rendering/objects/shape.cpp
+++ b/rviz_rendering/src/rviz_rendering/objects/shape.cpp
@@ -31,9 +31,6 @@
 
 #include "rviz_rendering/objects/shape.hpp"
 
-#include <cstdint>
-#include <string>
-
 #include <OgreEntity.h>
 #include <OgreMaterialManager.h>
 #include <OgreQuaternion.h>
diff --git a/rviz_rendering/src/rviz_rendering/objects/triangle_polygon.cpp b/rviz_rendering/src/rviz_rendering/objects/triangle_polygon.cpp
index 90cbdedeb..27c990e46 100644
--- a/rviz_rendering/src/rviz_rendering/objects/triangle_polygon.cpp
+++ b/rviz_rendering/src/rviz_rendering/objects/triangle_polygon.cpp
@@ -30,8 +30,6 @@
 
 #include "rviz_rendering/objects/triangle_polygon.hpp"
 
-#include <string>
-
 #include <OgreColourValue.h>
 #include <OgreManualObject.h>
 #include <OgreRenderOperation.h>
diff --git a/rviz_rendering/src/rviz_rendering/objects/wrench_visual.cpp b/rviz_rendering/src/rviz_rendering/objects/wrench_visual.cpp
index 3aec9a950..54fd5e51e 100644
--- a/rviz_rendering/src/rviz_rendering/objects/wrench_visual.cpp
+++ b/rviz_rendering/src/rviz_rendering/objects/wrench_visual.cpp
@@ -29,9 +29,6 @@
 
 
 #define _USE_MATH_DEFINES
-#include <algorithm>
-#include <cmath>
-#include <memory>
 
 #include <OgreVector.h>
 #include <OgreSceneNode.h>