qt5 includes fixed (also upstream)