Add some missing header files to CMake configure files.

In addition to not appearing in IDEs, not adding the header file to
CMake means that the file was not installed with the install target.
Merge branch 'missing-install-headers'