add missing include of map
undo some wronge boost nameings