Remove includes attributes that will break the build.

While I'm here, tweak a few things to be consistent
and/or more compact.

Change-Id: I8a02ad1d5e2a894f5eaef597be4b237a23261bde
Reviewed-on: https://code-review.googlesource.com/4534
Reviewed-by: Paul Wankadia <junyer@google.com>
2 files changed