Removed two preprocess macros to avoid FMS namespace clash

Resolves a minor namespace clash between GOTM and FMS IO.