You are right. Removed from the autoload list and added as explicit require on the dependent files.