4 files changed, 3 insertions, 3 deletions
diff --git a/src/codec/SkCodec.cpp b/src/codec/SkCodec.cpp
index 04ee7c6a43..75e5c34f53 100644
--- a/src/codec/SkCodec.cpp
+++ b/src/codec/SkCodec.cpp
@@ -7,7 +7,6 @@
 
 #include "SkBmpCodec.h"
 #include "SkCodec.h"
-#include "SkCodec_libpng.h"
 #include "SkCodecPriv.h"
 #include "SkData.h"
 #include "SkGifCodec.h"
@@ -15,6 +14,7 @@
 #if !defined(GOOGLE3)
 #include "SkJpegCodec.h"
 #endif
+#include "SkPngCodec.h"
 #include "SkStream.h"
 #include "SkWbmpCodec.h"
 #include "SkWebpCodec.h"
diff --git a/src/codec/SkIcoCodec.cpp b/src/codec/SkIcoCodec.cpp
index 0280be304c..62269237ae 100644
--- a/src/codec/SkIcoCodec.cpp
+++ b/src/codec/SkIcoCodec.cpp
@@ -6,11 +6,11 @@
  */
 
 #include "SkBmpCodec.h"
-#include "SkCodec_libpng.h"
 #include "SkCodecPriv.h"
 #include "SkColorPriv.h"
 #include "SkData.h"
 #include "SkIcoCodec.h"
+#include "SkPngCodec.h"
 #include "SkStream.h"
 #include "SkTDArray.h"
 #include "SkTSort.h"
diff --git a/src/codec/SkCodec_libpng.cpp b/src/codec/SkPngCodec.cpp
index b75fb3a84e..66215a6c73 100644
--- a/src/codec/SkCodec_libpng.cpp
+++ b/src/codec/SkPngCodec.cpp
@@ -5,12 +5,12 @@
  * found in the LICENSE file.
  */
 
-#include "SkCodec_libpng.h"
 #include "SkCodecPriv.h"
 #include "SkColorPriv.h"
 #include "SkColorTable.h"
 #include "SkBitmap.h"
 #include "SkMath.h"
+#include "SkPngCodec.h"
 #include "SkSize.h"
 #include "SkStream.h"
 #include "SkSwizzler.h"
diff --git a/src/codec/SkCodec_libpng.h b/src/codec/SkPngCodec.h
index 9a13a12670..9a13a12670 100644
--- a/src/codec/SkCodec_libpng.h
+++ b/src/codec/SkPngCodec.h