[TIDOC-1898] Fix linking issues
[TIDOC-1898] Missing comma
[TIDOC-1898] Remove usused global
Merge pull request #6261 from bhatfield/tidoc-1898

[TIDOC-1898] Fix linking issues