Fixed bad <set> and <map> includes.