Remove obsolete AgedHistory
Remove types.h and add missing includes