Fixed up include problems due to the merge of yamcmcpp.