bugfix missing header on include and optimise cmake handling