diff --git a/openbis/resource/dependency-structure.ddf b/openbis/resource/dependency-structure.ddf
index 58bb9da9e6213063656d5f49d8703e06f36988ee..ded60d322d5fa3b1d4e5efaa2091bbc415d99f72 100644
--- a/openbis/resource/dependency-structure.ddf
+++ b/openbis/resource/dependency-structure.ddf
@@ -216,8 +216,8 @@ check layeringOf plugin.${pq}.web.client-server
 # Check API
 #
 
-[api-shared] = ${plugin}.${pq}.shared.api.*
-[api-client] = ${plugin}.${pq}.client.api.*
+[api-shared] = ${plugin}.*.shared.api.*
+[api-client] = ${plugin}.*.client.api.*
 [java] = java* *.annotation.* *.annotate.* ch.systemsx.cisd.common.api.IRpcService
 [java-and-api-shared] = [java] [api-shared] ch.systemsx.cisd.common.api.client.*