Re: indirect includes - its not always clear which is best, I tend to avoid them and just add includes into source. Its a bit of a personal preference, since we did without it so far, prefer not to add now.