Fix headers to be included alone

Change-Id: I7eb9a6ed51b938506d440b91e6b3d42daf817fd7
6 files changed