added map.h and subs to types
added wildcard includes in automake