GPRESOURCES-210 - fix for the duplicate includes issue