CLOUDIFY-2370 remove includes logic + make necessary adjustments