You should be able to put all these `include`s in a single fileset.  I'd also like to see `../Janeway/lib` replaced with something like ${core-lib} above.

And let it be known that this stuff was a crappy hack to get libraries working in Janeway.  It's not a sustainable model.