diff --git a/openbis/resource/dependency-structure.ddf b/openbis/resource/dependency-structure.ddf
index d2ac11b20e3827ba11a51272842b9c5fbb9ece43..6de4b8ae8362423ebd2b3139456eca0c0e398cbb 100644
--- a/openbis/resource/dependency-structure.ddf
+++ b/openbis/resource/dependency-structure.ddf
@@ -218,13 +218,13 @@ check layeringOf plugin.${pq}.web.client-server
 
 [api-shared] = ${plugin}.${pq}.shared.api.*
 [api-client] = ${plugin}.${pq}.client.api.*
-[everything-except-java] = * excluding java* *.annotation.* ch.systemsx.cisd.common.api.IRpcService
-[everything-except-java-and-api-shared] = [everything-except-java] excluding [api-shared] ch.systemsx.cisd.common.api.client.*
+[java] = java* *.annotation.* ch.systemsx.cisd.common.api.IRpcService
+[java-and-api-shared] = [java] [api-shared] ch.systemsx.cisd.common.api.client.*
 
 check sets [api-shared] [api-client]
 
-check [api-shared] independentOf [everything-except-java]
-check [api-client] independentOf [everything-except-java-and-api-shared]
+check [api-shared] dependentOnlyOn [java]
+check [api-client] dependentOnlyOn [java-and-api-shared]
 
 ###########################################
 # Script API