diff --git a/README.chromium b/README.chromium
index 18964feae..4ecdcb284 100644
--- a/README.chromium
+++ b/README.chromium
@@ -1,6 +1,6 @@
 Name: libyuv
 URL: http://code.google.com/p/libyuv/
-Version: 1713
+Version: 1714
 License: BSD
 License File: LICENSE
 
diff --git a/include/libyuv/basic_types.h b/include/libyuv/basic_types.h
index 01d9dfc77..1bea67f2f 100644
--- a/include/libyuv/basic_types.h
+++ b/include/libyuv/basic_types.h
@@ -29,6 +29,8 @@ typedef signed char int8_t;
 #else
 #include <stdint.h>  // for uintptr_t and C99 types
 #endif               // defined(_MSC_VER) && (_MSC_VER < 1600)
+// Types are deprecated.  Enable this macro for legacy types.
+#ifdef LIBYUV_LEGACY_TYPES
 typedef uint64_t uint64;
 typedef int64_t int64;
 typedef uint32_t uint32;
@@ -37,6 +39,7 @@ typedef uint16_t uint16;
 typedef int16_t int16;
 typedef uint8_t uint8;
 typedef int8_t int8;
+#endif  // LIBYUV_LEGACY_TYPES
 #endif  // INT_TYPES_DEFINED
 
 #if !defined(LIBYUV_API)
diff --git a/include/libyuv/version.h b/include/libyuv/version.h
index e793127f2..249f61f71 100644
--- a/include/libyuv/version.h
+++ b/include/libyuv/version.h
@@ -11,6 +11,6 @@
 #ifndef INCLUDE_LIBYUV_VERSION_H_
 #define INCLUDE_LIBYUV_VERSION_H_
 
-#define LIBYUV_VERSION 1713
+#define LIBYUV_VERSION 1714
 
 #endif  // INCLUDE_LIBYUV_VERSION_H_
diff --git a/unit_test/scale_argb_test.cc b/unit_test/scale_argb_test.cc
index a1be85b8d..6a0a58640 100644
--- a/unit_test/scale_argb_test.cc
+++ b/unit_test/scale_argb_test.cc
@@ -319,12 +319,12 @@ int YUVToARGBScaleReference2(const uint8_t* src_y,
                              int src_stride_u,
                              const uint8_t* src_v,
                              int src_stride_v,
-                             uint32 /* src_fourcc */,
+                             uint32_t /* src_fourcc */,
                              int src_width,
                              int src_height,
                              uint8_t* dst_argb,
                              int dst_stride_argb,
-                             uint32 /* dst_fourcc */,
+                             uint32_t /* dst_fourcc */,
                              int dst_width,
                              int dst_height,
                              int clip_x,