Feature #4977: Remove CURL dependency in headers