CLOUDIFY-2370 fix includes