diff --git a/archive/org.eclipse.wtp.releng/apitools/org.eclipse.wtp.releng.tools.component.core/src/org/eclipse/wtp/releng/tools/component/use/ComponentUseEmitter.java b/archive/org.eclipse.wtp.releng/apitools/org.eclipse.wtp.releng.tools.component.core/src/org/eclipse/wtp/releng/tools/component/use/ComponentUseEmitter.java
index 2e52408467bef881ddfe162c68bc0658387f188b..2794ade9aea8feae891a24bcc023fcd63cfa2ddb 100644
--- a/archive/org.eclipse.wtp.releng/apitools/org.eclipse.wtp.releng.tools.component.core/src/org/eclipse/wtp/releng/tools/component/use/ComponentUseEmitter.java
+++ b/archive/org.eclipse.wtp.releng/apitools/org.eclipse.wtp.releng.tools.component.core/src/org/eclipse/wtp/releng/tools/component/use/ComponentUseEmitter.java
@@ -240,7 +240,8 @@ public class ComponentUseEmitter extends AbstractEmitter implements IClazzVisito
       // use: implement
       String[] interfaces = clazz.getInterfaces();
       for (int i = 0; i < interfaces.length; i++)
-        addUniqueClassUse(source, interfaces[i], null, null, Boolean.TRUE, null, null);
+        if (isReportClassUse(className, interfaces[i]))
+          addUniqueClassUse(source, interfaces[i], null, null, Boolean.TRUE, null, null);
     }
     // use: reference
     Set refClasses = clazz.getReferencedTypes();
diff --git a/archive/org.eclipse.wtp.releng/buildAll.xml b/archive/org.eclipse.wtp.releng/buildAll.xml
index 35ce61176eff7c907eca46f0514b165635f5ea56..153f68ddff860fd1e782c46290c7031bff401de2 100644
--- a/archive/org.eclipse.wtp.releng/buildAll.xml
+++ b/archive/org.eclipse.wtp.releng/buildAll.xml
@@ -775,7 +775,11 @@
                 <unzip src="${buildDirectory}/${buildLabel}/wtp-jst-Automated-Tests-${buildId}.zip" dest="${apitoolsDir}/test"/>
                 <antcall target="runAPIToolsEmitter">
                         <param name="emitterClass" value="org.eclipse.wtp.releng.tools.component.violation.ComponentViolationEmitter"/>
-                        <param name="args" value="-eclipseDir ${apitoolsDir}/base/eclipse/plugins -compXMLDir ${buildDirectory}/plugins -compRefDir ${apitoolsDir}/${component.xml} -compVioDir ${buildDirectory}/${buildLabel}/apitools -include org.eclipse. -genHTML -genUsage -debug"/>
+                        <param name="args" value="-eclipseDir ${apitoolsDir}/base/eclipse/plugins -compXMLDir ${buildDirectory}/plugins -compRefDir ${apitoolsDir}/${component.xml} -compVioDir ${buildDirectory}/${buildLabel}/apitools -include org.eclipse. -exclude org.eclipse.wst. org.eclipse.jst. -genHTML -genUsage -debug"/>
+                </antcall>
+                <antcall target="runAPIToolsEmitter">
+                        <param name="emitterClass" value="org.eclipse.wtp.releng.tools.component.violation.ComponentViolationEmitter"/>
+                        <param name="args" value="-eclipseDir ${apitoolsDir}/base/eclipse/plugins -compXMLDir ${buildDirectory}/plugins -compRefDir ${apitoolsDir}/${component.xml} -compVioDir ${buildDirectory}/${buildLabel}/apitools2 -include org.eclipse.wst. org.eclipse.jst. -genHTML -genUsage -debug"/>
                 </antcall>
                 <tstamp/>
                 <antcall target="runAPIToolsEmitter">