Net/ToBuffer: include cleanup