diff --git a/crates/ironrdp-client/src/rdp.rs b/crates/ironrdp-client/src/rdp.rs
index f191ab90..eba13ce5 100644
--- a/crates/ironrdp-client/src/rdp.rs
+++ b/crates/ironrdp-client/src/rdp.rs
@@ -14,6 +14,7 @@ use ironrdp::session::{fast_path, ActiveStage, ActiveStageOutput, GracefulDiscon
 use ironrdp::svc::SvcMessage;
 use ironrdp::{cliprdr, connector, rdpdr, rdpsnd, session};
 use ironrdp_core::WriteBuf;
+use ironrdp_dvc_pipe_proxy::DvcNamedPipeProxy;
 use ironrdp_rdpsnd_native::cpal;
 use ironrdp_tokio::reqwest::ReqwestNetworkClient;
 use ironrdp_tokio::{single_sequence_step_read, split_tokio_framed, FramedWrite};
@@ -25,7 +26,6 @@ use tokio::sync::mpsc;
 use winit::event_loop::EventLoopProxy;
 
 use crate::config::{Config, RDCleanPathConfig};
-use ironrdp_dvc_pipe_proxy::DvcNamedPipeProxy;
 
 #[derive(Debug)]
 pub enum RdpOutputEvent {
diff --git a/crates/ironrdp-dvc-pipe-proxy/src/lib.rs b/crates/ironrdp-dvc-pipe-proxy/src/lib.rs
index f8031562..6bbd7721 100644
--- a/crates/ironrdp-dvc-pipe-proxy/src/lib.rs
+++ b/crates/ironrdp-dvc-pipe-proxy/src/lib.rs
@@ -8,5 +8,4 @@ extern crate tracing;
 mod windows;
 
 mod platform;
-
-pub use platform::DvcNamedPipeProxy;
+pub use self::platform::DvcNamedPipeProxy;
diff --git a/crates/ironrdp-dvc-pipe-proxy/src/platform/mod.rs b/crates/ironrdp-dvc-pipe-proxy/src/platform/mod.rs
index 19e79b37..5cec8ee4 100644
--- a/crates/ironrdp-dvc-pipe-proxy/src/platform/mod.rs
+++ b/crates/ironrdp-dvc-pipe-proxy/src/platform/mod.rs
@@ -1,11 +1,9 @@
 #[cfg(target_os = "windows")]
 mod windows;
+#[cfg(target_os = "windows")]
+pub use self::windows::DvcNamedPipeProxy;
 
 #[cfg(not(target_os = "windows"))]
 mod unix;
-
-#[cfg(target_os = "windows")]
-pub use windows::DvcNamedPipeProxy;
-
 #[cfg(not(target_os = "windows"))]
-pub use unix::DvcNamedPipeProxy;
+pub use self::unix::DvcNamedPipeProxy;
diff --git a/crates/ironrdp-dvc-pipe-proxy/src/windows/mod.rs b/crates/ironrdp-dvc-pipe-proxy/src/windows/mod.rs
index 84906986..306296a6 100644
--- a/crates/ironrdp-dvc-pipe-proxy/src/windows/mod.rs
+++ b/crates/ironrdp-dvc-pipe-proxy/src/windows/mod.rs
@@ -2,21 +2,23 @@
 //!
 //! Some of the wrappers are based on `win-api-wrappers` code (simplified/reduced functionality).
 
-mod error;
-mod event;
-mod pipe;
-mod semaphore;
-
-pub(crate) use error::WindowsError;
-pub(crate) use event::Event;
-pub(crate) use pipe::MessagePipeServer;
-pub(crate) use semaphore::Semaphore;
-
 use windows::Win32::Foundation::{
     ERROR_IO_PENDING, HANDLE, WAIT_ABANDONED_0, WAIT_EVENT, WAIT_FAILED, WAIT_OBJECT_0, WAIT_TIMEOUT,
 };
 use windows::Win32::System::Threading::{WaitForMultipleObjects, INFINITE};
 
+mod error;
+pub(crate) use self::error::WindowsError;
+
+mod event;
+pub(crate) use self::event::Event;
+
+mod pipe;
+pub(crate) use self::pipe::MessagePipeServer;
+
+mod semaphore;
+pub(crate) use self::semaphore::Semaphore;
+
 /// Thin wrapper around borrowed `windows` crate `HANDLE` reference.
 /// This is used to ensure handle lifetime when passing it to FFI functions
 /// (see `wait_any_with_timeout` for example).