minor fixes:

- IWYU warnings
- accidentally reordered lines in cmCommands.cxx during rebase
Status Job ID Name Coverage
  External
passed cdash

passed cmake-dash3win10-windows-release-ninja

00:18:58

passed cmake-hythloth-linux-debug-makefiles+sphinx

00:44:41

passed cmake-minoc-linux-release-lint-iwyu-tidy

00:09:28

passed cmake-moonshade-osx-debug-ninja

00:10:09

passed cmake-moonshade-osx-release-makefiles

00:11:27

passed cmake-terfin-windows-release-vs2019

00:38:27

passed ghostflow-check-master