Change more copyright to 2009-2013, see #2879

Some more changes for master.

* Also added some missing headers