small cmake / includes updates