s3-includes: remove PRIMARY_* SID_INDEX defines defined elsewhere already.