adding header and removing all include references. Letting the Autoload do its job