Added and patched C++ GC files to work with simpler GC interface solving #990