diff --git a/README.chromium b/README.chromium
index d1a20c479..12a3d18cc 100644
--- a/README.chromium
+++ b/README.chromium
@@ -1,6 +1,6 @@
 Name: libyuv
 URL: http://code.google.com/p/libyuv/
-Version: 1588
+Version: 1589
 License: BSD
 License File: LICENSE
 
diff --git a/include/libyuv/convert.h b/include/libyuv/convert.h
index a8d3fa07a..a2cdc5718 100644
--- a/include/libyuv/convert.h
+++ b/include/libyuv/convert.h
@@ -12,10 +12,8 @@
 #define INCLUDE_LIBYUV_CONVERT_H_
 
 #include "libyuv/basic_types.h"
-// TODO(fbarchard): Remove the following headers includes.
-#include "libyuv/convert_from.h"
-#include "libyuv/planar_functions.h"
-#include "libyuv/rotate.h"
+
+#include "libyuv/rotate.h"  // For enum RotationMode.
 
 #ifdef __cplusplus
 namespace libyuv {
diff --git a/include/libyuv/convert_argb.h b/include/libyuv/convert_argb.h
index ce4e3d075..079d273b1 100644
--- a/include/libyuv/convert_argb.h
+++ b/include/libyuv/convert_argb.h
@@ -12,10 +12,8 @@
 #define INCLUDE_LIBYUV_CONVERT_ARGB_H_
 
 #include "libyuv/basic_types.h"
-// TODO(fbarchard): Remove the following headers includes
-#include "libyuv/convert_from.h"
-#include "libyuv/planar_functions.h"
-#include "libyuv/rotate.h"
+
+#include "libyuv/rotate.h"  // For enum RotationMode.
 
 // TODO(fbarchard): This set of functions should exactly match convert.h
 // TODO(fbarchard): Add tests. Create random content of right size and convert
diff --git a/include/libyuv/convert_from.h b/include/libyuv/convert_from.h
index 9fd8d4de5..39e1578a0 100644
--- a/include/libyuv/convert_from.h
+++ b/include/libyuv/convert_from.h
@@ -56,8 +56,6 @@ int I400Copy(const uint8* src_y, int src_stride_y,
              uint8* dst_y, int dst_stride_y,
              int width, int height);
 
-// TODO(fbarchard): I420ToM420
-
 LIBYUV_API
 int I420ToNV12(const uint8* src_y, int src_stride_y,
                const uint8* src_u, int src_stride_u,
diff --git a/include/libyuv/version.h b/include/libyuv/version.h
index def79dd70..0162956c6 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 1588
+#define LIBYUV_VERSION 1589
 
 #endif  // INCLUDE_LIBYUV_VERSION_H_  NOLINT
diff --git a/source/convert_argb.cc b/source/convert_argb.cc
index e586f7043..fb9582d62 100644
--- a/source/convert_argb.cc
+++ b/source/convert_argb.cc
@@ -14,6 +14,7 @@
 #ifdef HAVE_JPEG
 #include "libyuv/mjpeg_decoder.h"
 #endif
+#include "libyuv/planar_functions.h"  // For CopyPlane and ARGBShuffle.
 #include "libyuv/rotate_argb.h"
 #include "libyuv/row.h"
 #include "libyuv/video_common.h"
diff --git a/source/convert_jpeg.cc b/source/convert_jpeg.cc
index bcb980f7f..90f550a26 100644
--- a/source/convert_jpeg.cc
+++ b/source/convert_jpeg.cc
@@ -9,6 +9,7 @@
  */
 
 #include "libyuv/convert.h"
+#include "libyuv/convert_argb.h"
 
 #ifdef HAVE_JPEG
 #include "libyuv/mjpeg_decoder.h"
diff --git a/unit_test/scale_argb_test.cc b/unit_test/scale_argb_test.cc
index 747f54ebd..d470ff1de 100644
--- a/unit_test/scale_argb_test.cc
+++ b/unit_test/scale_argb_test.cc
@@ -11,9 +11,9 @@
 #include <stdlib.h>
 #include <time.h>
 
-#include "libyuv/convert.h"
+#include "libyuv/convert_argb.h"
 #include "libyuv/cpu_id.h"
-#include "libyuv/row.h"
+#include "libyuv/row.h"   // For align_buffer_64
 #include "libyuv/scale_argb.h"
 #include "libyuv/video_common.h"
 #include "../unit_test/unit_test.h"