remove includes so as to rely on the new autoloader