CLOUDIFY-2475 fix includes