16 files changed, 16 insertions, 16 deletions
diff --git a/src/core/SkAAClip.cpp b/src/core/SkAAClip.cpp
index a54f0ffa5c..bbd1f555f0 100644
--- a/src/core/SkAAClip.cpp
+++ b/src/core/SkAAClip.cpp
@@ -7,7 +7,7 @@
  */
 
 #include "SkAAClip.h"
-#include "../private/SkAtomics.h"
+#include "SkAtomics.h"
 #include "SkBlitter.h"
 #include "SkColorPriv.h"
 #include "SkPath.h"
diff --git a/src/core/SkBitmap.cpp b/src/core/SkBitmap.cpp
index a935e882bc..6fd97dc241 100644
--- a/src/core/SkBitmap.cpp
+++ b/src/core/SkBitmap.cpp
@@ -5,7 +5,7 @@
  * found in the LICENSE file.
  */
 
-#include "../private/SkAtomics.h"
+#include "SkAtomics.h"
 #include "SkBitmap.h"
 #include "SkColorPriv.h"
 #include "SkData.h"
diff --git a/src/core/SkBitmapHeap.h b/src/core/SkBitmapHeap.h
index d273a299a4..22c31a0b0b 100644
--- a/src/core/SkBitmapHeap.h
+++ b/src/core/SkBitmapHeap.h
@@ -8,7 +8,7 @@
 #ifndef SkBitmapHeap_DEFINED
 #define SkBitmapHeap_DEFINED
 
-#include "../private/SkAtomics.h"
+#include "SkAtomics.h"
 #include "SkBitmap.h"
 #include "SkPoint.h"
 #include "SkRefCnt.h"
diff --git a/src/core/SkClipStack.cpp b/src/core/SkClipStack.cpp
index 1fd621b9d2..f54d57fd0b 100644
--- a/src/core/SkClipStack.cpp
+++ b/src/core/SkClipStack.cpp
@@ -5,7 +5,7 @@
  * found in the LICENSE file.
  */
 
-#include "../private/SkAtomics.h"
+#include "SkAtomics.h"
 #include "SkCanvas.h"
 #include "SkClipStack.h"
 #include "SkPath.h"
diff --git a/src/core/SkDrawable.cpp b/src/core/SkDrawable.cpp
index c998d0270f..8fea38be34 100644
--- a/src/core/SkDrawable.cpp
+++ b/src/core/SkDrawable.cpp
@@ -5,7 +5,7 @@
  * found in the LICENSE file.
  */
 
-#include "../private/SkAtomics.h"
+#include "SkAtomics.h"
 #include "SkCanvas.h"
 #include "SkDrawable.h"
 
diff --git a/src/core/SkPicture.cpp b/src/core/SkPicture.cpp
index 0fe3ae495d..8247336d49 100644
--- a/src/core/SkPicture.cpp
+++ b/src/core/SkPicture.cpp
@@ -5,7 +5,7 @@
  * found in the LICENSE file.
  */
 
-#include "../private/SkAtomics.h"
+#include "SkAtomics.h"
 #include "SkMessageBus.h"
 #include "SkPicture.h"
 #include "SkPictureData.h"
diff --git a/src/core/SkRegion.cpp b/src/core/SkRegion.cpp
index aeebec4c32..3a542c6169 100644
--- a/src/core/SkRegion.cpp
+++ b/src/core/SkRegion.cpp
@@ -7,7 +7,7 @@
  */
 
 
-#include "../private/SkAtomics.h"
+#include "SkAtomics.h"
 #include "SkRegionPriv.h"
 #include "SkTemplates.h"
 #include "SkUtils.h"
diff --git a/src/core/SkRegionPriv.h b/src/core/SkRegionPriv.h
index bde8e28901..160c55d555 100644
--- a/src/core/SkRegionPriv.h
+++ b/src/core/SkRegionPriv.h
@@ -11,7 +11,7 @@
 #define SkRegionPriv_DEFINED
 
 #include "SkRegion.h"
-#include "../private/SkAtomics.h"
+#include "SkAtomics.h"
 
 #define assert_sentinel(value, isSentinel) \
     SkASSERT(((value) == SkRegion::kRunTypeSentinel) == isSentinel)
diff --git a/src/core/SkShader.cpp b/src/core/SkShader.cpp
index 84ce8b69b6..6aadb4301a 100644
--- a/src/core/SkShader.cpp
+++ b/src/core/SkShader.cpp
@@ -5,7 +5,7 @@
  * found in the LICENSE file.
  */
 
-#include "../private/SkAtomics.h"
+#include "SkAtomics.h"
 #include "SkBitmapProcShader.h"
 #include "SkColorShader.h"
 #include "SkEmptyShader.h"
diff --git a/src/core/SkSharedMutex.cpp b/src/core/SkSharedMutex.cpp
index 0db6101ddf..203a775190 100644
--- a/src/core/SkSharedMutex.cpp
+++ b/src/core/SkSharedMutex.cpp
@@ -7,7 +7,7 @@
 
 #include "SkSharedMutex.h"
 
-#include "../private/SkAtomics.h"
+#include "SkAtomics.h"
 #include "SkTypes.h"
 #include "../private/SkSemaphore.h"
 
diff --git a/src/core/SkSharedMutex.h b/src/core/SkSharedMutex.h
index 737735f4df..9660adf0eb 100644
--- a/src/core/SkSharedMutex.h
+++ b/src/core/SkSharedMutex.h
@@ -8,7 +8,7 @@
 #ifndef SkSharedLock_DEFINED
 #define SkSharedLock_DEFINED
 
-#include "../private/SkAtomics.h"
+#include "SkAtomics.h"
 #include "SkSemaphore.h"
 #include "SkTypes.h"
 
diff --git a/src/core/SkString.cpp b/src/core/SkString.cpp
index af5fa7a58c..d93f662da3 100644
--- a/src/core/SkString.cpp
+++ b/src/core/SkString.cpp
@@ -7,7 +7,7 @@
  */
 
 
-#include "../private/SkAtomics.h"
+#include "SkAtomics.h"
 #include "SkFixed.h"
 #include "SkString.h"
 #include "SkUtils.h"
diff --git a/src/core/SkTLS.cpp b/src/core/SkTLS.cpp
index c7304ed38e..a47dc14b5a 100755
--- a/src/core/SkTLS.cpp
+++ b/src/core/SkTLS.cpp
@@ -12,7 +12,7 @@
 
 
 #ifdef SK_TRACE_TLS_LIFETIME
-    #include "../private/SkAtomics.h"
+    #include "SkAtomics.h"
     static int32_t gTLSRecCount;
 #endif
 
diff --git a/src/core/SkTaskGroup.h b/src/core/SkTaskGroup.h
index c23087bddb..3af64d7753 100644
--- a/src/core/SkTaskGroup.h
+++ b/src/core/SkTaskGroup.h
@@ -9,7 +9,7 @@
 #define SkTaskGroup_DEFINED
 
 #include "SkTypes.h"
-#include "../private/SkAtomics.h"
+#include "SkAtomics.h"
 #include "SkTemplates.h"
 
 struct SkRunnable;
diff --git a/src/core/SkTraceEvent.h b/src/core/SkTraceEvent.h
index c76e046457..05dc340fa2 100644
--- a/src/core/SkTraceEvent.h
+++ b/src/core/SkTraceEvent.h
@@ -10,7 +10,7 @@
 #ifndef SkTraceEvent_DEFINED
 #define SkTraceEvent_DEFINED
 
-#include "../private/SkAtomics.h"
+#include "SkAtomics.h"
 #include "SkEventTracer.h"
 #include "SkTraceEventCommon.h"
 
diff --git a/src/core/SkTypefaceCache.cpp b/src/core/SkTypefaceCache.cpp
index 3f8799dad1..5fe080d05d 100644
--- a/src/core/SkTypefaceCache.cpp
+++ b/src/core/SkTypefaceCache.cpp
@@ -9,7 +9,7 @@
 
 
 #include "SkTypefaceCache.h"
-#include "../private/SkAtomics.h"
+#include "SkAtomics.h"
 #include "SkMutex.h"
 
 #define TYPEFACE_CACHE_LIMIT    1024