[CDF-243]: Fix for Auto includes not working in 5.0.3