Shorten the namespace and re-normalize include guards.

Change-Id: I93af4c1f19edf31098abd20ded1fcca6c5d83854
17 files changed