Fixing includes to clean up deprecation warnings.