Eng 6452 inline agg join

This ALMOST looks like you organized the include statements into a consistent format arranged neatly by directory -- but just ALMOST.