Fix up thrift/thrift to only require the the files that define the classes it used to hold. This fixes the existing tests