Remove references to recently removed includes/ directory