небольшие правки с инклудами

src/_VisualDVM/Passes/All/CombineFiles.java

@@ -75,10 +75,9 @@ public class CombineFiles extends Transformation {
                 for (String line : file_lines) {
                     String header = Utils.extractHeaderName(line);
                     if (header != null) {
-                        if (file.relativeHeaders.containsKey(header))
+                        if (file.dependencies.contains(header))
                             result_lines.add("      include " + Utils_.Quotes(
-                                    Utils_.toU(
-                                            file.relativeHeaders.get(header).name)));
+                                    Utils_.toU(header)));
                     } else
                         result_lines.add(line);
                 }