Adapt samples to new include hierarchy