diff --git a/ogre/include/gz/rendering/ogre/OgreRTShaderSystem.hh b/ogre/include/gz/rendering/ogre/OgreRTShaderSystem.hh
index 03e2aa889..6cad30676 100644
--- a/ogre/include/gz/rendering/ogre/OgreRTShaderSystem.hh
+++ b/ogre/include/gz/rendering/ogre/OgreRTShaderSystem.hh
@@ -42,8 +42,7 @@ namespace gz
     ///
     /// This class allows Gazebo to generate per-pixel shaders for every
     /// material at run-time.
-    class GZ_RENDERING_OGRE_VISIBLE OgreRTShaderSystem :
-      public common::SingletonT<OgreRTShaderSystem>
+    class GZ_RENDERING_OGRE_VISIBLE OgreRTShaderSystem
     {
       /// \enum LightingModel
       /// \brief The type of lighting
@@ -169,7 +168,6 @@ namespace gz
       public: void Update();
 
       /// \brief Get a pointer to the Ogre RT shader system
-      /// \todo(anyone) Remove inheritance from Singleton base class
       /// \return a pointer to the Ogre RT shader system
       public: static OgreRTShaderSystem *Instance();
 
diff --git a/ogre/include/gz/rendering/ogre/OgreRenderEngine.hh b/ogre/include/gz/rendering/ogre/OgreRenderEngine.hh
index bf46463b6..457c448ba 100644
--- a/ogre/include/gz/rendering/ogre/OgreRenderEngine.hh
+++ b/ogre/include/gz/rendering/ogre/OgreRenderEngine.hh
@@ -66,8 +66,7 @@ namespace gz
     };
 
     class GZ_RENDERING_OGRE_VISIBLE OgreRenderEngine :
-      public virtual BaseRenderEngine,
-      public common::SingletonT<OgreRenderEngine>
+      public virtual BaseRenderEngine
     {
       /// \enum OgreRenderPathType
       /// \brief The type of rendering path used by the rendering engine.
@@ -114,7 +113,6 @@ namespace gz
       public: std::vector<unsigned int> FSAALevels() const;
 
       /// \brief Get a pointer to the render engine
-      /// \todo(anyone) Remove inheritance from Singleton base class
       /// \return a pointer to the render engine
       public: static OgreRenderEngine *Instance();
 
diff --git a/ogre/src/OgreRTShaderSystem.cc b/ogre/src/OgreRTShaderSystem.cc
index 0034207aa..5d45c14ee 100644
--- a/ogre/src/OgreRTShaderSystem.cc
+++ b/ogre/src/OgreRTShaderSystem.cc
@@ -756,5 +756,5 @@ bool OgreRTShaderSystem::IsInitialized() const
 //////////////////////////////////////////////////
 OgreRTShaderSystem *OgreRTShaderSystem::Instance()
 {
-  return SingletonT<OgreRTShaderSystem>::Instance();
+  return gz::common::SingletonT<OgreRTShaderSystem>::Instance();
 }
diff --git a/ogre/src/OgreRenderEngine.cc b/ogre/src/OgreRenderEngine.cc
index c77287c1a..7352e747a 100644
--- a/ogre/src/OgreRenderEngine.cc
+++ b/ogre/src/OgreRenderEngine.cc
@@ -839,7 +839,7 @@ Ogre::OverlaySystem *OgreRenderEngine::OverlaySystem() const
 //////////////////////////////////////////////////
 OgreRenderEngine *OgreRenderEngine::Instance()
 {
-  return SingletonT<OgreRenderEngine>::Instance();
+  return gz::common::SingletonT<OgreRenderEngine>::Instance();
 }
 
 // Register this plugin
diff --git a/ogre2/include/gz/rendering/ogre2/Ogre2RenderEngine.hh b/ogre2/include/gz/rendering/ogre2/Ogre2RenderEngine.hh
index 2412d1268..d1a8c4441 100644
--- a/ogre2/include/gz/rendering/ogre2/Ogre2RenderEngine.hh
+++ b/ogre2/include/gz/rendering/ogre2/Ogre2RenderEngine.hh
@@ -79,8 +79,7 @@ namespace gz
     /// underlying ogre2 render engine, loads its plugins, and creates
     /// resources needed for the engine to run
     class GZ_RENDERING_OGRE2_VISIBLE Ogre2RenderEngine :
-      public virtual BaseRenderEngine,
-      public common::SingletonT<Ogre2RenderEngine>
+      public virtual BaseRenderEngine
     {
       /// \brief Constructor
       private: Ogre2RenderEngine();
@@ -230,7 +229,6 @@ namespace gz
           *TerraWorkspaceListener() const;
 
       /// \brief Get a pointer to the render engine
-      /// \todo(anyone) Remove inheritance from Singleton base class
       /// \return a pointer to the render engine
       public: static Ogre2RenderEngine *Instance();
 
diff --git a/ogre2/src/Ogre2RenderEngine.cc b/ogre2/src/Ogre2RenderEngine.cc
index 4c0b76f9b..ca68b5af4 100644
--- a/ogre2/src/Ogre2RenderEngine.cc
+++ b/ogre2/src/Ogre2RenderEngine.cc
@@ -1455,7 +1455,7 @@ Ogre::CompositorWorkspaceListener *Ogre2RenderEngine::TerraWorkspaceListener()
 //////////////////////////////////////////////////
 Ogre2RenderEngine *Ogre2RenderEngine::Instance()
 {
-  return SingletonT<Ogre2RenderEngine>::Instance();
+  return gz::common::SingletonT<Ogre2RenderEngine>::Instance();
 }
 
 // Register this plugin