Also use generated headers in os/channel.*