[minor] Address coverity defect 16832, COPY_INSTEAD_OF_MOVE, introduced 29 May. Tidied headers while there.