diff --git a/environments/agent_loop.py b/environments/agent_loop.py
index 891ce42f44..f7810137b1 100644
--- a/environments/agent_loop.py
+++ b/environments/agent_loop.py
@@ -18,7 +18,10 @@ import logging
 import os
 import uuid
 from dataclasses import dataclass, field
-from typing import Any, Dict, List, Optional, Set
+from typing import Any, Dict, List, Optional, Set, TYPE_CHECKING
+
+if TYPE_CHECKING:
+    from tools.budget_config import BudgetConfig
 
 from model_tools import handle_function_call
 from tools.terminal_tool import get_active_env
diff --git a/gateway/platforms/sms.py b/gateway/platforms/sms.py
index 161949dab3..3d067339bb 100644
--- a/gateway/platforms/sms.py
+++ b/gateway/platforms/sms.py
@@ -25,7 +25,10 @@ import hmac
 import logging
 import os
 import urllib.parse
-from typing import Any, Dict, Optional
+from typing import Any, Dict, Optional, TYPE_CHECKING
+
+if TYPE_CHECKING:
+    import aiohttp
 
 from gateway.config import Platform, PlatformConfig
 from gateway.platforms.base import (
diff --git a/gateway/platforms/whatsapp.py b/gateway/platforms/whatsapp.py
index a82417a601..22abea08bb 100644
--- a/gateway/platforms/whatsapp.py
+++ b/gateway/platforms/whatsapp.py
@@ -25,7 +25,10 @@ import subprocess
 
 _IS_WINDOWS = platform.system() == "Windows"
 from pathlib import Path
-from typing import Dict, Optional, Any
+from typing import Dict, Optional, Any, TYPE_CHECKING
+
+if TYPE_CHECKING:
+    import aiohttp
 
 from hermes_constants import get_hermes_dir
 
diff --git a/rl_cli.py b/rl_cli.py
index 03bf015c26..78f86d4e04 100644
--- a/rl_cli.py
+++ b/rl_cli.py
@@ -27,6 +27,8 @@ from pathlib import Path
 import fire
 import yaml
 
+from hermes_constants import get_hermes_home, OPENROUTER_BASE_URL
+
 # Load .env from ~/.hermes/.env first, then project root as dev fallback.
 # User-managed env files should override stale shell exports on restart.
 _hermes_home = get_hermes_home()
@@ -60,8 +62,6 @@ from tools.rl_training_tool import get_missing_keys
 # Config Loading
 # ============================================================================
 
-from hermes_constants import get_hermes_home, OPENROUTER_BASE_URL
-
 DEFAULT_MODEL = "anthropic/claude-opus-4.5"
 DEFAULT_BASE_URL = OPENROUTER_BASE_URL
 
diff --git a/run_agent.py b/run_agent.py
index e20c4bd06e..96033179b2 100644
--- a/run_agent.py
+++ b/run_agent.py
@@ -37,7 +37,10 @@ import time
 import threading
 from types import SimpleNamespace
 import uuid
-from typing import List, Dict, Any, Optional
+from typing import List, Dict, Any, Optional, TYPE_CHECKING
+
+if TYPE_CHECKING:
+    from agent.rate_limit_tracker import RateLimitState
 from openai import OpenAI
 import fire
 from datetime import datetime
diff --git a/tools/patch_parser.py b/tools/patch_parser.py
index 0c961083c2..dd52ff92c3 100644
--- a/tools/patch_parser.py
+++ b/tools/patch_parser.py
@@ -31,7 +31,10 @@ Usage:
 import difflib
 import re
 from dataclasses import dataclass, field
-from typing import List, Optional, Tuple, Any
+from typing import List, Optional, Tuple, Any, TYPE_CHECKING
+
+if TYPE_CHECKING:
+    from tools.file_operations import PatchResult
 from enum import Enum