Bugfix: put includes into include/db_agg directory