Completed fix of autoloader include (maybe?)