diff --git a/crates/bevy_render/src/renderer/diagnostics.rs b/crates/bevy_render/src/diagnostics.rs
similarity index 100%
rename from crates/bevy_render/src/renderer/diagnostics.rs
rename to crates/bevy_render/src/diagnostics.rs
diff --git a/crates/bevy_render/src/lib.rs b/crates/bevy_render/src/lib.rs
index 61e814e9bc2d9..79fd7d67d6892 100644
--- a/crates/bevy_render/src/lib.rs
+++ b/crates/bevy_render/src/lib.rs
@@ -7,6 +7,7 @@ extern crate core;
 
 pub mod camera;
 pub mod color;
+pub mod diagnostics;
 pub mod extract_component;
 mod extract_param;
 pub mod extract_resource;
diff --git a/crates/bevy_render/src/render_phase/draw_state.rs b/crates/bevy_render/src/render_phase/draw_state.rs
index af92869238e6a..b1f4da0fe9831 100644
--- a/crates/bevy_render/src/render_phase/draw_state.rs
+++ b/crates/bevy_render/src/render_phase/draw_state.rs
@@ -1,14 +1,12 @@
 use crate::{
     camera::Viewport,
+    diagnostics::{Pass, PassKind, WritePipelineStatistics, WriteTimestamp},
     prelude::Color,
     render_resource::{
         BindGroup, BindGroupId, Buffer, BufferId, BufferSlice, RenderPipeline, RenderPipelineId,
         ShaderStages,
     },
-    renderer::{
-        diagnostics::{Pass, PassKind, WritePipelineStatistics, WriteTimestamp},
-        RenderDevice,
-    },
+    renderer::RenderDevice,
 };
 use bevy_utils::{default, detailed_trace};
 use std::ops::Range;
diff --git a/crates/bevy_render/src/renderer/graph_runner.rs b/crates/bevy_render/src/renderer/graph_runner.rs
index 0d0f1bedae04d..cb8efed307933 100644
--- a/crates/bevy_render/src/renderer/graph_runner.rs
+++ b/crates/bevy_render/src/renderer/graph_runner.rs
@@ -9,6 +9,7 @@ use std::{borrow::Cow, collections::VecDeque};
 use thiserror::Error;
 
 use crate::{
+    diagnostics::{DiagnosticsRecorder, RenderDiagnosticsMutex},
     render_graph::{
         Edge, NodeId, NodeRunError, NodeState, RenderGraph, RenderGraphContext, SlotLabel,
         SlotType, SlotValue,
@@ -16,8 +17,6 @@ use crate::{
     renderer::{RenderContext, RenderDevice},
 };
 
-use super::diagnostics::{DiagnosticsRecorder, RenderDiagnosticsMutex};
-
 pub(crate) struct RenderGraphRunner;
 
 #[derive(Error, Debug)]
diff --git a/crates/bevy_render/src/renderer/mod.rs b/crates/bevy_render/src/renderer/mod.rs
index 303c239a10993..18f8849c9617b 100644
--- a/crates/bevy_render/src/renderer/mod.rs
+++ b/crates/bevy_render/src/renderer/mod.rs
@@ -1,4 +1,3 @@
-pub mod diagnostics;
 mod graph_runner;
 mod render_device;
 
@@ -8,6 +7,7 @@ pub use graph_runner::*;
 pub use render_device::*;
 
 use crate::{
+    diagnostics::{DiagnosticsRecorder, OptionalDiagnosticRecorder},
     render_graph::RenderGraph,
     render_phase::TrackedRenderPass,
     render_resource::RenderPassDescriptor,
@@ -22,8 +22,6 @@ use wgpu::{
     Adapter, AdapterInfo, CommandBuffer, CommandEncoder, Instance, Queue, RequestAdapterOptions,
 };
 
-use self::diagnostics::{DiagnosticsRecorder, OptionalDiagnosticRecorder};
-
 /// Updates the [`RenderGraph`] with all of its nodes and then runs it to render the entire frame.
 pub fn render_system(world: &mut World) {
     world.resource_scope(|world, mut graph: Mut<RenderGraph>| {