Fixed some includes.
Added some missing includes.
I've been working on this on Quazaa for some time now. Once the code reaches v1.0...