As a general rule - ignore the 'includes' folder when upgrading. Don't worry most people have overwritten these type of files at one time or another over the years. As scroungr said, just enter the new values and away you go....
Donate to UBBDev today to help aid in Operational, Server and Script Maintenance, and Development costs.
Please also see our parent organization VNC Web Services if you're in the need of a new UBB.threads Install or Upgrade, Site/Server Migrations, or Security and Coding Services.
at the moment - but expanding all the time....) 
