Correct guard macros in header files

Change-Id: Ifce12a95c1cdc36dc6ac5a72759249a17407da9e
67 files changed