added/removed #include statements as suggested by Google's IWYU.
minor code tweaks.