TS-1820 - Better fix for handling additional warning flags.
TS-1820 Fix a few includes to load properly.