Refactor headers to create explicit dependency am: d4842e849a am: 95c7c07ffd am: f5c8a1639e

Change-Id: I7afac1da620c055638cd0c3e557e27b9ff1986ea