Reorganized includes to execute on plugins_loaded hook