diff --git a/Cargo.toml b/Cargo.toml
index db9cc0d0..6cea9b12 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -65,6 +65,7 @@ unused_lifetimes = "warn"
 unused_qualifications = "warn"
 keyword_idents = "warn"
 noop_method_call = "warn"
+macro_use_extern_crate = "warn"
 # missing_docs = "warn" # TODO: NOTE(@CBenoit): we probably want to ensure this in core tier crates only
 
 # == Compile-time / optimization == #
diff --git a/crates/ironrdp-acceptor/src/channel_connection.rs b/crates/ironrdp-acceptor/src/channel_connection.rs
index 25f876f7..2c6aa62e 100644
--- a/crates/ironrdp-acceptor/src/channel_connection.rs
+++ b/crates/ironrdp-acceptor/src/channel_connection.rs
@@ -7,6 +7,7 @@ use ironrdp_core::WriteBuf;
 use ironrdp_pdu::x224::X224;
 use ironrdp_pdu::{self as pdu};
 use pdu::mcs;
+use tracing::debug;
 
 #[derive(Debug)]
 pub struct ChannelConnectionSequence {
diff --git a/crates/ironrdp-acceptor/src/connection.rs b/crates/ironrdp-acceptor/src/connection.rs
index fd8b694c..246e65af 100644
--- a/crates/ironrdp-acceptor/src/connection.rs
+++ b/crates/ironrdp-acceptor/src/connection.rs
@@ -15,6 +15,7 @@ use pdu::rdp::headers::ShareControlPdu;
 use pdu::rdp::server_error_info::{ErrorInfo, ProtocolIndependentCode, ServerSetErrorInfoPdu};
 use pdu::rdp::server_license::{LicensePdu, LicensingErrorMessage};
 use pdu::{gcc, mcs, nego, rdp};
+use tracing::{debug, warn};
 
 use super::channel_connection::ChannelConnectionSequence;
 use super::finalization::FinalizationSequence;
diff --git a/crates/ironrdp-acceptor/src/credssp.rs b/crates/ironrdp-acceptor/src/credssp.rs
index f00ed749..f8840780 100644
--- a/crates/ironrdp-acceptor/src/credssp.rs
+++ b/crates/ironrdp-acceptor/src/credssp.rs
@@ -10,6 +10,7 @@ use ironrdp_connector::{
 };
 use ironrdp_core::{other_err, WriteBuf};
 use ironrdp_pdu::PduHint;
+use tracing::debug;
 
 #[derive(Debug)]
 pub(crate) enum CredsspState {
diff --git a/crates/ironrdp-acceptor/src/finalization.rs b/crates/ironrdp-acceptor/src/finalization.rs
index 406d4d71..6192ebbf 100644
--- a/crates/ironrdp-acceptor/src/finalization.rs
+++ b/crates/ironrdp-acceptor/src/finalization.rs
@@ -3,6 +3,7 @@ use ironrdp_core::WriteBuf;
 use ironrdp_pdu::x224::X224;
 use ironrdp_pdu::{self as pdu};
 use pdu::rdp;
+use tracing::debug;
 
 use crate::util::{self, wrap_share_data};
 
diff --git a/crates/ironrdp-acceptor/src/lib.rs b/crates/ironrdp-acceptor/src/lib.rs
index 5bd13b6b..aea782a4 100644
--- a/crates/ironrdp-acceptor/src/lib.rs
+++ b/crates/ironrdp-acceptor/src/lib.rs
@@ -1,14 +1,12 @@
 #![cfg_attr(doc, doc = include_str!("../README.md"))]
 #![doc(html_logo_url = "https://cdnweb.devolutions.net/images/projects/devolutions/logos/devolutions-icon-shadow.svg")]
 
-#[macro_use]
-extern crate tracing;
-
 use ironrdp_async::{single_sequence_step, AsyncNetworkClient, Framed, FramedRead, FramedWrite, StreamWrapper};
 use ironrdp_connector::sspi::credssp::EarlyUserAuthResult;
 use ironrdp_connector::sspi::{AuthIdentity, KerberosServerConfig, Username};
 use ironrdp_connector::{custom_err, general_err, ConnectorResult, ServerName};
 use ironrdp_core::WriteBuf;
+use tracing::{debug, instrument, trace};
 
 mod channel_connection;
 mod connection;
diff --git a/crates/ironrdp-async/src/connector.rs b/crates/ironrdp-async/src/connector.rs
index 4d1b085d..5f33c19b 100644
--- a/crates/ironrdp-async/src/connector.rs
+++ b/crates/ironrdp-async/src/connector.rs
@@ -6,6 +6,7 @@ use ironrdp_connector::{
     ServerName, State as _,
 };
 use ironrdp_core::WriteBuf;
+use tracing::{debug, info, instrument, trace};
 
 use crate::framed::{Framed, FramedRead, FramedWrite};
 use crate::{single_sequence_step, AsyncNetworkClient};
diff --git a/crates/ironrdp-async/src/framed.rs b/crates/ironrdp-async/src/framed.rs
index f7c2ac92..214682e9 100644
--- a/crates/ironrdp-async/src/framed.rs
+++ b/crates/ironrdp-async/src/framed.rs
@@ -4,6 +4,7 @@ use bytes::{Bytes, BytesMut};
 use ironrdp_connector::{ConnectorResult, Sequence, Written};
 use ironrdp_core::WriteBuf;
 use ironrdp_pdu::PduHint;
+use tracing::{debug, trace};
 
 // TODO: investigate if we could use static async fn / return position impl trait in traits when stabilized:
 // https://github.com/rust-lang/rust/issues/91611
diff --git a/crates/ironrdp-async/src/lib.rs b/crates/ironrdp-async/src/lib.rs
index a0eb44ac..b3677535 100644
--- a/crates/ironrdp-async/src/lib.rs
+++ b/crates/ironrdp-async/src/lib.rs
@@ -1,9 +1,6 @@
 #![cfg_attr(doc, doc = include_str!("../README.md"))]
 #![doc(html_logo_url = "https://cdnweb.devolutions.net/images/projects/devolutions/logos/devolutions-icon-shadow.svg")]
 
-#[macro_use]
-extern crate tracing;
-
 pub use bytes;
 
 mod connector;
diff --git a/crates/ironrdp-blocking/src/connector.rs b/crates/ironrdp-blocking/src/connector.rs
index 765560e6..80623e79 100644
--- a/crates/ironrdp-blocking/src/connector.rs
+++ b/crates/ironrdp-blocking/src/connector.rs
@@ -9,6 +9,7 @@ use ironrdp_connector::{
     Sequence as _, ServerName, State as _,
 };
 use ironrdp_core::WriteBuf;
+use tracing::{debug, info, instrument, trace};
 
 use crate::framed::Framed;
 
diff --git a/crates/ironrdp-blocking/src/framed.rs b/crates/ironrdp-blocking/src/framed.rs
index d44f7881..885fe578 100644
--- a/crates/ironrdp-blocking/src/framed.rs
+++ b/crates/ironrdp-blocking/src/framed.rs
@@ -2,6 +2,7 @@ use std::io::{self, Read, Write};
 
 use bytes::{Bytes, BytesMut};
 use ironrdp_pdu::PduHint;
+use tracing::debug;
 
 pub struct Framed<S> {
     stream: S,
diff --git a/crates/ironrdp-blocking/src/lib.rs b/crates/ironrdp-blocking/src/lib.rs
index 96ee4843..e5955ac3 100644
--- a/crates/ironrdp-blocking/src/lib.rs
+++ b/crates/ironrdp-blocking/src/lib.rs
@@ -1,9 +1,6 @@
 #![cfg_attr(doc, doc = include_str!("../README.md"))]
 #![doc(html_logo_url = "https://cdnweb.devolutions.net/images/projects/devolutions/logos/devolutions-icon-shadow.svg")]
 
-#[macro_use]
-extern crate tracing;
-
 mod connector;
 mod framed;
 mod session;
diff --git a/crates/ironrdp-client-glutin/src/main.rs b/crates/ironrdp-client-glutin/src/main.rs
index 9e2d759f..c65aa9a5 100644
--- a/crates/ironrdp-client-glutin/src/main.rs
+++ b/crates/ironrdp-client-glutin/src/main.rs
@@ -1,6 +1,3 @@
-#[macro_use]
-extern crate tracing;
-
 mod config;
 
 use std::sync::mpsc::sync_channel;
diff --git a/crates/ironrdp-client/src/app.rs b/crates/ironrdp-client/src/app.rs
index f9da5579..81aca996 100644
--- a/crates/ironrdp-client/src/app.rs
+++ b/crates/ironrdp-client/src/app.rs
@@ -7,6 +7,7 @@ use std::time::Instant;
 
 use raw_window_handle::{DisplayHandle, HasDisplayHandle as _};
 use tokio::sync::mpsc;
+use tracing::{debug, error, trace};
 use winit::application::ApplicationHandler;
 use winit::dpi::{LogicalPosition, PhysicalSize};
 use winit::event::{self, WindowEvent};
diff --git a/crates/ironrdp-client/src/clipboard.rs b/crates/ironrdp-client/src/clipboard.rs
index 0fa025be..a58716a9 100644
--- a/crates/ironrdp-client/src/clipboard.rs
+++ b/crates/ironrdp-client/src/clipboard.rs
@@ -1,5 +1,6 @@
 use ironrdp::cliprdr::backend::{ClipboardMessage, ClipboardMessageProxy};
 use tokio::sync::mpsc;
+use tracing::error;
 
 use crate::rdp::RdpInputEvent;
 
diff --git a/crates/ironrdp-client/src/lib.rs b/crates/ironrdp-client/src/lib.rs
index 431cf980..de4b5276 100644
--- a/crates/ironrdp-client/src/lib.rs
+++ b/crates/ironrdp-client/src/lib.rs
@@ -9,9 +9,6 @@
 #![allow(clippy::cast_possible_wrap)]
 #![allow(clippy::cast_sign_loss)]
 
-#[macro_use]
-extern crate tracing;
-
 pub mod app;
 pub mod clipboard;
 pub mod config;
diff --git a/crates/ironrdp-client/src/main.rs b/crates/ironrdp-client/src/main.rs
index 49320bbf..8ae6248d 100644
--- a/crates/ironrdp-client/src/main.rs
+++ b/crates/ironrdp-client/src/main.rs
@@ -1,13 +1,11 @@
 #![allow(unused_crate_dependencies)] // false positives because there is both a library and a binary
 
-#[macro_use]
-extern crate tracing;
-
 use anyhow::Context as _;
 use ironrdp_client::app::App;
 use ironrdp_client::config::{ClipboardType, Config};
 use ironrdp_client::rdp::{DvcPipeProxyFactory, RdpClient, RdpInputEvent, RdpOutputEvent};
 use tokio::runtime;
+use tracing::debug;
 use winit::event_loop::EventLoop;
 
 fn main() -> anyhow::Result<()> {
diff --git a/crates/ironrdp-client/src/rdp.rs b/crates/ironrdp-client/src/rdp.rs
index 2c3d997c..e65f60f4 100644
--- a/crates/ironrdp-client/src/rdp.rs
+++ b/crates/ironrdp-client/src/rdp.rs
@@ -23,6 +23,7 @@ use smallvec::SmallVec;
 use tokio::io::{AsyncRead, AsyncWrite};
 use tokio::net::TcpStream;
 use tokio::sync::mpsc;
+use tracing::{debug, error, info, trace, warn};
 use winit::event_loop::EventLoopProxy;
 
 use crate::config::{Config, RDCleanPathConfig};
diff --git a/crates/ironrdp-connector/src/channel_connection.rs b/crates/ironrdp-connector/src/channel_connection.rs
index 219368ab..eb2908a4 100644
--- a/crates/ironrdp-connector/src/channel_connection.rs
+++ b/crates/ironrdp-connector/src/channel_connection.rs
@@ -4,8 +4,11 @@ use std::collections::HashSet;
 use ironrdp_core::WriteBuf;
 use ironrdp_pdu::x224::X224;
 use ironrdp_pdu::{mcs, PduHint};
+use tracing::{debug, warn};
 
-use crate::{ConnectorError, ConnectorErrorExt as _, ConnectorResult, Sequence, State, Written};
+use crate::{
+    general_err, reason_err, ConnectorError, ConnectorErrorExt as _, ConnectorResult, Sequence, State, Written,
+};
 
 #[derive(Default, Debug)]
 #[non_exhaustive]
diff --git a/crates/ironrdp-connector/src/connection.rs b/crates/ironrdp-connector/src/connection.rs
index 8cf14883..c5b49198 100644
--- a/crates/ironrdp-connector/src/connection.rs
+++ b/crates/ironrdp-connector/src/connection.rs
@@ -8,13 +8,14 @@ use ironrdp_pdu::rdp::client_info::{OptionalSystemTime, TimezoneInfo};
 use ironrdp_pdu::x224::X224;
 use ironrdp_pdu::{gcc, mcs, nego, rdp, PduHint};
 use ironrdp_svc::{StaticChannelSet, StaticVirtualChannel, SvcClientProcessor};
+use tracing::{debug, error, info, warn};
 
 use crate::channel_connection::{ChannelConnectionSequence, ChannelConnectionState};
 use crate::connection_activation::{ConnectionActivationSequence, ConnectionActivationState};
 use crate::license_exchange::{LicenseExchangeSequence, NoopLicenseCache};
 use crate::{
-    encode_x224_packet, Config, ConnectorError, ConnectorErrorExt as _, ConnectorErrorKind, ConnectorResult,
-    DesktopSize, NegotiationFailure, Sequence, State, Written,
+    encode_x224_packet, general_err, reason_err, Config, ConnectorError, ConnectorErrorExt as _, ConnectorErrorKind,
+    ConnectorResult, DesktopSize, NegotiationFailure, Sequence, State, Written,
 };
 
 #[derive(Debug)]
diff --git a/crates/ironrdp-connector/src/connection_activation.rs b/crates/ironrdp-connector/src/connection_activation.rs
index 309dfc34..cc6a91b1 100644
--- a/crates/ironrdp-connector/src/connection_activation.rs
+++ b/crates/ironrdp-connector/src/connection_activation.rs
@@ -2,8 +2,11 @@ use core::mem;
 
 use ironrdp_pdu::rdp::capability_sets::CapabilitySet;
 use ironrdp_pdu::rdp::{self};
+use tracing::{debug, warn};
 
-use crate::{legacy, Config, ConnectionFinalizationSequence, ConnectorResult, DesktopSize, Sequence, State, Written};
+use crate::{
+    general_err, legacy, Config, ConnectionFinalizationSequence, ConnectorResult, DesktopSize, Sequence, State, Written,
+};
 
 /// Represents the Capability Exchange and Connection Finalization phases
 /// of the connection sequence (section [1.3.1.1]).
diff --git a/crates/ironrdp-connector/src/connection_finalization.rs b/crates/ironrdp-connector/src/connection_finalization.rs
index df863219..6267822c 100644
--- a/crates/ironrdp-connector/src/connection_finalization.rs
+++ b/crates/ironrdp-connector/src/connection_finalization.rs
@@ -5,8 +5,9 @@ use ironrdp_pdu::rdp::capability_sets::SERVER_CHANNEL_ID;
 use ironrdp_pdu::rdp::headers::ShareDataPdu;
 use ironrdp_pdu::rdp::{finalization_messages, server_error_info};
 use ironrdp_pdu::PduHint;
+use tracing::{debug, warn};
 
-use crate::{legacy, ConnectorResult, Sequence, State, Written};
+use crate::{general_err, legacy, reason_err, ConnectorResult, Sequence, State, Written};
 
 #[derive(Default, Debug, Clone)]
 #[non_exhaustive]
diff --git a/crates/ironrdp-connector/src/credssp.rs b/crates/ironrdp-connector/src/credssp.rs
index 0d2f8dec..9750b608 100644
--- a/crates/ironrdp-connector/src/credssp.rs
+++ b/crates/ironrdp-connector/src/credssp.rs
@@ -6,8 +6,11 @@ use sspi::credssp::{self, ClientState, CredSspClient};
 use sspi::generator::{Generator, NetworkRequest};
 use sspi::negotiate::ProtocolConfig;
 use sspi::Username;
+use tracing::debug;
 
-use crate::{ConnectorError, ConnectorErrorKind, ConnectorResult, Credentials, ServerName, Written};
+use crate::{
+    custom_err, general_err, ConnectorError, ConnectorErrorKind, ConnectorResult, Credentials, ServerName, Written,
+};
 
 #[derive(Debug, Clone, Default)]
 pub struct KerberosConfig {
diff --git a/crates/ironrdp-connector/src/legacy.rs b/crates/ironrdp-connector/src/legacy.rs
index 56a70fdc..e71fa97e 100644
--- a/crates/ironrdp-connector/src/legacy.rs
+++ b/crates/ironrdp-connector/src/legacy.rs
@@ -5,7 +5,7 @@ use ironrdp_pdu::rdp;
 use ironrdp_pdu::rdp::headers::ServerDeactivateAll;
 use ironrdp_pdu::x224::X224;
 
-use crate::{ConnectorError, ConnectorErrorExt as _, ConnectorResult};
+use crate::{general_err, reason_err, ConnectorError, ConnectorErrorExt as _, ConnectorResult};
 
 pub fn encode_send_data_request<T>(
     initiator_id: u16,
diff --git a/crates/ironrdp-connector/src/lib.rs b/crates/ironrdp-connector/src/lib.rs
index a6b862bc..5a31a4ee 100644
--- a/crates/ironrdp-connector/src/lib.rs
+++ b/crates/ironrdp-connector/src/lib.rs
@@ -1,10 +1,6 @@
 #![cfg_attr(doc, doc = include_str!("../README.md"))]
 #![doc(html_logo_url = "https://cdnweb.devolutions.net/images/projects/devolutions/logos/devolutions-icon-shadow.svg")]
 
-#[macro_use]
-extern crate tracing;
-
-#[macro_use]
 mod macros;
 
 pub mod legacy;
diff --git a/crates/ironrdp-connector/src/license_exchange.rs b/crates/ironrdp-connector/src/license_exchange.rs
index c995b6bb..ae8b5d85 100644
--- a/crates/ironrdp-connector/src/license_exchange.rs
+++ b/crates/ironrdp-connector/src/license_exchange.rs
@@ -7,9 +7,10 @@ use std::sync::Arc;
 use ironrdp_core::WriteBuf;
 use ironrdp_pdu::rdp::server_license::{self, LicenseInformation, LicensePdu, ServerLicenseError};
 use ironrdp_pdu::PduHint;
-use rand::prelude::*;
+use rand::RngCore as _;
+use tracing::{debug, error, info, trace};
 
-use super::{legacy, ConnectorError, ConnectorErrorExt as _};
+use super::{custom_err, general_err, legacy, ConnectorError, ConnectorErrorExt as _};
 use crate::{encode_send_data_request, ConnectorResult, ConnectorResultExt as _, Sequence, State, Written};
 
 #[derive(Default, Debug)]
diff --git a/crates/ironrdp-core/src/encode.rs b/crates/ironrdp-core/src/encode.rs
index ee8bea43..a649d66f 100644
--- a/crates/ironrdp-core/src/encode.rs
+++ b/crates/ironrdp-core/src/encode.rs
@@ -220,7 +220,7 @@ pub fn size<T: Encode>(pdu: &T) -> usize {
 #[cfg(feature = "alloc")]
 mod legacy {
     use super::{Encode, EncodeResult};
-    use crate::WriteCursor;
+    use crate::{ensure_size, WriteCursor};
 
     impl Encode for alloc::vec::Vec<u8> {
         fn encode(&self, dst: &mut WriteCursor<'_>) -> EncodeResult<()> {
diff --git a/crates/ironrdp-core/src/lib.rs b/crates/ironrdp-core/src/lib.rs
index 010396f3..252c2315 100644
--- a/crates/ironrdp-core/src/lib.rs
+++ b/crates/ironrdp-core/src/lib.rs
@@ -8,7 +8,6 @@
 #[cfg(feature = "alloc")]
 extern crate alloc;
 
-#[macro_use]
 mod macros;
 
 mod as_any;
diff --git a/crates/ironrdp-dvc-pipe-proxy/src/lib.rs b/crates/ironrdp-dvc-pipe-proxy/src/lib.rs
index 34049399..2f89fdd3 100644
--- a/crates/ironrdp-dvc-pipe-proxy/src/lib.rs
+++ b/crates/ironrdp-dvc-pipe-proxy/src/lib.rs
@@ -1,9 +1,6 @@
 #![cfg_attr(doc, doc = include_str!("../README.md"))]
 #![doc(html_logo_url = "https://cdnweb.devolutions.net/images/projects/devolutions/logos/devolutions-icon-shadow.svg")]
 
-#[macro_use]
-extern crate tracing;
-
 mod error;
 mod message;
 mod os_pipe;
diff --git a/crates/ironrdp-dvc-pipe-proxy/src/platform/unix.rs b/crates/ironrdp-dvc-pipe-proxy/src/platform/unix.rs
index 4950618f..b021004f 100644
--- a/crates/ironrdp-dvc-pipe-proxy/src/platform/unix.rs
+++ b/crates/ironrdp-dvc-pipe-proxy/src/platform/unix.rs
@@ -1,6 +1,7 @@
 use async_trait::async_trait;
 use tokio::fs;
 use tokio::io::{AsyncReadExt as _, AsyncWriteExt as _};
+use tracing::{info, trace};
 
 use crate::error::DvcPipeProxyError;
 use crate::os_pipe::OsPipe;
diff --git a/crates/ironrdp-dvc-pipe-proxy/src/proxy.rs b/crates/ironrdp-dvc-pipe-proxy/src/proxy.rs
index 07bb2720..cc496681 100644
--- a/crates/ironrdp-dvc-pipe-proxy/src/proxy.rs
+++ b/crates/ironrdp-dvc-pipe-proxy/src/proxy.rs
@@ -4,6 +4,7 @@ use ironrdp_core::impl_as_any;
 use ironrdp_dvc::{DvcClientProcessor, DvcMessage, DvcProcessor};
 use ironrdp_pdu::{pdu_other_err, PduResult};
 use ironrdp_svc::SvcMessage;
+use tracing::{debug, info};
 
 use crate::worker::{run_worker, OnWriteDvcMessage, WorkerCtx};
 
diff --git a/crates/ironrdp-dvc-pipe-proxy/src/worker.rs b/crates/ironrdp-dvc-pipe-proxy/src/worker.rs
index 4cfbcc7b..7b4dbf0b 100644
--- a/crates/ironrdp-dvc-pipe-proxy/src/worker.rs
+++ b/crates/ironrdp-dvc-pipe-proxy/src/worker.rs
@@ -4,6 +4,7 @@ use ironrdp_dvc::encode_dvc_messages;
 use ironrdp_pdu::PduResult;
 use ironrdp_svc::{ChannelFlags, SvcMessage};
 use tokio::sync::{mpsc, Notify};
+use tracing::{error, info};
 
 use crate::error::DvcPipeProxyError;
 use crate::message::RawDataDvcMessage;
diff --git a/crates/ironrdp-dvc/src/client.rs b/crates/ironrdp-dvc/src/client.rs
index 50af13dd..30e663e9 100644
--- a/crates/ironrdp-dvc/src/client.rs
+++ b/crates/ironrdp-dvc/src/client.rs
@@ -7,6 +7,7 @@ use ironrdp_pdu::{self as pdu, decode_err, encode_err, pdu_other_err};
 use ironrdp_svc::{ChannelFlags, CompressionCondition, SvcClientProcessor, SvcMessage, SvcProcessor};
 use pdu::gcc::ChannelName;
 use pdu::PduResult;
+use tracing::debug;
 
 use crate::pdu::{
     CapabilitiesResponsePdu, CapsVersion, ClosePdu, CreateResponsePdu, CreationStatus, DrdynvcClientPdu,
diff --git a/crates/ironrdp-dvc/src/complete_data.rs b/crates/ironrdp-dvc/src/complete_data.rs
index 0e0861d3..acb6d919 100644
--- a/crates/ironrdp-dvc/src/complete_data.rs
+++ b/crates/ironrdp-dvc/src/complete_data.rs
@@ -2,6 +2,7 @@ use alloc::vec::Vec;
 use core::cmp;
 
 use ironrdp_core::{cast_length, invalid_field_err, DecodeResult};
+use tracing::error;
 
 use crate::pdu::{DataFirstPdu, DataPdu, DrdynvcDataPdu};
 
diff --git a/crates/ironrdp-dvc/src/lib.rs b/crates/ironrdp-dvc/src/lib.rs
index 5e8ca561..67e4ab76 100644
--- a/crates/ironrdp-dvc/src/lib.rs
+++ b/crates/ironrdp-dvc/src/lib.rs
@@ -2,9 +2,6 @@
 #![doc(html_logo_url = "https://cdnweb.devolutions.net/images/projects/devolutions/logos/devolutions-icon-shadow.svg")]
 #![cfg_attr(not(feature = "std"), no_std)]
 
-#[macro_use]
-extern crate tracing;
-
 extern crate alloc;
 
 use alloc::boxed::Box;
diff --git a/crates/ironrdp-dvc/src/server.rs b/crates/ironrdp-dvc/src/server.rs
index cfe63883..09c1700d 100644
--- a/crates/ironrdp-dvc/src/server.rs
+++ b/crates/ironrdp-dvc/src/server.rs
@@ -8,6 +8,7 @@ use ironrdp_svc::{ChannelFlags, CompressionCondition, SvcMessage, SvcProcessor,
 use pdu::gcc::ChannelName;
 use pdu::PduResult;
 use slab::Slab;
+use tracing::debug;
 
 use crate::pdu::{
     CapabilitiesRequestPdu, CapsVersion, CreateRequestPdu, CreationStatus, DrdynvcClientPdu, DrdynvcServerPdu,
diff --git a/crates/ironrdp-fuzzing/src/generators/mod.rs b/crates/ironrdp-fuzzing/src/generators/mod.rs
index 3d56942e..ed5232cd 100644
--- a/crates/ironrdp-fuzzing/src/generators/mod.rs
+++ b/crates/ironrdp-fuzzing/src/generators/mod.rs
@@ -8,7 +8,7 @@
 //! wrapper over an external tool, such that the wrapper implements the
 //! `Arbitrary` trait for the wrapped external tool.
 
-#[derive(Arbitrary, Debug)]
+#[derive(arbitrary::Arbitrary, Debug)]
 pub struct BitmapInput<'a> {
     pub src: &'a [u8],
     pub width: u8,
diff --git a/crates/ironrdp-fuzzing/src/lib.rs b/crates/ironrdp-fuzzing/src/lib.rs
index a52abc93..c92aa7cf 100644
--- a/crates/ironrdp-fuzzing/src/lib.rs
+++ b/crates/ironrdp-fuzzing/src/lib.rs
@@ -5,8 +5,5 @@
 #![allow(clippy::cast_possible_wrap)]
 #![allow(clippy::cast_sign_loss)]
 
-#[macro_use]
-extern crate arbitrary;
-
 pub mod generators;
 pub mod oracles;
diff --git a/crates/ironrdp-glutin-renderer/src/lib.rs b/crates/ironrdp-glutin-renderer/src/lib.rs
index 1ed1bf12..81c0a250 100644
--- a/crates/ironrdp-glutin-renderer/src/lib.rs
+++ b/crates/ironrdp-glutin-renderer/src/lib.rs
@@ -3,9 +3,6 @@
     html_logo_url = "https://cdnweb.devolutions.net/images/projects/devolutions/logos/devolutions-icon-shadow.svg"
 )]
 
-#[macro_use]
-extern crate tracing;
-
 pub mod renderer;
 
 mod draw;
diff --git a/crates/ironrdp-pdu/src/lib.rs b/crates/ironrdp-pdu/src/lib.rs
index e77974fa..c6e2dadc 100644
--- a/crates/ironrdp-pdu/src/lib.rs
+++ b/crates/ironrdp-pdu/src/lib.rs
@@ -12,7 +12,6 @@ use core::fmt;
 // use ironrdp_core::{unexpected_message_type_err, DecodeResult, EncodeResult, ReadCursor};
 use ironrdp_error::Source;
 
-#[macro_use]
 mod macros;
 
 pub mod codecs;
diff --git a/crates/ironrdp-pdu/src/mcs.rs b/crates/ironrdp-pdu/src/mcs.rs
index 0cdabdc6..fef8f579 100644
--- a/crates/ironrdp-pdu/src/mcs.rs
+++ b/crates/ironrdp-pdu/src/mcs.rs
@@ -9,7 +9,7 @@ use crate::gcc::{ChannelDef, ClientGccBlocks, ConferenceCreateRequest, Conferenc
 use crate::tpdu::{TpduCode, TpduHeader};
 use crate::tpkt::TpktHeader;
 use crate::x224::{user_data_size, X224Pdu};
-use crate::{per, DecodeResult, EncodeResult, PduError};
+use crate::{impl_x224_pdu_borrowing, impl_x224_pdu_pod, per, DecodeResult, EncodeResult, PduError};
 
 // T.125 MCS is defined in:
 //
diff --git a/crates/ironrdp-pdu/src/nego.rs b/crates/ironrdp-pdu/src/nego.rs
index ed259902..abfe6f00 100644
--- a/crates/ironrdp-pdu/src/nego.rs
+++ b/crates/ironrdp-pdu/src/nego.rs
@@ -9,7 +9,7 @@ use tap::prelude::*;
 use crate::tpdu::{TpduCode, TpduHeader};
 use crate::tpkt::TpktHeader;
 use crate::x224::X224Pdu;
-use crate::{DecodeResult, EncodeResult, Pdu as _};
+use crate::{impl_x224_pdu_pod, DecodeResult, EncodeResult, Pdu as _};
 
 bitflags! {
     /// A 32-bit, unsigned integer that contains flags indicating the supported security protocols.
diff --git a/crates/ironrdp-pdu/src/x224.rs b/crates/ironrdp-pdu/src/x224.rs
index c4edc9bb..1c84dcab 100644
--- a/crates/ironrdp-pdu/src/x224.rs
+++ b/crates/ironrdp-pdu/src/x224.rs
@@ -6,7 +6,7 @@ use ironrdp_core::{
 
 use crate::tpdu::{TpduCode, TpduHeader};
 use crate::tpkt::TpktHeader;
-use crate::Pdu;
+use crate::{impl_x224_pdu_borrowing, Pdu};
 
 pub trait X224Pdu<'de>: Sized {
     const X224_NAME: &'static str;
diff --git a/crates/ironrdp-propertyset/src/lib.rs b/crates/ironrdp-propertyset/src/lib.rs
index 2d947624..faa60a53 100644
--- a/crates/ironrdp-propertyset/src/lib.rs
+++ b/crates/ironrdp-propertyset/src/lib.rs
@@ -4,14 +4,13 @@
 
 extern crate alloc;
 
-#[macro_use]
-extern crate tracing;
-
 use alloc::borrow::Cow;
 use alloc::collections::BTreeMap;
 use alloc::string::String;
 use core::fmt::{self, Display};
 
+use tracing::debug;
+
 pub type Key = Cow<'static, str>;
 
 /// Key-value store for configuration keys.
diff --git a/crates/ironrdp-rdpdr-native/src/lib.rs b/crates/ironrdp-rdpdr-native/src/lib.rs
index c8deb017..3b1ffa83 100644
--- a/crates/ironrdp-rdpdr-native/src/lib.rs
+++ b/crates/ironrdp-rdpdr-native/src/lib.rs
@@ -9,10 +9,6 @@
 #![warn(clippy::fn_to_numeric_cast_any)]
 #![warn(clippy::ptr_cast_constness)]
 
-#[cfg(any(target_os = "macos", target_os = "linux"))]
-#[macro_use]
-extern crate tracing;
-
 #[cfg(any(target_os = "macos", target_os = "linux"))]
 mod nix;
 #[cfg(any(target_os = "macos", target_os = "linux"))]
diff --git a/crates/ironrdp-rdpdr-native/src/nix/backend.rs b/crates/ironrdp-rdpdr-native/src/nix/backend.rs
index 6bce80a8..30721497 100644
--- a/crates/ironrdp-rdpdr-native/src/nix/backend.rs
+++ b/crates/ironrdp-rdpdr-native/src/nix/backend.rs
@@ -11,6 +11,7 @@ use ironrdp_rdpdr::pdu::RdpdrPdu;
 use ironrdp_rdpdr::RdpdrBackend;
 use ironrdp_svc::SvcMessage;
 use nix::dir::{Dir, OwningIter};
+use tracing::{debug, warn};
 
 #[derive(Debug, Default)]
 pub struct NixRdpdrBackend {
diff --git a/crates/ironrdp-rdpdr/src/lib.rs b/crates/ironrdp-rdpdr/src/lib.rs
index d2a59392..b6cad920 100644
--- a/crates/ironrdp-rdpdr/src/lib.rs
+++ b/crates/ironrdp-rdpdr/src/lib.rs
@@ -6,9 +6,6 @@
 #![allow(clippy::cast_possible_wrap)] // FIXME: remove
 #![allow(clippy::cast_sign_loss)] // FIXME: remove
 
-#[macro_use]
-extern crate tracing;
-
 use ironrdp_core::{decode_cursor, impl_as_any, ReadCursor};
 use ironrdp_pdu::gcc::ChannelName;
 use ironrdp_pdu::{decode_err, pdu_other_err, PduResult};
@@ -20,6 +17,7 @@ use pdu::efs::{
 };
 use pdu::esc::{ScardCall, ScardIoCtlCode};
 use pdu::RdpdrPdu;
+use tracing::{debug, trace, warn};
 
 pub mod backend;
 pub mod pdu;
diff --git a/crates/ironrdp-rdpdr/src/pdu/efs.rs b/crates/ironrdp-rdpdr/src/pdu/efs.rs
index 4b94237a..b0c62fec 100644
--- a/crates/ironrdp-rdpdr/src/pdu/efs.rs
+++ b/crates/ironrdp-rdpdr/src/pdu/efs.rs
@@ -13,6 +13,7 @@ use ironrdp_core::{
 };
 use ironrdp_pdu::utils::{decode_string, encoded_str_len, from_utf16_bytes, write_string_to_cursor, CharacterSet};
 use ironrdp_pdu::{read_padding, write_padding, PduError};
+use tracing::error;
 
 use super::esc::rpce;
 use super::{PacketId, SharedHeader};
diff --git a/crates/ironrdp-rdpdr/src/pdu/esc.rs b/crates/ironrdp-rdpdr/src/pdu/esc.rs
index 9d5d46ab..b4d80cb6 100644
--- a/crates/ironrdp-rdpdr/src/pdu/esc.rs
+++ b/crates/ironrdp-rdpdr/src/pdu/esc.rs
@@ -15,6 +15,7 @@ use ironrdp_core::{
 use ironrdp_pdu::utils::{
     encoded_multistring_len, read_multistring_from_cursor, write_multistring_to_cursor, CharacterSet,
 };
+use tracing::{error, warn};
 
 use super::efs::IoCtlCode;
 use crate::pdu::esc::ndr::{Decode as _, Encode as _};
diff --git a/crates/ironrdp-rdpsnd-native/src/cpal.rs b/crates/ironrdp-rdpsnd-native/src/cpal.rs
index 768b0669..964b3fe7 100644
--- a/crates/ironrdp-rdpsnd-native/src/cpal.rs
+++ b/crates/ironrdp-rdpsnd-native/src/cpal.rs
@@ -11,6 +11,7 @@ use cpal::traits::{DeviceTrait as _, HostTrait as _};
 use cpal::{SampleFormat, Stream, StreamConfig};
 use ironrdp_rdpsnd::client::RdpsndClientHandler;
 use ironrdp_rdpsnd::pdu::{AudioFormat, PitchPdu, VolumePdu, WaveFormat};
+use tracing::{debug, error, info, warn};
 
 #[derive(Debug)]
 pub struct RdpsndBackend {
diff --git a/crates/ironrdp-rdpsnd-native/src/lib.rs b/crates/ironrdp-rdpsnd-native/src/lib.rs
index 1fc8441d..04a3b3cf 100644
--- a/crates/ironrdp-rdpsnd-native/src/lib.rs
+++ b/crates/ironrdp-rdpsnd-native/src/lib.rs
@@ -4,7 +4,4 @@
 #[cfg(test)]
 use tracing_subscriber as _;
 
-#[macro_use]
-extern crate tracing;
-
 pub mod cpal;
diff --git a/crates/ironrdp-replay-client/src/main.rs b/crates/ironrdp-replay-client/src/main.rs
index 8c2e453c..90af089c 100644
--- a/crates/ironrdp-replay-client/src/main.rs
+++ b/crates/ironrdp-replay-client/src/main.rs
@@ -1,6 +1,3 @@
-#[macro_use]
-extern crate tracing;
-
 use std::fs::File;
 use std::io::ErrorKind;
 use std::path::PathBuf;
diff --git a/crates/ironrdp-server/src/display.rs b/crates/ironrdp-server/src/display.rs
index 15fb54d6..c0b7c3b0 100644
--- a/crates/ironrdp-server/src/display.rs
+++ b/crates/ironrdp-server/src/display.rs
@@ -5,6 +5,7 @@ use bytes::{Bytes, BytesMut};
 use ironrdp_displaycontrol::pdu::DisplayControlMonitorLayout;
 use ironrdp_graphics::diff;
 use ironrdp_pdu::pointer::PointerPositionAttribute;
+use tracing::{debug, warn};
 
 #[rustfmt::skip]
 pub use ironrdp_acceptor::DesktopSize;
diff --git a/crates/ironrdp-server/src/encoder/mod.rs b/crates/ironrdp-server/src/encoder/mod.rs
index 77a296f8..520cf97d 100644
--- a/crates/ironrdp-server/src/encoder/mod.rs
+++ b/crates/ironrdp-server/src/encoder/mod.rs
@@ -10,6 +10,7 @@ use ironrdp_pdu::geometry::ExclusiveRectangle;
 use ironrdp_pdu::pointer::{ColorPointerAttribute, Point16, PointerAttribute, PointerPositionAttribute};
 use ironrdp_pdu::rdp::capability_sets::{CmdFlags, EntropyBits};
 use ironrdp_pdu::surface_commands::{ExtendedBitmapDataPdu, SurfaceBitsPdu, SurfaceCommand};
+use tracing::{debug, warn};
 
 use self::bitmap::BitmapEncoder;
 use self::rfx::RfxEncoder;
diff --git a/crates/ironrdp-server/src/lib.rs b/crates/ironrdp-server/src/lib.rs
index 462c2255..bddb9a1a 100644
--- a/crates/ironrdp-server/src/lib.rs
+++ b/crates/ironrdp-server/src/lib.rs
@@ -4,10 +4,6 @@
 
 pub use {tokio, tokio_rustls};
 
-#[macro_use]
-extern crate tracing;
-
-#[macro_use]
 mod macros;
 
 mod builder;
diff --git a/crates/ironrdp-server/src/server.rs b/crates/ironrdp-server/src/server.rs
index 188a23af..9664223d 100644
--- a/crates/ironrdp-server/src/server.rs
+++ b/crates/ironrdp-server/src/server.rs
@@ -26,6 +26,7 @@ use tokio::net::{TcpListener, TcpStream};
 use tokio::sync::{mpsc, oneshot, Mutex};
 use tokio::task;
 use tokio_rustls::TlsAcceptor;
+use tracing::{debug, error, trace, warn};
 use {ironrdp_dvc as dvc, ironrdp_rdpsnd as rdpsnd};
 
 use crate::clipboard::CliprdrServerFactory;
diff --git a/crates/ironrdp-session/src/active_stage.rs b/crates/ironrdp-session/src/active_stage.rs
index a5a9682f..234071ae 100644
--- a/crates/ironrdp-session/src/active_stage.rs
+++ b/crates/ironrdp-session/src/active_stage.rs
@@ -11,6 +11,7 @@ use ironrdp_pdu::input::fast_path::{FastPathInput, FastPathInputEvent};
 use ironrdp_pdu::rdp::headers::ShareDataPdu;
 use ironrdp_pdu::{mcs, Action};
 use ironrdp_svc::{SvcMessage, SvcProcessor, SvcProcessorMessages};
+use tracing::debug;
 
 use crate::fast_path::UpdateKind;
 use crate::image::DecodedImage;
diff --git a/crates/ironrdp-session/src/fast_path.rs b/crates/ironrdp-session/src/fast_path.rs
index 9fcf5299..0a8811b7 100644
--- a/crates/ironrdp-session/src/fast_path.rs
+++ b/crates/ironrdp-session/src/fast_path.rs
@@ -12,10 +12,11 @@ use ironrdp_pdu::pointer::PointerUpdateData;
 use ironrdp_pdu::rdp::capability_sets::{CodecId, CODEC_ID_NONE, CODEC_ID_REMOTEFX};
 use ironrdp_pdu::rdp::headers::ShareDataPdu;
 use ironrdp_pdu::surface_commands::{FrameAction, FrameMarkerPdu, SurfaceCommand};
+use tracing::{debug, trace, warn};
 
 use crate::image::DecodedImage;
 use crate::pointer::PointerCache;
-use crate::{rfx, SessionError, SessionErrorExt as _, SessionResult};
+use crate::{custom_err, reason_err, rfx, SessionError, SessionErrorExt as _, SessionResult};
 
 #[derive(Debug)]
 pub enum UpdateKind {
diff --git a/crates/ironrdp-session/src/image.rs b/crates/ironrdp-session/src/image.rs
index a2c8c78e..9da0379e 100644
--- a/crates/ironrdp-session/src/image.rs
+++ b/crates/ironrdp-session/src/image.rs
@@ -6,8 +6,9 @@ use ironrdp_graphics::image_processing::{ImageRegion, ImageRegionMut, PixelForma
 use ironrdp_graphics::pointer::DecodedPointer;
 use ironrdp_graphics::rectangle_processing::Region;
 use ironrdp_pdu::geometry::{InclusiveRectangle, Rectangle as _};
+use tracing::trace;
 
-use crate::SessionResult;
+use crate::{custom_err, SessionResult};
 
 const TILE_SIZE: u16 = 64;
 
diff --git a/crates/ironrdp-session/src/lib.rs b/crates/ironrdp-session/src/lib.rs
index 79369389..54a3721c 100644
--- a/crates/ironrdp-session/src/lib.rs
+++ b/crates/ironrdp-session/src/lib.rs
@@ -2,10 +2,6 @@
 #![doc(html_logo_url = "https://cdnweb.devolutions.net/images/projects/devolutions/logos/devolutions-icon-shadow.svg")]
 #![allow(clippy::arithmetic_side_effects)] // FIXME: remove
 
-#[macro_use]
-extern crate tracing;
-
-#[macro_use]
 mod macros;
 
 pub mod fast_path;
diff --git a/crates/ironrdp-session/src/rfx.rs b/crates/ironrdp-session/src/rfx.rs
index d4c9267b..89edea45 100644
--- a/crates/ironrdp-session/src/rfx.rs
+++ b/crates/ironrdp-session/src/rfx.rs
@@ -7,9 +7,10 @@ use ironrdp_graphics::{dwt, quantization, rlgr, subband_reconstruction};
 use ironrdp_pdu::codecs::rfx::{self, EntropyAlgorithm, Quant, RfxRectangle, Tile};
 use ironrdp_pdu::geometry::{InclusiveRectangle, Rectangle as _};
 use ironrdp_pdu::{decode_cursor, Decode as _, ReadCursor};
+use tracing::{instrument, trace};
 
 use crate::image::DecodedImage;
-use crate::SessionResult;
+use crate::{custom_err, general_err, reason_err, SessionResult};
 
 const TILE_SIZE: u16 = 64;
 
diff --git a/crates/ironrdp-session/src/x224/mod.rs b/crates/ironrdp-session/src/x224/mod.rs
index 9b411dc8..d82793bb 100644
--- a/crates/ironrdp-session/src/x224/mod.rs
+++ b/crates/ironrdp-session/src/x224/mod.rs
@@ -7,8 +7,9 @@ use ironrdp_pdu::rdp::headers::ShareDataPdu;
 use ironrdp_pdu::rdp::server_error_info::{ErrorInfo, ProtocolIndependentCode, ServerSetErrorInfoPdu};
 use ironrdp_pdu::x224::X224;
 use ironrdp_svc::{client_encode_svc_messages, StaticChannelSet, SvcMessage, SvcProcessor, SvcProcessorMessages};
+use tracing::debug;
 
-use crate::{SessionError, SessionErrorExt as _, SessionResult};
+use crate::{reason_err, SessionError, SessionErrorExt as _, SessionResult};
 
 /// X224 Processor output
 #[derive(Debug, Clone)]
diff --git a/crates/ironrdp-testsuite-core/src/capsets.rs b/crates/ironrdp-testsuite-core/src/capsets.rs
index c5f6aa43..be4c8b56 100644
--- a/crates/ironrdp-testsuite-core/src/capsets.rs
+++ b/crates/ironrdp-testsuite-core/src/capsets.rs
@@ -2,6 +2,7 @@ use ironrdp_core::decode;
 use ironrdp_pdu::rdp::capability_sets::{
     CapabilitySet, ClientConfirmActive, DemandActive, ServerDemandActive, SERVER_CHANNEL_ID,
 };
+use lazy_static::lazy_static;
 
 pub const SERVER_DEMAND_ACTIVE_BUFFER: [u8; 357] = [
     0x04, 0x00, // source descriptor length
diff --git a/crates/ironrdp-testsuite-core/src/cluster_data.rs b/crates/ironrdp-testsuite-core/src/cluster_data.rs
index 6f161f07..7729c00f 100644
--- a/crates/ironrdp-testsuite-core/src/cluster_data.rs
+++ b/crates/ironrdp-testsuite-core/src/cluster_data.rs
@@ -1,4 +1,5 @@
 use ironrdp_pdu::gcc::{ClientClusterData, RedirectionFlags, RedirectionVersion};
+use lazy_static::lazy_static;
 
 pub const CLUSTER_DATA_BUFFER: [u8; 8] = [0x0d, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00];
 
diff --git a/crates/ironrdp-testsuite-core/src/conference_create.rs b/crates/ironrdp-testsuite-core/src/conference_create.rs
index ce8fbfb2..8b3763ec 100644
--- a/crates/ironrdp-testsuite-core/src/conference_create.rs
+++ b/crates/ironrdp-testsuite-core/src/conference_create.rs
@@ -1,4 +1,6 @@
+use array_concat::{concat_arrays, concat_arrays_size};
 use ironrdp_pdu::gcc::{ConferenceCreateRequest, ConferenceCreateResponse};
+use lazy_static::lazy_static;
 
 use crate::gcc;
 
diff --git a/crates/ironrdp-testsuite-core/src/core_data.rs b/crates/ironrdp-testsuite-core/src/core_data.rs
index 629064dc..e552727b 100644
--- a/crates/ironrdp-testsuite-core/src/core_data.rs
+++ b/crates/ironrdp-testsuite-core/src/core_data.rs
@@ -1,9 +1,11 @@
+use array_concat::{concat_arrays, concat_arrays_size};
 use ironrdp_pdu::gcc::{
     ClientCoreData, ClientCoreOptionalData, ClientEarlyCapabilityFlags, ColorDepth, ConnectionType, HighColorDepth,
     KeyboardType, RdpVersion, SecureAccessSequence, ServerCoreData, ServerCoreOptionalData, ServerEarlyCapabilityFlags,
     SupportedColorDepths,
 };
 use ironrdp_pdu::nego::SecurityProtocol;
+use lazy_static::lazy_static;
 
 pub const CLIENT_CORE_DATA_BUFFER: [u8; 128] = [
     0x04, 0x00, 0x08, 0x00, // version
diff --git a/crates/ironrdp-testsuite-core/src/gcc.rs b/crates/ironrdp-testsuite-core/src/gcc.rs
index ccb03799..6c9a0466 100644
--- a/crates/ironrdp-testsuite-core/src/gcc.rs
+++ b/crates/ironrdp-testsuite-core/src/gcc.rs
@@ -1,4 +1,6 @@
+use array_concat::{concat_arrays, concat_arrays_size};
 use ironrdp_pdu::gcc::{ClientGccBlocks, ClientGccType, ServerGccBlocks, ServerGccType};
+use lazy_static::lazy_static;
 
 use crate::cluster_data::{CLUSTER_DATA, CLUSTER_DATA_BUFFER};
 use crate::core_data::{
diff --git a/crates/ironrdp-testsuite-core/src/gfx.rs b/crates/ironrdp-testsuite-core/src/gfx.rs
index dcad1e9d..9adf797f 100644
--- a/crates/ironrdp-testsuite-core/src/gfx.rs
+++ b/crates/ironrdp-testsuite-core/src/gfx.rs
@@ -1,4 +1,5 @@
 use ironrdp_pdu::rdp::vc::dvc::gfx::{ClientPdu, ServerPdu};
+use lazy_static::lazy_static;
 
 use crate::graphics_messages::{
     FRAME_ACKNOWLEDGE, FRAME_ACKNOWLEDGE_BUFFER, WIRE_TO_SURFACE_1, WIRE_TO_SURFACE_1_BUFFER,
diff --git a/crates/ironrdp-testsuite-core/src/graphics_messages.rs b/crates/ironrdp-testsuite-core/src/graphics_messages.rs
index 6a9f8fe5..395f59c5 100644
--- a/crates/ironrdp-testsuite-core/src/graphics_messages.rs
+++ b/crates/ironrdp-testsuite-core/src/graphics_messages.rs
@@ -8,6 +8,7 @@ use ironrdp_pdu::rdp::vc::dvc::gfx::{
     PixelFormat, Point, QuantQuality, QueueDepth, ResetGraphicsPdu, SolidFillPdu, StartFramePdu, SurfaceToCachePdu,
     SurfaceToSurfacePdu, Timestamp, WireToSurface1Pdu, WireToSurface2Pdu,
 };
+use lazy_static::lazy_static;
 
 pub const WIRE_TO_SURFACE_1_BUFFER: [u8; 218] = [
     0x00, 0x00, 0x08, 0x00, 0x20, 0xa5, 0x03, 0xde, 0x02, 0xab, 0x03, 0xe7, 0x02, 0xc9, 0x00, 0x00, 0x00, 0x01, 0x0e,
diff --git a/crates/ironrdp-testsuite-core/src/lib.rs b/crates/ironrdp-testsuite-core/src/lib.rs
index 190f12f3..aeb08ee5 100644
--- a/crates/ironrdp-testsuite-core/src/lib.rs
+++ b/crates/ironrdp-testsuite-core/src/lib.rs
@@ -6,12 +6,6 @@
 #![allow(clippy::cast_sign_loss)]
 #![allow(unused_crate_dependencies)]
 
-#[macro_use]
-extern crate array_concat;
-#[macro_use]
-extern crate lazy_static;
-
-#[macro_use]
 mod macros;
 
 pub mod capsets;
diff --git a/crates/ironrdp-testsuite-core/src/mcs.rs b/crates/ironrdp-testsuite-core/src/mcs.rs
index 02a715ef..0a23f38a 100644
--- a/crates/ironrdp-testsuite-core/src/mcs.rs
+++ b/crates/ironrdp-testsuite-core/src/mcs.rs
@@ -1,10 +1,12 @@
 use std::borrow::Cow;
 
+use array_concat::{concat_arrays, concat_arrays_size};
 use ironrdp_pdu::mcs::{
     AttachUserConfirm, AttachUserRequest, ChannelJoinConfirm, ChannelJoinRequest, ConnectInitial, ConnectResponse,
     DisconnectProviderUltimatum, DisconnectReason, DomainParameters, ErectDomainPdu, OwnedSendDataIndication,
     OwnedSendDataRequest, SendDataIndication, SendDataRequest,
 };
+use lazy_static::lazy_static;
 
 use crate::conference_create::{
     CONFERENCE_CREATE_REQUEST, CONFERENCE_CREATE_REQUEST_BUFFER, CONFERENCE_CREATE_RESPONSE,
diff --git a/crates/ironrdp-testsuite-core/src/monitor_data.rs b/crates/ironrdp-testsuite-core/src/monitor_data.rs
index 53ee5d32..b39aa67e 100644
--- a/crates/ironrdp-testsuite-core/src/monitor_data.rs
+++ b/crates/ironrdp-testsuite-core/src/monitor_data.rs
@@ -1,4 +1,5 @@
 use ironrdp_pdu::gcc::{ClientMonitorData, Monitor, MonitorFlags};
+use lazy_static::lazy_static;
 
 pub const MONITOR_DATA_WITHOUT_MONITORS_BUFFER: [u8; 8] = [0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00];
 
diff --git a/crates/ironrdp-testsuite-core/src/monitor_extended_data.rs b/crates/ironrdp-testsuite-core/src/monitor_extended_data.rs
index 41ee4b7c..31a09e34 100644
--- a/crates/ironrdp-testsuite-core/src/monitor_extended_data.rs
+++ b/crates/ironrdp-testsuite-core/src/monitor_extended_data.rs
@@ -1,4 +1,5 @@
 use ironrdp_pdu::gcc::{ClientMonitorExtendedData, ExtendedMonitorInfo, MonitorOrientation};
+use lazy_static::lazy_static;
 
 pub const MONITOR_DATA_WITHOUT_MONITORS_BUFFER: [u8; 12] =
     [0x00, 0x00, 0x00, 0x00, 0x14, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00];
diff --git a/crates/ironrdp-testsuite-core/src/multi_transport_channel_data.rs b/crates/ironrdp-testsuite-core/src/multi_transport_channel_data.rs
index b486a53c..fc485140 100644
--- a/crates/ironrdp-testsuite-core/src/multi_transport_channel_data.rs
+++ b/crates/ironrdp-testsuite-core/src/multi_transport_channel_data.rs
@@ -1,4 +1,5 @@
 use ironrdp_pdu::gcc::{MultiTransportChannelData, MultiTransportFlags};
+use lazy_static::lazy_static;
 
 pub const SERVER_GCC_MULTI_TRANSPORT_CHANNEL_BLOCK_BUFFER: [u8; 4] = [0x01, 0x03, 0x00, 0x00];
 
diff --git a/crates/ironrdp-testsuite-core/src/network_data.rs b/crates/ironrdp-testsuite-core/src/network_data.rs
index a5de72d2..3c94472c 100644
--- a/crates/ironrdp-testsuite-core/src/network_data.rs
+++ b/crates/ironrdp-testsuite-core/src/network_data.rs
@@ -1,4 +1,5 @@
 use ironrdp_pdu::gcc::{ChannelDef, ChannelName, ChannelOptions, ClientNetworkData, ServerNetworkData};
+use lazy_static::lazy_static;
 
 pub const CLIENT_NETWORK_DATA_WITH_CHANNELS_BUFFER: [u8; 40] = [
     0x03, 0x00, 0x00, 0x00, // channels count
diff --git a/crates/ironrdp-testsuite-core/src/rdp.rs b/crates/ironrdp-testsuite-core/src/rdp.rs
index 856787e2..488b2c90 100644
--- a/crates/ironrdp-testsuite-core/src/rdp.rs
+++ b/crates/ironrdp-testsuite-core/src/rdp.rs
@@ -1,3 +1,4 @@
+use array_concat::{concat_arrays, concat_arrays_size};
 use ironrdp_pdu::gcc;
 use ironrdp_pdu::rdp::finalization_messages::{
     ControlAction, ControlPdu, FontPdu, MonitorLayoutPdu, SequenceFlags, SynchronizePdu,
@@ -11,6 +12,7 @@ use ironrdp_pdu::rdp::server_license::{
     PreambleType, PreambleVersion,
 };
 use ironrdp_pdu::rdp::{client_info, ClientInfoPdu};
+use lazy_static::lazy_static;
 
 use crate::capsets::{
     CLIENT_DEMAND_ACTIVE, CLIENT_DEMAND_ACTIVE_BUFFER, SERVER_DEMAND_ACTIVE, SERVER_DEMAND_ACTIVE_BUFFER,
diff --git a/crates/ironrdp-testsuite-core/src/security_data.rs b/crates/ironrdp-testsuite-core/src/security_data.rs
index e7842a59..96a1a2f4 100644
--- a/crates/ironrdp-testsuite-core/src/security_data.rs
+++ b/crates/ironrdp-testsuite-core/src/security_data.rs
@@ -1,4 +1,6 @@
+use array_concat::concat_arrays;
 use ironrdp_pdu::gcc::{ClientSecurityData, EncryptionLevel, EncryptionMethod, ServerSecurityData};
+use lazy_static::lazy_static;
 
 pub const CLIENT_SECURITY_DATA_BUFFER: [u8; 8] = [
     0x1b, 0x00, 0x00, 0x00, // encryption methods
diff --git a/crates/ironrdp-web/src/clipboard.rs b/crates/ironrdp-web/src/clipboard.rs
index 808e829f..432b921a 100644
--- a/crates/ironrdp-web/src/clipboard.rs
+++ b/crates/ironrdp-web/src/clipboard.rs
@@ -22,6 +22,7 @@ use ironrdp::cliprdr::pdu::{
 use ironrdp_cliprdr_format::bitmap::{dib_to_png, dibv5_to_png, png_to_cf_dibv5};
 use ironrdp_cliprdr_format::html::{cf_html_to_plain_html, plain_html_to_cf_html};
 use ironrdp_core::{impl_as_any, IntoOwned as _};
+use tracing::{error, trace, warn};
 use wasm_bindgen::prelude::*;
 
 use crate::session::RdpInputEvent;
diff --git a/crates/ironrdp-web/src/input.rs b/crates/ironrdp-web/src/input.rs
index b0f9a4b6..f22b5fec 100644
--- a/crates/ironrdp-web/src/input.rs
+++ b/crates/ironrdp-web/src/input.rs
@@ -1,5 +1,6 @@
 use ironrdp::input::{MouseButton, MousePosition, Operation, Scancode, WheelRotations};
 use smallvec::SmallVec;
+use tracing::warn;
 
 #[derive(Clone)]
 pub(crate) struct DeviceEvent(Operation);
diff --git a/crates/ironrdp-web/src/lib.rs b/crates/ironrdp-web/src/lib.rs
index e65757d6..b98ebb14 100644
--- a/crates/ironrdp-web/src/lib.rs
+++ b/crates/ironrdp-web/src/lib.rs
@@ -14,9 +14,6 @@ extern crate getrandom as _;
 extern crate getrandom2 as _;
 extern crate time as _;
 
-#[macro_use]
-extern crate tracing;
-
 mod canvas;
 mod clipboard;
 mod error;
@@ -27,6 +24,8 @@ mod rdp_file;
 mod session;
 
 mod wasm_bridge {
+    use tracing::debug;
+
     struct Api;
 
     impl iron_remote_desktop::RemoteDesktopApi for Api {
diff --git a/crates/ironrdp-web/src/network_client.rs b/crates/ironrdp-web/src/network_client.rs
index 9d07604f..c779ca6e 100644
--- a/crates/ironrdp-web/src/network_client.rs
+++ b/crates/ironrdp-web/src/network_client.rs
@@ -5,6 +5,7 @@ use ironrdp::connector::sspi::generator::NetworkRequest;
 use ironrdp::connector::sspi::network_client::NetworkProtocol;
 use ironrdp::connector::{custom_err, reason_err, ConnectorResult};
 use ironrdp_futures::AsyncNetworkClient;
+use tracing::debug;
 
 #[derive(Debug)]
 pub(crate) struct WasmNetworkClient;
diff --git a/crates/ironrdp-web/src/rdp_file.rs b/crates/ironrdp-web/src/rdp_file.rs
index e772c2a0..bb154392 100644
--- a/crates/ironrdp-web/src/rdp_file.rs
+++ b/crates/ironrdp-web/src/rdp_file.rs
@@ -1,3 +1,4 @@
+use tracing::error;
 use wasm_bindgen::prelude::wasm_bindgen;
 
 #[wasm_bindgen]
diff --git a/crates/ironrdp-web/src/session.rs b/crates/ironrdp-web/src/session.rs
index 4b29c58c..011a6b67 100644
--- a/crates/ironrdp-web/src/session.rs
+++ b/crates/ironrdp-web/src/session.rs
@@ -30,6 +30,7 @@ use ironrdp_core::WriteBuf;
 use ironrdp_futures::{single_sequence_step_read, FramedWrite};
 use rgb::AsPixels as _;
 use tap::prelude::*;
+use tracing::{debug, error, info, trace, warn};
 use wasm_bindgen::JsValue;
 use wasm_bindgen_futures::spawn_local;
 use web_sys::HtmlCanvasElement;
diff --git a/crates/ironrdp/examples/screenshot.rs b/crates/ironrdp/examples/screenshot.rs
index 12b4143d..5bd3ba20 100644
--- a/crates/ironrdp/examples/screenshot.rs
+++ b/crates/ironrdp/examples/screenshot.rs
@@ -17,9 +17,6 @@
 #![allow(unused_crate_dependencies)] // false positives because there is both a library and a binary
 #![allow(clippy::print_stdout)]
 
-#[macro_use]
-extern crate tracing;
-
 use core::time::Duration;
 use std::io::Write as _;
 use std::net::TcpStream;
@@ -36,6 +33,7 @@ use ironrdp::session::{ActiveStage, ActiveStageOutput};
 use ironrdp_pdu::rdp::client_info::PerformanceFlags;
 use sspi::network_client::reqwest_network_client::ReqwestNetworkClient;
 use tokio_rustls::rustls;
+use tracing::{debug, info, trace};
 
 const HELP: &str = "\
 USAGE:
diff --git a/crates/ironrdp/examples/server.rs b/crates/ironrdp/examples/server.rs
index 2e858995..57e488e9 100644
--- a/crates/ironrdp/examples/server.rs
+++ b/crates/ironrdp/examples/server.rs
@@ -3,9 +3,6 @@
 #![allow(unused_crate_dependencies)] // False positives because there are both a library and a binary.
 #![allow(clippy::print_stdout)]
 
-#[macro_use]
-extern crate tracing;
-
 use core::net::SocketAddr;
 use core::num::{NonZero, NonZeroU16, NonZeroUsize};
 use std::path::PathBuf;
@@ -25,6 +22,7 @@ use ironrdp::server::{
 };
 use ironrdp_cliprdr_native::StubCliprdrBackend;
 use rand::prelude::*;
+use tracing::{debug, info, warn};
 
 const HELP: &str = "\
 USAGE:
diff --git a/xtask/src/bin_install.rs b/xtask/src/bin_install.rs
index ad01e052..7c7aed3e 100644
--- a/xtask/src/bin_install.rs
+++ b/xtask/src/bin_install.rs
@@ -1,5 +1,6 @@
 use xshell::{cmd, Shell};
 
+use crate::macros::trace;
 use crate::{local_bin, CARGO, LOCAL_CARGO_ROOT};
 
 pub struct CargoPackage {
diff --git a/xtask/src/fuzz.rs b/xtask/src/fuzz.rs
index 08acf60b..f87c9c80 100644
--- a/xtask/src/fuzz.rs
+++ b/xtask/src/fuzz.rs
@@ -1,5 +1,4 @@
 use crate::prelude::*;
-
 // NOTE: cargo-fuzz (libFuzzer) does not support Windows yet (coming soon?)
 
 pub fn corpus_minify(sh: &Shell, target: Option<String>) -> anyhow::Result<()> {
diff --git a/xtask/src/macros.rs b/xtask/src/macros.rs
index 4a6421d5..d9d747d3 100644
--- a/xtask/src/macros.rs
+++ b/xtask/src/macros.rs
@@ -7,6 +7,8 @@ macro_rules! windows_skip {
     };
 }
 
+pub(crate) use windows_skip;
+
 macro_rules! trace {
     ($($arg:tt)*) => {{
         if $crate::is_verbose() {
@@ -15,6 +17,8 @@ macro_rules! trace {
     }};
 }
 
+pub(crate) use trace;
+
 macro_rules! run_cmd_in {
     ($sh:expr, $prefix:expr, $args:literal) => {{
         let _guard = $sh.push_dir($prefix);
@@ -22,3 +26,5 @@ macro_rules! run_cmd_in {
         ::xshell::cmd!($sh, $args).run()
     }};
 }
+
+pub(crate) use run_cmd_in;
diff --git a/xtask/src/main.rs b/xtask/src/main.rs
index 7bbb08bc..e7b4e6f5 100644
--- a/xtask/src/main.rs
+++ b/xtask/src/main.rs
@@ -3,7 +3,6 @@
 #![allow(clippy::unwrap_used)]
 #![allow(unreachable_pub)]
 
-#[macro_use]
 mod macros;
 
 mod bin_install;
@@ -24,6 +23,7 @@ use std::path::{Path, PathBuf};
 use xshell::Shell;
 
 use crate::cli::Action;
+use crate::macros::trace;
 
 #[cfg(target_os = "windows")]
 pub const LOCAL_CARGO_ROOT: &str = ".cargo\\local_root\\";
diff --git a/xtask/src/prelude.rs b/xtask/src/prelude.rs
index 4dbac942..ce847146 100644
--- a/xtask/src/prelude.rs
+++ b/xtask/src/prelude.rs
@@ -3,5 +3,6 @@ pub use xshell::{cmd, Shell};
 
 pub use crate::bin_install::{cargo_install, is_installed};
 pub use crate::bin_version::*;
+pub(crate) use crate::macros::{run_cmd_in, trace, windows_skip};
 pub use crate::section::Section;
 pub use crate::{is_verbose, list_files, CARGO, FUZZ_TARGETS, WASM_PACKAGES};