Davy Durham - 2013-12-27

All of these #includes were already present in svn trunk/ except for one questionable one. I commited it anyway.

Thanks