Fixes for bug #1137

With the new file load infrastructure, somescheme files failed to compile, due to undefined symbols. This fixes that.