Merge pull request #187 from bryanherger/master

Fix some CMake include file issues