Revert "fixes a few deprecated header/unused param warnings"

This reverts commit d63ce03fd51a5ad8c046ea261295a1c5fffab140.
better fix for deprecated header warnings