cmake changes, header paths etc.