Hello, Following Pablo's comments (thanks!), here's a new version of the patch series that improves include behavior. It fixes bug #1243, and also errors with bug reporting. Changes from v1: - include the test in this patch series - split in more commits, to improve reviewability - clean code state after each commit - fixes an additional bug found while refactoring the patch, where the include chain wasn't displayed correctly while printing errors. Overall, definitely a lot of improvement, was definitely worth spending some time on it. Cheers, Laurent