Cross-references not working in imported text files

As we search for a proper CMS tool, we're using FM with a single-source methodology. We've broken down our content into individual FM files for the topics. These topic files are imported into "container" files in the book and then we generate a PDF.

The problem is that cross-references no longer work after PDF creation. We're assuming this is because the cross-references aren't in the actual book file, but are part of the imported topic files.

The only solution we've come across is to use the Hypertext option with the gotolink command. Each cross-references is linked to a destination set in the topic file and referenced as [containerFile.fm]:[destinationName]. Using the container files as the target is the only option we've found that's worked.

However, now we're running into the problem of having a single topic file that needs to be referenced in two different container files. One option would be to create a second topic file so so that we have files that map specifically to the related container file. But this moves us away from our single-sourcing methodology.

Does anyone have a suggestion for how to get the cross-references to work in this type of situation?

Thanks for your help.