Update commands for moved include files