Rearrange includes to improve compile times.

This also allows for memory leak checking on MSVC by having include
surrounding Qt headers, which break if you have a macro define new
to be something which tracks line information.
Hmm but that is inconsitent with them being only for Qt headers. Maybe they should be renamed appropriately?