Cleanup some included headers

Remove not needed headers, twice included headers and re-order some of the included headers (group them in order).