Added more includes, for build to work on ubuntu