more header include cleanups