Simplified include naming.