[#8] Removed unused / added missing headers

Removed / localized the inclusion of headers. For the order of inclusion, I tried to follow this guide:
http://google-styleguide.googlecode.com/svn/trunk/cppguide.xml?showone=Names_and_Order_of_Includes#Names_and_Order_of_Includes