Rework header includes to work with gcc 4.2
Merge branch 'adt-header-madness'