Also, we should remove addIncludePath(). That's for legacy support w/o proper autoloaders.