clean up for aggregator build
fix includes for bin