Ported to work with new variables, and added an include in
vtkModuleMacros for the call when it is needed.

Change-Id: I7472d39f021140bb6018b34f5001bd5f488ae9d8