diff --git a/README.chromium b/README.chromium
index 4efb21756..340f274bd 100644
--- a/README.chromium
+++ b/README.chromium
@@ -1,6 +1,6 @@
 Name: libyuv
 URL: http://code.google.com/p/libyuv/
-Version: 554
+Version: 555
 License: BSD
 License File: LICENSE
 
diff --git a/include/libyuv/version.h b/include/libyuv/version.h
index c990b57b5..0ca84e1d7 100644
--- a/include/libyuv/version.h
+++ b/include/libyuv/version.h
@@ -11,6 +11,6 @@
 #ifndef INCLUDE_LIBYUV_VERSION_H_  // NOLINT
 #define INCLUDE_LIBYUV_VERSION_H_
 
-#define LIBYUV_VERSION 554
+#define LIBYUV_VERSION 555
 
 #endif  // INCLUDE_LIBYUV_VERSION_H_  NOLINT
diff --git a/source/convert_argb.cc b/source/convert_argb.cc
index d2c73d48c..7db0be32c 100644
--- a/source/convert_argb.cc
+++ b/source/convert_argb.cc
@@ -10,16 +10,14 @@
 
 #include "libyuv/convert_argb.h"
 
-#include <string.h>  // for memset()
-
 #include "libyuv/cpu_id.h"
 #include "libyuv/format_conversion.h"
 #ifdef HAVE_JPEG
 #include "libyuv/mjpeg_decoder.h"
 #endif
 #include "libyuv/rotate_argb.h"
-#include "libyuv/video_common.h"
 #include "libyuv/row.h"
+#include "libyuv/video_common.h"
 
 #ifdef __cplusplus
 namespace libyuv {
diff --git a/source/mjpeg_decoder.cc b/source/mjpeg_decoder.cc
index 7a4c9329c..1a08e3bfe 100644
--- a/source/mjpeg_decoder.cc
+++ b/source/mjpeg_decoder.cc
@@ -9,24 +9,18 @@
  */
 
 #include "libyuv/mjpeg_decoder.h"
-#include "libyuv/planar_functions.h"  // For CopyPlane().
 
 #ifdef HAVE_JPEG
-// Must be included before jpeglib
 #include <assert.h>
 #ifndef __CLR_VER
+// Must be included before jpeglib.
 #include <setjmp.h>
 #define HAVE_SETJMP
 #endif
-#include <stdio.h>
-#include <stdlib.h>
-
-extern "C" {
+struct FILE;  // For jpeglib.h.
 #include <jpeglib.h>
-}
 
-#include <climits>
-#include <cstring>
+#include "libyuv/planar_functions.h"  // For CopyPlane().
 
 namespace libyuv {
 
diff --git a/source/row_common.cc b/source/row_common.cc
index 614e7ea25..e603a8256 100644
--- a/source/row_common.cc
+++ b/source/row_common.cc
@@ -10,7 +10,7 @@
 
 #include "libyuv/row.h"
 
-#include <string.h>  // For memcpy
+#include <string.h>  // For memcpy and memset.
 
 #include "libyuv/basic_types.h"