move APPVER guards from includes to app code