Continued refactoring of strings & headers.

Change-Id: I420ffc5d861af3dcea65942ce8823be834fdcdec
4 files changed