Hi Matt, Did you go through all the header requirements by hand ? Include-what-you-use looks appealing, despite that sometimes it sorts includes in reverse order (and adds indirect dependencies). -Emil