--- ClassfileSet.java	Fri Dec 02 15:09:11 2005
+++ ClassfileSet.java.new	Fri Dec 02 13:06:40 2005
@@ -116,6 +116,8 @@
         if (isReference()) {
             return getRef(p).getDirectoryScanner(p);
         }
+        DirectoryScanner parentScanner = super.getDirectoryScanner(p);
+        DependScanner scanner = new DependScanner(parentScanner);
         Vector allRootClasses = (Vector) rootClasses.clone();
         for (Enumeration e = rootFileSets.elements(); e.hasMoreElements();) {
             FileSet additionalRootSet = (FileSet) e.nextElement();
@@ -131,9 +133,8 @@
                     allRootClasses.addElement(className);
                 }
             }
+            scanner.addBasedir(additionalRootSet.getDir(p));
         }
-        DirectoryScanner parentScanner = super.getDirectoryScanner(p);
-        DependScanner scanner = new DependScanner(parentScanner);
         scanner.setBasedir(getDir(p));
         scanner.setRootClasses(allRootClasses);
         scanner.scan();