Merge "Move transport declarations into transport.h."