am 72bf2a71: Merge "Move transport declarations into transport.h."

* commit '72bf2a710089b5fff42059d5946fe7bdd6b12480':
  Move transport declarations into transport.h.