23c608c8f6
Minor cleanup of the includes used by the various source files, including annotations of why certain headers are used.