Have /src files use header directly.

src/core/SkTraceEvent.h

 // Copyright (c) 2014 Google Inc.
 //
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 // This header file defines implementation details of how the trace macros in
 // SkTraceEventCommon.h collect and store trace events. Anything not
 // implementation-specific should go in SkTraceEventCommon.h instead of here.
 
 #ifndef SkTraceEvent_DEFINED
 #define SkTraceEvent_DEFINED
 
-#include "../private/SkAtomics.h"
+#include "SkAtomics.h"
 #include "SkEventTracer.h"
 #include "SkTraceEventCommon.h"
 
 ////////////////////////////////////////////////////////////////////////////////
 // Implementation specific tracing API definitions.
 
 // By default, const char* argument values are assumed to have long-lived scope
 // and will not be copied. Use this macro to force a const char* to be copied.
 #define TRACE_STR_COPY(str) \
     skia::tracing_internals::TraceStringWithCopy(str)
@@ skipping 501 matching lines @@
   }
 
  private:
   const char* previous_state_;
 };
 
 }  // namespace tracing_internals
 }  // namespace skia
 
 #endif