A few other include fixes