diff --git a/README.chromium b/README.chromium
index 26f000d91..1e274d916 100644
--- a/README.chromium
+++ b/README.chromium
@@ -1,6 +1,6 @@
 Name: libyuv
 URL: http://code.google.com/p/libyuv/
-Version: 928
+Version: 929
 License: BSD
 License File: LICENSE
 
diff --git a/include/libyuv/row.h b/include/libyuv/row.h
index 1c9ac7c78..fdb459f29 100644
--- a/include/libyuv/row.h
+++ b/include/libyuv/row.h
@@ -11,10 +11,10 @@
 #ifndef INCLUDE_LIBYUV_ROW_H_  // NOLINT
 #define INCLUDE_LIBYUV_ROW_H_
 
-#include "libyuv/basic_types.h"
-
 #include <stdlib.h>  // For malloc.
 
+#include "libyuv/basic_types.h"
+
 #ifdef __cplusplus
 namespace libyuv {
 extern "C" {
@@ -22,7 +22,7 @@ extern "C" {
 
 #define IS_ALIGNED(p, a) (!((uintptr_t)(p) & ((a) - 1)))
 
-// TODO (fbarchard): Port to C.
+// TODO(fbarchard): Port to C.
 #define align_buffer_64(var, size)                                             \
   uint8* var;                                                                  \
   uint8* var##_mem;                                                            \
@@ -44,7 +44,7 @@ extern "C" {
 #endif
 
 // Enable for NaCL pepper 33 for bundle and AVX2 support.
-//#define NEW_BINUTILS
+//  #define NEW_BINUTILS
 
 // The following are available on all x86 platforms:
 #if !defined(LIBYUV_DISABLE_X86) && \
diff --git a/include/libyuv/version.h b/include/libyuv/version.h
index 4a334b237..0f779f765 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 928
+#define LIBYUV_VERSION 929
 
 #endif  // INCLUDE_LIBYUV_VERSION_H_  NOLINT
diff --git a/source/rotate_argb.cc b/source/rotate_argb.cc
index 0088fc7ff..e4cf6081e 100644
--- a/source/rotate_argb.cc
+++ b/source/rotate_argb.cc
@@ -89,7 +89,6 @@ void ARGBRotate270(const uint8* src, int src_stride,
   ARGBTranspose(src, src_stride, dst, dst_stride, width, height);
 }
 
-SAFEBUFFERS
 void ARGBRotate180(const uint8* src, int src_stride,
                    uint8* dst, int dst_stride,
                    int width, int height) {
diff --git a/source/scale.cc b/source/scale.cc
index 9fcd5cc43..5bc6c9b7c 100644
--- a/source/scale.cc
+++ b/source/scale.cc
@@ -375,7 +375,6 @@ static void ScaleAddCols1_C(int dst_width, int boxheight, int x, int dx,
 // one pixel of destination using fixed point (16.16) to step
 // through source, sampling a box of pixel with simple
 // averaging.
-SAFEBUFFERS
 static void ScalePlaneBox(int src_width, int src_height,
                           int dst_width, int dst_height,
                           int src_stride, int dst_stride,
@@ -445,7 +444,6 @@ static void ScalePlaneBox(int src_width, int src_height,
 }
 
 // Scale plane down with bilinear interpolation.
-SAFEBUFFERS
 void ScalePlaneBilinearDown(int src_width, int src_height,
                             int dst_width, int dst_height,
                             int src_stride, int dst_stride,
@@ -545,7 +543,6 @@ void ScalePlaneBilinearDown(int src_width, int src_height,
 }
 
 // Scale up down with bilinear interpolation.
-SAFEBUFFERS
 void ScalePlaneBilinearUp(int src_width, int src_height,
                           int dst_width, int dst_height,
                           int src_stride, int dst_stride,
@@ -789,7 +786,7 @@ void ScalePlane(const uint8* src, int src_stride,
       return;
     }
   }
-  if (filtering == kFilterBox && dst_height * 2 < src_height  ) {
+  if (filtering == kFilterBox && dst_height * 2 < src_height) {
     ScalePlaneBox(src_width, src_height, dst_width, dst_height,
                   src_stride, dst_stride, src, dst);
     return;
diff --git a/source/scale_argb.cc b/source/scale_argb.cc
index 976418c37..769c4a73f 100644
--- a/source/scale_argb.cc
+++ b/source/scale_argb.cc
@@ -162,7 +162,6 @@ static void ScaleARGBDownEven(int src_width, int src_height,
 }
 
 // Scale ARGB down with bilinear interpolation.
-SAFEBUFFERS
 static void ScaleARGBBilinearDown(int src_height,
                                   int dst_width, int dst_height,
                                   int src_stride, int dst_stride,
@@ -262,7 +261,6 @@ static void ScaleARGBBilinearDown(int src_height,
 }
 
 // Scale ARGB up with bilinear interpolation.
-SAFEBUFFERS
 static void ScaleARGBBilinearUp(int src_width, int src_height,
                                 int dst_width, int dst_height,
                                 int src_stride, int dst_stride,
@@ -396,7 +394,6 @@ static void ScaleARGBBilinearUp(int src_width, int src_height,
 
 #ifdef YUVSCALEUP
 // Scale YUV to ARGB up with bilinear interpolation.
-SAFEBUFFERS
 static void ScaleYUVToARGBBilinearUp(int src_width, int src_height,
                                      int dst_width, int dst_height,
                                      int src_stride_y,