Do a header cleanup pass.

 - Remove #includes for headers that are no longer needed
   due to reorganization.

 - Remove declarations for deleted functions.

 - Improve formatting.