Now compiles, but...

...but, here's the catch: I had to comment out a block coming from VSS' patches, because the references wouldn't resolve.