Updated include paths and CMake config appropriately Change-Id: Ida5045cde0458b3031e64b73853fe5f58ef5a9d6