fixup c8699e2f057b14b19ba60dbd4e71f4647b45ca78

When I removed the wesnoth built-in timeouts, I didn't completely
revert some of the changes, I left and include and didn't change
a shared_ptr back to scoped_ptr.
Merge branch 'master' of git://github.com/wesnoth/wesnoth