Fixed includes by regex, hopefully got them all