Remove references to OCHamcrest in #includes