* Add #includes that were yanked out of header files