FIXED: I'm still not sure exactly what was messing me up, but I reverted to the root version from my CVS repository and slowly updated the files from my newest version, testing the error checking and that the project would still build after updating each file. Fortunately I hadn't coded too much in the current branch yet, so it didn't take to long to bring the root version up to speed.
Thanks for all the help!
