reduce number of included headers. further cleanup.