So then, not just the files you uploaded from backups (the includes/ folder, the styles/wrapper.inc.php file, and the /cache_builders/custom folder)? Then something isn't working correctly (since the other files should be stock to the version of the installer).
Does the error still display when you click the "i am updating my files myself" option?