Fix includes because of file move