Fixed out-of-date includes