I don't think the two includes above are necessary.