Patched 'include/gui', partially 'include/media'