Fix includes that I messed up after the last merge