Revert of IWYU: 'core' target, files starting A-C.

src/core/SkBitmap.cpp

Index: src/core/SkBitmap.cpp
diff --git a/src/core/SkBitmap.cpp b/src/core/SkBitmap.cpp
index 97b0db6f2056a0dc626040db6a052e61bcdc4702..aa26bdcab38c85d2123d6f139d07fa2cb4f54c97 100644
--- a/src/core/SkBitmap.cpp
+++ b/src/core/SkBitmap.cpp
@@ -1,3 +1,4 @@
+
 /*
  * Copyright 2008 The Android Open Source Project
  *
@@ -5,22 +6,23 @@
  * found in the LICENSE file.
  */
 
+
 #include "SkAtomics.h"
 #include "SkBitmap.h"
 #include "SkColorPriv.h"
-#include "SkData.h"
-#include "SkFilterQuality.h"
+#include "SkDither.h"
+#include "SkFlattenable.h"
+#include "SkImagePriv.h"
 #include "SkMallocPixelRef.h"
 #include "SkMask.h"
-#include "SkMath.h"
+#include "SkPackBits.h"
 #include "SkPixelRef.h"
 #include "SkReadBuffer.h"
-#include "SkRect.h"
-#include "SkScalar.h"
 #include "SkUnPreMultiply.h"
+#include "SkUtils.h"
+#include "SkValidationUtils.h"
 #include "SkWriteBuffer.h"
-
-#include <string.h>
+#include <new>
 
 static bool reset_return_false(SkBitmap* bm) {
     bm->reset();
@@ -747,6 +749,9 @@
 
 ///////////////////////////////////////////////////////////////////////////////
 
+#include "SkCanvas.h"
+#include "SkPaint.h"
+
 bool SkBitmap::canCopyTo(SkColorType dstColorType) const {
     const SkColorType srcCT = this->colorType();
 
@@ -1216,7 +1221,6 @@
 #endif
 
 #ifndef SK_IGNORE_TO_STRING
-#include "SkString.h"
 void SkBitmap::toString(SkString* str) const {
 
     static const char* gColorTypeNames[kLastEnum_SkColorType + 1] = {