diff --git a/src/a2a/helpers/__init__.py b/src/a2a/helpers/__init__.py
index a4a0401e7..27ca85e65 100644
--- a/src/a2a/helpers/__init__.py
+++ b/src/a2a/helpers/__init__.py
@@ -31,9 +31,17 @@
     new_url_message,
     new_url_part,
 )
+from a2a.server.routes.agent_card_routes import create_agent_card_routes
+from a2a.server.routes.fastapi_routes import add_a2a_routes_to_fastapi
+from a2a.server.routes.jsonrpc_routes import create_jsonrpc_routes
+from a2a.server.routes.rest_routes import create_rest_routes
 
 
 __all__ = [
+    'add_a2a_routes_to_fastapi',
+    'create_agent_card_routes',
+    'create_jsonrpc_routes',
+    'create_rest_routes',
     'display_agent_card',
     'get_artifact_text',
     'get_data_parts',
diff --git a/src/a2a/server/agent_execution/request_context_builder.py b/src/a2a/server/agent_execution/request_context_builder.py
index cab82b401..5b8a8f989 100644
--- a/src/a2a/server/agent_execution/request_context_builder.py
+++ b/src/a2a/server/agent_execution/request_context_builder.py
@@ -1,6 +1,6 @@
 from abc import ABC, abstractmethod
 
-from a2a.server.agent_execution import RequestContext
+from a2a.server.agent_execution.context import RequestContext
 from a2a.server.context import ServerCallContext
 from a2a.types.a2a_pb2 import SendMessageRequest, Task
 
diff --git a/src/a2a/server/agent_execution/simple_request_context_builder.py b/src/a2a/server/agent_execution/simple_request_context_builder.py
index 5f2b7c521..4a8410019 100644
--- a/src/a2a/server/agent_execution/simple_request_context_builder.py
+++ b/src/a2a/server/agent_execution/simple_request_context_builder.py
@@ -1,6 +1,7 @@
 import asyncio
 
-from a2a.server.agent_execution import RequestContext, RequestContextBuilder
+from a2a.server.agent_execution.context import RequestContext
+from a2a.server.agent_execution.request_context_builder import RequestContextBuilder
 from a2a.server.context import ServerCallContext
 from a2a.server.id_generator import IDGenerator
 from a2a.server.tasks import TaskStore