refactored the autoloader includes to a static include