diff --git a/src/mcp/client/auth/__init__.py b/src/mcp/client/auth/__init__.py
index c43a29ce0..a5c4b7346 100644
--- a/src/mcp/client/auth/__init__.py
+++ b/src/mcp/client/auth/__init__.py
@@ -4,4 +4,20 @@
 Implements authorization code flow with PKCE and automatic token refresh.
 """
 
-from mcp.client.auth.oauth2 import *  # noqa: F403
+from mcp.client.auth.oauth2 import (
+    OAuthClientProvider,
+    OAuthFlowError,
+    OAuthRegistrationError,
+    OAuthTokenError,
+    PKCEParameters,
+    TokenStorage,
+)
+
+__all__ = [
+    "OAuthClientProvider",
+    "OAuthFlowError",
+    "OAuthRegistrationError",
+    "OAuthTokenError",
+    "PKCEParameters",
+    "TokenStorage",
+]
diff --git a/src/mcp/client/auth/extensions/__init__.py b/src/mcp/client/auth/extensions/__init__.py
new file mode 100644
index 000000000..e69de29bb