build: move headers out of c++ src section
This commit moves a few header files that are listed among the C++ source files for consistency.
Checklist
-
make -j4 test
(UNIX), orvcbuild test
(Windows) passes -
commit message follows commit guidelines