Disable MPEG, enable OGG, fix some includes