diff --git a/j2ee/clientproject/src/org/netbeans/modules/j2ee/clientproject/resources/build-impl.xsl b/j2ee/clientproject/src/org/netbeans/modules/j2ee/clientproject/resources/build-impl.xsl
index 596ad74..f83658d 100644
--- a/j2ee/clientproject/src/org/netbeans/modules/j2ee/clientproject/resources/build-impl.xsl
+++ b/j2ee/clientproject/src/org/netbeans/modules/j2ee/clientproject/resources/build-impl.xsl
@@ -278,14 +278,6 @@ Microsystems, Inc. All Rights Reserved.
                         <xsl:attribute name="optional">true</xsl:attribute>
                     </element>
                     <sequential>
-                        <depend> <!-- #77666 -->
-                            <xsl:attribute name="srcdir">@{srcdir}</xsl:attribute>
-                            <xsl:attribute name="destdir">@{destdir}</xsl:attribute>
-                            <xsl:attribute name="cache">${build.dir}/depcache</xsl:attribute>
-                            <classpath>
-                                <path path="@{{classpath}}"/>
-                            </classpath>
-                        </depend>
                         <javac>
                             <xsl:attribute name="srcdir">@{srcdir}</xsl:attribute>
                             <xsl:attribute name="destdir">@{destdir}</xsl:attribute>
@@ -310,6 +302,67 @@ Microsystems, Inc. All Rights Reserved.
                         </javac>
                     </sequential>
                 </macrodef>
+                <macrodef> <!-- #77666, #85707 -->
+                    <xsl:attribute name="name">depend</xsl:attribute>
+                    <xsl:attribute name="uri">http://www.netbeans.org/ns/car-project/1</xsl:attribute>
+                    <attribute>
+                        <xsl:attribute name="name">srcdir</xsl:attribute>
+                        <xsl:attribute name="default">
+                            <xsl:call-template name="createPath">
+                                <xsl:with-param name="roots" select="/p:project/p:configuration/carproject:data/carproject:source-roots"/>
+                            </xsl:call-template>
+                        </xsl:attribute>
+                    </attribute>
+                    <attribute>
+                        <xsl:attribute name="name">destdir</xsl:attribute>
+                        <xsl:attribute name="default">${build.classes.dir}</xsl:attribute>
+                    </attribute>
+                    <attribute>
+                        <xsl:attribute name="name">classpath</xsl:attribute>
+                        <xsl:attribute name="default">${javac.classpath}</xsl:attribute>
+                    </attribute>
+                    <sequential>
+                        <depend>
+                            <xsl:attribute name="srcdir">@{srcdir}</xsl:attribute>
+                            <xsl:attribute name="destdir">@{destdir}</xsl:attribute>
+                            <xsl:attribute name="cache">${build.dir}/depcache</xsl:attribute>
+                            <classpath>
+                                <path path="@{{classpath}}"/>
+                            </classpath>
+                        </depend>
+                    </sequential>
+                </macrodef>
+                <macrodef> <!-- #85707 -->
+                    <xsl:attribute name="name">force-recompile</xsl:attribute>
+                    <xsl:attribute name="uri">http://www.netbeans.org/ns/car-project/1</xsl:attribute>
+                    <attribute>
+                        <xsl:attribute name="name">destdir</xsl:attribute>
+                        <xsl:attribute name="default">${build.classes.dir}</xsl:attribute>
+                    </attribute>
+                    <sequential>
+                        <fail unless="javac.includes">Must set javac.includes</fail>
+                        <!-- XXX one little flaw in this weird trick: does not work on folders. -->
+                        <pathconvert>
+                            <xsl:attribute name="property">javac.includes.binary</xsl:attribute>
+                            <xsl:attribute name="pathsep">,</xsl:attribute>
+                            <path>
+                                <filelist>
+                                    <xsl:attribute name="dir">@{destdir}</xsl:attribute>
+                                    <xsl:attribute name="files">${javac.includes}</xsl:attribute>
+                                </filelist>
+                            </path>
+                            <globmapper>
+                                <xsl:attribute name="from">*.java</xsl:attribute>
+                                <xsl:attribute name="to">*.class</xsl:attribute>
+                            </globmapper>
+                        </pathconvert>
+                        <delete>
+                            <files includes="${{javac.includes.binary}}"/>
+                        </delete>
+                    </sequential>
+                </macrodef>
             </target>

             <target name="-init-macrodef-junit">
@@ -691,6 +744,7 @@ Microsystems, Inc. All Rights Reserved.
                     </xsl:for-each>
                 </target>
                 <target name="web-service-client-compile" depends="web-service-client-generate">
+                    <carproject:depend srcdir="${{build.generated.dir}}/wsclient" classpath="${{wscompile.classpath}}:${{javac.classpath}}" destdir="${{classes.dir}}"/>
                     <carproject:javac srcdir="${{build.generated.dir}}/wsclient" classpath="${{wscompile.classpath}}:${{javac.classpath}}" destdir="${{classes.dir}}"/>
                 </target>
             </xsl:if>
@@ -854,6 +908,7 @@ Microsystems, Inc. All Rights Reserved.
             <target name="-do-compile">
                 <xsl:attribute name="depends">init,deps-jar,-pre-pre-compile,-pre-compile,-copy-meta-inf<xsl:if test="/p:project/p:configuration/carproject:data/carproject:web-service-clients/carproject:web-service-client">,web-service-client-compile</xsl:if></xsl:attribute>
                 <xsl:attribute name="if">have.sources</xsl:attribute>
+                <carproject:depend destdir="${{classes.dir}}"/>
                 <carproject:javac destdir="${{classes.dir}}"/>
                 <copy todir="${{classes.dir}}">
                     <xsl:call-template name="createFilesets">
@@ -881,6 +936,7 @@ Microsystems, Inc. All Rights Reserved.
             <target name="-do-compile-single">
                 <xsl:attribute name="depends">init,deps-jar,-pre-pre-compile<xsl:if test="/p:project/p:configuration/carproject:data/carproject:web-service-clients/carproject:web-service-client">,web-service-client-compile</xsl:if></xsl:attribute>
                 <fail unless="javac.includes">Must select some files in the IDE or set javac.includes</fail>
+                <carproject:force-recompile/>
                 <carproject:javac>
                     <customize>
                         <patternset includes="${{javac.includes}}"/>
@@ -1340,6 +1396,15 @@ Microsystems, Inc. All Rights Reserved.
             <target name="-do-compile-test">
                 <xsl:attribute name="if">have.tests</xsl:attribute>
                 <xsl:attribute name="depends">init,compile,-pre-pre-compile-test,-pre-compile-test</xsl:attribute>
+                <xsl:element name="carproject:depend">
+                    <xsl:attribute name="srcdir">
+                        <xsl:call-template name="createPath">
+                            <xsl:with-param name="roots" select="/p:project/p:configuration/carproject:data/carproject:test-roots"/>
+                        </xsl:call-template>
+                    </xsl:attribute>
+                    <xsl:attribute name="destdir">${build.test.classes.dir}</xsl:attribute>
+                    <xsl:attribute name="classpath">${javac.test.classpath}</xsl:attribute>
+                </xsl:element>
                 <xsl:element name="carproject:javac">
                     <xsl:attribute name="srcdir">
                         <xsl:call-template name="createPath">
@@ -1376,6 +1441,9 @@ Microsystems, Inc. All Rights Reserved.
                 <xsl:attribute name="if">have.tests</xsl:attribute>
                 <xsl:attribute name="depends">init,compile,-pre-pre-compile-test,-pre-compile-test-single</xsl:attribute>
                 <fail unless="javac.includes">Must select some files in the IDE or set javac.includes</fail>
+                <xsl:element name="carproject:force-recompile">
+                    <xsl:attribute name="destdir">${build.test.classes.dir}</xsl:attribute>
+                </xsl:element>
                 <xsl:element name="carproject:javac">
                     <xsl:attribute name="srcdir">
                         <xsl:call-template name="createPath">
diff --git a/j2ee/ejbjarproject/src/org/netbeans/modules/j2ee/ejbjarproject/resources/build-impl.xsl b/j2ee/ejbjarproject/src/org/netbeans/modules/j2ee/ejbjarproject/resources/build-impl.xsl
index c21bfb1..295c47c 100644
--- a/j2ee/ejbjarproject/src/org/netbeans/modules/j2ee/ejbjarproject/resources/build-impl.xsl
+++ b/j2ee/ejbjarproject/src/org/netbeans/modules/j2ee/ejbjarproject/resources/build-impl.xsl
@@ -249,14 +249,6 @@ is divided into following sections:
                         <xsl:attribute name="optional">true</xsl:attribute>
                     </element>
                     <sequential>
-                        <depend> <!-- #77666 -->
-                            <xsl:attribute name="srcdir">@{srcdir}</xsl:attribute>
-                            <xsl:attribute name="destdir">@{destdir}</xsl:attribute>
-                            <xsl:attribute name="cache">${build.dir}/depcache</xsl:attribute>
-                            <classpath>
-                                <path path="@{{classpath}}"/>
-                            </classpath>
-                        </depend>
                         <property name="javac.compilerargs" value=""/>
                         <javac>
                             <xsl:attribute name="srcdir">@{srcdir}</xsl:attribute>
@@ -281,6 +273,67 @@ is divided into following sections:
                         </javac>
                     </sequential>
                 </macrodef>
+                <macrodef> <!-- #77666, #85707 -->
+                    <xsl:attribute name="name">depend</xsl:attribute>
+                    <xsl:attribute name="uri">http://www.netbeans.org/ns/j2ee-ejbjarproject/3</xsl:attribute>
+                    <attribute>
+                        <xsl:attribute name="name">srcdir</xsl:attribute>
+                        <xsl:attribute name="default">
+                            <xsl:call-template name="createPath">
+                                <xsl:with-param name="roots" select="/p:project/p:configuration/ejbjarproject3:data/ejbjarproject3:source-roots"/>
+                            </xsl:call-template>
+                        </xsl:attribute>
+                    </attribute>
+                    <attribute>
+                        <xsl:attribute name="name">destdir</xsl:attribute>
+                        <xsl:attribute name="default">${build.classes.dir}</xsl:attribute>
+                    </attribute>
+                    <attribute>
+                        <xsl:attribute name="name">classpath</xsl:attribute>
+                        <xsl:attribute name="default">${javac.classpath}</xsl:attribute>
+                    </attribute>
+                    <sequential>
+                        <depend>
+                            <xsl:attribute name="srcdir">@{srcdir}</xsl:attribute>
+                            <xsl:attribute name="destdir">@{destdir}</xsl:attribute>
+                            <xsl:attribute name="cache">${build.dir}/depcache</xsl:attribute>
+                            <classpath>
+                                <path path="@{{classpath}}"/>
+                            </classpath>
+                        </depend>
+                    </sequential>
+                </macrodef>
+                <macrodef> <!-- #85707 -->
+                    <xsl:attribute name="name">force-recompile</xsl:attribute>
+                    <xsl:attribute name="uri">http://www.netbeans.org/ns/j2ee-ejbjarproject/3</xsl:attribute>
+                    <attribute>
+                        <xsl:attribute name="name">destdir</xsl:attribute>
+                        <xsl:attribute name="default">${build.classes.dir}</xsl:attribute>
+                    </attribute>
+                    <sequential>
+                        <fail unless="javac.includes">Must set javac.includes</fail>
+                        <!-- XXX one little flaw in this weird trick: does not work on folders. -->
+                        <pathconvert>
+                            <xsl:attribute name="property">javac.includes.binary</xsl:attribute>
+                            <xsl:attribute name="pathsep">,</xsl:attribute>
+                            <path>
+                                <filelist>
+                                    <xsl:attribute name="dir">@{destdir}</xsl:attribute>
+                                    <xsl:attribute name="files">${javac.includes}</xsl:attribute>
+                                </filelist>
+                            </path>
+                            <globmapper>
+                                <xsl:attribute name="from">*.java</xsl:attribute>
+                                <xsl:attribute name="to">*.class</xsl:attribute>
+                            </globmapper>
+                        </pathconvert>
+                        <delete>
+                            <files includes="${{javac.includes.binary}}"/>
+                        </delete>
+                    </sequential>
+                </macrodef>
             </target>

             <target name="-init-macrodef-junit">
@@ -603,6 +656,7 @@ is divided into following sections:
                     </xsl:attribute>
                 </target>
                 <target name="web-service-client-compile" depends="web-service-client-generate">
+                    <ejbjarproject3:depend srcdir="${{build.generated.dir}}/wsclient" classpath="${{wscompile.classpath}}:${{javac.classpath}}" destdir="${{classes.dir}}"/>
                     <ejbjarproject2:javac srcdir="${{build.generated.dir}}/wsclient" classpath="${{wscompile.classpath}}:${{javac.classpath}}" destdir="${{classes.dir}}"/>
                 </target>
             </xsl:if>
@@ -763,6 +817,7 @@ is divided into following sections:
             <target name="-do-compile">
                 <xsl:attribute name="depends">init,deps-jar,-pre-pre-compile,-pre-compile,-copy-meta-inf<xsl:if test="/p:project/p:configuration/ejbjarproject3:data/ejbjarproject3:web-service-clients/ejbjarproject3:web-service-client">,web-service-client-compile</xsl:if></xsl:attribute>
                 <xsl:attribute name="if">have.sources</xsl:attribute>
+                <ejbjarproject3:depend destdir="${{classes.dir}}"/>
                 <ejbjarproject2:javac destdir="${{classes.dir}}"/>
                 <copy todir="${{classes.dir}}">
                     <xsl:call-template name="createFilesets">
@@ -806,6 +861,7 @@ is divided into following sections:
             <target name="-do-compile-single">
                 <xsl:attribute name="depends">init,deps-jar,-pre-pre-compile<xsl:if test="/p:project/p:configuration/ejbjarproject3:data/ejbjarproject3:web-service-clients/ejbjarproject3:web-service-client">,web-service-client-compile</xsl:if></xsl:attribute>
                 <fail unless="javac.includes">Must select some files in the IDE or set javac.includes</fail>
+                <ejbjarproject3:force-recompile/>
                 <ejbjarproject2:javac>
                     <customize>
                         <include name="${{javac.includes}}"/>
@@ -1084,6 +1140,15 @@ is divided into following sections:
             <target name="-do-compile-test">
                 <xsl:attribute name="if">have.tests</xsl:attribute>
                 <xsl:attribute name="depends">init,compile,-pre-pre-compile-test,-pre-compile-test</xsl:attribute>
+                <xsl:element name="ejbjarproject3:depend">
+                    <xsl:attribute name="srcdir">
+                        <xsl:call-template name="createPath">
+                            <xsl:with-param name="roots" select="/p:project/p:configuration/ejbjarproject3:data/ejbjarproject3:test-roots"/>
+                        </xsl:call-template>
+                    </xsl:attribute>
+                    <xsl:attribute name="destdir">${build.test.classes.dir}</xsl:attribute>
+                    <xsl:attribute name="classpath">${javac.test.classpath}:${j2ee.platform.classpath}</xsl:attribute>
+                </xsl:element>
                 <xsl:element name="ejbjarproject2:javac">
                     <xsl:attribute name="srcdir">
                         <xsl:call-template name="createPath">
@@ -1120,6 +1185,9 @@ is divided into following sections:
                 <xsl:attribute name="if">have.tests</xsl:attribute>
                 <xsl:attribute name="depends">init,compile,-pre-pre-compile-test,-pre-compile-test-single</xsl:attribute>
                 <fail unless="javac.includes">Must select some files in the IDE or set javac.includes</fail>
+                <xsl:element name="ejbjarproject3:force-recompile">
+                    <xsl:attribute name="destdir">${build.test.classes.dir}</xsl:attribute>
+                </xsl:element>
                 <xsl:element name="ejbjarproject2:javac">
                     <xsl:attribute name="srcdir">
                         <xsl:call-template name="createPath">
diff --git a/web/project/src/org/netbeans/modules/web/project/resources/build-impl.xsl b/web/project/src/org/netbeans/modules/web/project/resources/build-impl.xsl
index 0930e80..80195e5 100644
--- a/web/project/src/org/netbeans/modules/web/project/resources/build-impl.xsl
+++ b/web/project/src/org/netbeans/modules/web/project/resources/build-impl.xsl
@@ -303,14 +303,6 @@ introduced by support for multiple source roots. -jglick
                         <xsl:attribute name="optional">true</xsl:attribute>
                     </element>
                     <sequential>
-                        <depend> <!-- #77666 -->
-                            <xsl:attribute name="srcdir">@{srcdir}</xsl:attribute>
-                            <xsl:attribute name="destdir">@{destdir}</xsl:attribute>
-                            <xsl:attribute name="cache">${build.dir}/depcache</xsl:attribute>
-                            <classpath>
-                                <path path="@{{classpath}}"/>
-                            </classpath>
-                        </depend>
                         <javac>
                             <xsl:attribute name="srcdir">@{srcdir}</xsl:attribute>
                             <xsl:attribute name="destdir">@{destdir}</xsl:attribute>
@@ -335,6 +327,67 @@ introduced by support for multiple source roots. -jglick
                         </javac>
                     </sequential>
                 </macrodef>
+                <macrodef> <!-- #77666, #85707 -->
+                    <xsl:attribute name="name">depend</xsl:attribute>
+                    <xsl:attribute name="uri">http://www.netbeans.org/ns/web-project/3</xsl:attribute>
+                    <attribute>
+                        <xsl:attribute name="name">srcdir</xsl:attribute>
+                        <xsl:attribute name="default">
+                            <xsl:call-template name="createPath">
+                                <xsl:with-param name="roots" select="/p:project/p:configuration/webproject3:data/webproject3:source-roots"/>
+                            </xsl:call-template>
+                        </xsl:attribute>
+                    </attribute>
+                    <attribute>
+                        <xsl:attribute name="name">destdir</xsl:attribute>
+                        <xsl:attribute name="default">${build.classes.dir}</xsl:attribute>
+                    </attribute>
+                    <attribute>
+                        <xsl:attribute name="name">classpath</xsl:attribute>
+                        <xsl:attribute name="default">${javac.classpath}</xsl:attribute>
+                    </attribute>
+                    <sequential>
+                        <depend>
+                            <xsl:attribute name="srcdir">@{srcdir}</xsl:attribute>
+                            <xsl:attribute name="destdir">@{destdir}</xsl:attribute>
+                            <xsl:attribute name="cache">${build.dir}/depcache</xsl:attribute>
+                            <classpath>
+                                <path path="@{{classpath}}"/>
+                            </classpath>
+                        </depend>
+                    </sequential>
+                </macrodef>
+                <macrodef> <!-- #85707 -->
+                    <xsl:attribute name="name">force-recompile</xsl:attribute>
+                    <xsl:attribute name="uri">http://www.netbeans.org/ns/web-project/3</xsl:attribute>
+                    <attribute>
+                        <xsl:attribute name="name">destdir</xsl:attribute>
+                        <xsl:attribute name="default">${build.classes.dir}</xsl:attribute>
+                    </attribute>
+                    <sequential>
+                        <fail unless="javac.includes">Must set javac.includes</fail>
+                        <!-- XXX one little flaw in this weird trick: does not work on folders. -->
+                        <pathconvert>
+                            <xsl:attribute name="property">javac.includes.binary</xsl:attribute>
+                            <xsl:attribute name="pathsep">,</xsl:attribute>
+                            <path>
+                                <filelist>
+                                    <xsl:attribute name="dir">@{destdir}</xsl:attribute>
+                                    <xsl:attribute name="files">${javac.includes}</xsl:attribute>
+                                </filelist>
+                            </path>
+                            <globmapper>
+                                <xsl:attribute name="from">*.java</xsl:attribute>
+                                <xsl:attribute name="to">*.class</xsl:attribute>
+                            </globmapper>
+                        </pathconvert>
+                        <delete>
+                            <files includes="${{javac.includes.binary}}"/>
+                        </delete>
+                    </sequential>
+                </macrodef>
             </target>

             <target name="-init-macrodef-junit">
@@ -712,6 +765,7 @@ introduced by support for multiple source roots. -jglick
                     </xsl:for-each>
                 </target>
                 <target name="web-service-client-compile" depends="web-service-client-generate">
+                    <webproject3:depend srcdir="${{build.generated.dir}}/wsclient" classpath="${{wscompile.classpath}}:${{javac.classpath}}" destdir="${{build.classes.dir.real}}"/>
                     <webproject2:javac srcdir="${{build.generated.dir}}/wsclient" classpath="${{wscompile.classpath}}:${{javac.classpath}}" destdir="${{build.classes.dir.real}}"/>
                 </target>
             </xsl:if>
@@ -798,6 +852,7 @@ introduced by support for multiple source roots. -jglick
                 <xsl:attribute name="depends">init, deps-jar, -pre-pre-compile, -pre-compile, -copy-manifest, -copy-persistence-xml, -copy-webdir, library-inclusion-in-archive,library-inclusion-in-manifest,-do-ws-compile</xsl:attribute>
                 <xsl:attribute name="if">have.sources</xsl:attribute>

+                <webproject3:depend destdir="${{build.classes.dir.real}}"/>
                 <webproject2:javac destdir="${{build.classes.dir.real}}"/>

                 <copy todir="${{build.classes.dir.real}}">
@@ -859,6 +914,7 @@ introduced by support for multiple source roots. -jglick
             <target name="-do-compile-single">
                 <xsl:attribute name="depends">init,deps-jar,-pre-pre-compile<xsl:if test="/p:project/p:configuration/webproject3:data/webproject3:web-service-clients/webproject3:web-service-client">,web-service-client-compile</xsl:if></xsl:attribute>
                 <fail unless="javac.includes">Must select some files in the IDE or set javac.includes</fail>
+                <webproject3:force-recompile/>
                 <webproject2:javac>
                     <customize>
                         <patternset includes="${{javac.includes}}"/>
@@ -1374,7 +1430,7 @@ introduced by support for multiple source roots. -jglick

             <target name="debug-single">
                 <xsl:attribute name="if">netbeans.home</xsl:attribute>
-                <xsl:attribute name="depends">init,compile,compile-jsps,-do-compile-single-jsp,debug</xsl:attribute>
+                <xsl:attribute name="depends">init,compile-single,compile-jsps,-do-compile-single-jsp,debug</xsl:attribute>
             </target>

             <target name="-debug-start-debugger">
@@ -1489,6 +1545,15 @@ introduced by support for multiple source roots. -jglick
             <target name="-do-compile-test">
                 <xsl:attribute name="if">have.tests</xsl:attribute>
                 <xsl:attribute name="depends">init,compile,-pre-pre-compile-test,-pre-compile-test</xsl:attribute>
+                <xsl:element name="webproject3:depend">
+                    <xsl:attribute name="srcdir">
+                        <xsl:call-template name="createPath">
+                            <xsl:with-param name="roots" select="/p:project/p:configuration/webproject3:data/webproject3:test-roots"/>
+                        </xsl:call-template>
+                    </xsl:attribute>
+                    <xsl:attribute name="destdir">${build.test.classes.dir}</xsl:attribute>
+                    <xsl:attribute name="classpath">${javac.test.classpath}:${j2ee.platform.classpath}</xsl:attribute>
+                </xsl:element>
                 <xsl:element name="webproject2:javac">
                     <xsl:attribute name="srcdir">
                         <xsl:call-template name="createPath">
@@ -1525,6 +1590,9 @@ introduced by support for multiple source roots. -jglick
                 <xsl:attribute name="if">have.tests</xsl:attribute>
                 <xsl:attribute name="depends">init,compile,-pre-pre-compile-test,-pre-compile-test-single</xsl:attribute>
                 <fail unless="javac.includes">Must select some files in the IDE or set javac.includes</fail>
+                <xsl:element name="webproject3:force-recompile">
+                    <xsl:attribute name="destdir">${build.test.classes.dir}</xsl:attribute>
+                </xsl:element>
                 <xsl:element name="webproject2:javac">
                     <xsl:attribute name="srcdir">
                         <xsl:call-template name="createPath">