Don't forget to use std:: prefix on make_pair in the header files.