am 507113a1: Fix typo in include guard macro, and some cleanups.

* commit '507113a1bb0d9b7ac333512a69da12c4d5d57182':
  Fix typo in include guard macro, and some cleanups.