Added porper header references in cmakelists, etc