Commit 04ae35e592c1e7e99bb3894420b6ff2117ace78a always enabled time
tracing. This performs additional code cleanup
Remove the #else clause (which had been part of the include guard as a
result of the previous commit).
Also move the include header to the top of the file.