CMakelists and includes fixes as per @kovrov 's suggestion