Fixed deprecation warnings for multiple includes.