Header files updates

Found more stray files that needed header updates.