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

* commit '16f3d361e12e423d56697f59bd0c61f8597798e8':
  Move transport declarations into transport.h.