more cleanups
more header cleanups
removed include headers