Minor fixes for includes, header guards

Change-Id: Ibe8aa6f1be25a4667c7692ac8993b40032aa52a8
Merge branch 'nits'

Change-Id: I18c71def01c3d634c0a6fcb42febebd3ba3b57c5