Merged r11377:11390 from jcorgan/usrp-headers in to trunk.