diff --git a/org.eclipse.jdt.core.javac/src/org/eclipse/jdt/internal/javac/JavacUtils.java b/org.eclipse.jdt.core.javac/src/org/eclipse/jdt/internal/javac/JavacUtils.java
index 6bddf58d0f7..8b872bba4fc 100644
--- a/org.eclipse.jdt.core.javac/src/org/eclipse/jdt/internal/javac/JavacUtils.java
+++ b/org.eclipse.jdt.core.javac/src/org/eclipse/jdt/internal/javac/JavacUtils.java
@@ -357,6 +357,12 @@ private static Collection<File> classpathEntriesToFiles(JavaProject project, Pre
 		try {
 			LinkedHashSet<File> res = new LinkedHashSet<>();
 			ArrayList<IClasspathEntry> seen = new ArrayList<>();
+			if (project.getModuleDescription() == null) {
+				IPath outputLocation = project.getOutputLocation();
+				if (outputLocation != null) {
+					addPath(project, outputLocation, res);
+				}
+			}
 			Queue<IClasspathEntry> toProcess = new LinkedList<>();
 			toProcess.addAll(Arrays.asList(project.resolveClasspath(project.getExpandedClasspath())));
 			while (!toProcess.isEmpty()) {