Build: Cleanup qt5 includes, and fixes for 5.2.3