[Chat] Optimized includes