fixed cyclic dep. thrift changes too.