Various include cleanups and clang-tidy fixes, and an error message fix. #408

Closed rjoomen closed 1 month ago