diff --git a/modules/core/core-hazelcast/build.gradle b/modules/core/core-hazelcast/build.gradle
index 2d1cc63956c..fbbd9a60116 100644
--- a/modules/core/core-hazelcast/build.gradle
+++ b/modules/core/core-hazelcast/build.gradle
@@ -12,17 +12,19 @@ dependencies {
 jar {
     bnd( 'Bundle-Name': 'Enonic XP Core - Hazelcast',
          'Import-Package':
-             'com.enonic.xp.event;resolution:=optional' + ',' +
+             'com.enonic.xp.app;resolution:=optional' + ',' +
+             'com.enonic.xp.branch;resolution:=optional' + ',' +
+             'com.enonic.xp.cluster;resolution:=optional' + ',' +
              'com.enonic.xp.data;resolution:=optional' + ',' +
+             'com.enonic.xp.event;resolution:=optional' + ',' +
+             'com.enonic.xp.page;resolution:=optional' + ',' +
+             'com.enonic.xp.repository;resolution:=optional' + ',' +
              'com.enonic.xp.scheduler;resolution:=optional' + ',' +
-                 'com.enonic.xp.task;resolution:=optional' + ',' +
-                 'com.enonic.xp.app;resolution:=optional' + ',' +
-                 'com.enonic.xp.page;resolution:=optional' + ',' +
-                 'com.enonic.xp.repository;resolution:=optional' + ',' +
-                 'com.enonic.xp.branch;resolution:=optional' + ',' +
-                 'com.enonic.xp.security.auth;resolution:=optional' + ',' +
-                 'com.enonic.xp.impl.task.distributed;resolution:=optional' + ',' +
-                 'com.enonic.xp.impl.scheduler.distributed;resolution:=optional' + ',' +
-                 'com.google.common.collect;resolution:=optional,' +
-                 '*')
+             'com.enonic.xp.security;resolution:=optional' + ',' +
+             'com.enonic.xp.security.auth;resolution:=optional' + ',' +
+             'com.enonic.xp.task;resolution:=optional' + ',' +
+             'com.enonic.xp.impl.scheduler.distributed;resolution:=optional' + ',' +
+             'com.enonic.xp.impl.task.distributed;resolution:=optional' + ',' +
+             'com.google.common.collect;resolution:=optional,' +
+             '*')
 }