Remove unnecessary (and wrong) includes to firstLevel and commandLine controllers