Re-included thrift libraries