[cleanup] Random assortment of simple cleanups.
Pruning header includes and forward references and fixing comments.