Don't rely on transitively included headers am: 439eb0f241  -s ours
am: 97ec97db47  -s ours

Change-Id: I7aa4a053439ad2dc14198b2045dc74283daf5cca