Reorganize the header files in a way that's easier to document.

This CL does not change any specification found in a .spec file,
it just reorganizes the distribution of the content.

It also changes a few files that included headers that no longer
exist.

Change-Id: I4a290a30ad3bdc31bac7a7be24e7a7dea2af2618
43 files changed