Moved tracker code into include