Added defines functionality to cmake

Also updated defines, includes, and sources to reflect
upcoming trace files.