Cmake: fix issue after merge (unresolved change in header list)