More header untangling.

Change-Id: I090943775cbda8d9515cdb484957f6b05d5b1799
16 files changed