Starting to untangle header spaghetti.

Change-Id: I31f38d05dc8b55c659e8c7e9c0a87b94b9ac1db5
15 files changed