revert: camera fix and update include
revert