Move headers to include/ and clean up style

Bug: 166800618
Test: mma
Change-Id: I7c1c60445f2e66f4f655863404769a834abc0026
5 files changed