header cleanup in base

reduce the number of headers brought in through static.h

deprecated map.h and set.h