diff --git a/backend/windmill-mcp/src/lib.rs b/backend/windmill-mcp/src/lib.rs
index a75b545154..aae52aa5f0 100644
--- a/backend/windmill-mcp/src/lib.rs
+++ b/backend/windmill-mcp/src/lib.rs
@@ -36,13 +36,14 @@ pub mod client_registration;
 // Re-export rmcp auth types when auth feature is enabled
 #[cfg(feature = "auth")]
 pub mod oauth {
-    //! Re-exports of rmcp auth and oauth2 types for MCP OAuth implementations
+    //! Re-exports of rmcp auth types for MCP OAuth implementations
 
-    pub use rmcp::transport::auth::AuthorizationManager;
-
-    // Re-export oauth2 types needed for MCP OAuth flow
-    pub use oauth2::{
-        basic::BasicClient, AuthUrl, ClientId, ClientSecret, CsrfToken, PkceCodeChallenge,
-        RedirectUrl, Scope, TokenUrl,
+    pub use rmcp::transport::auth::{
+        AuthError as RmcpAuthError, AuthorizationManager,
+        AuthorizationMetadata as RmcpAuthorizationMetadata, OAuthClientConfig, OAuthTokenResponse,
+        StateStore, StoredAuthorizationState,
     };
+
+    // Re-export the TokenResponse trait so consumers can access token fields
+    pub use oauth2::TokenResponse;
 }