Moved stopwatch to its own header.
Modified include guards to be more specific