Fix some includes