Refs #3632: add some missing #includes that were causing compile
failures on some platforms.