Improve CMake build system.
Remove unnecessary includes from the includes

from include directory.
Merge pull request #1 from ricortiz/ImproveCMakeBuildSys

Improve CMake build sys