Fix a few headers that got left out in the cold