diff --git a/README.chromium b/README.chromium
index 251f8676f..dca8ccf34 100644
--- a/README.chromium
+++ b/README.chromium
@@ -1,6 +1,6 @@
 Name: libyuv
 URL: http://code.google.com/p/libyuv/
-Version: 1602
+Version: 1603
 License: BSD
 License File: LICENSE
 
diff --git a/include/libyuv/row.h b/include/libyuv/row.h
index 055880ba5..ba2bf7c54 100644
--- a/include/libyuv/row.h
+++ b/include/libyuv/row.h
@@ -441,13 +441,13 @@ struct YuvConstants {
 #else
 // This struct is for Intel color conversion.
 struct YuvConstants {
-  lvec8 kUVToB;
-  lvec8 kUVToG;
-  lvec8 kUVToR;
-  lvec16 kUVBiasB;
-  lvec16 kUVBiasG;
-  lvec16 kUVBiasR;
-  lvec16 kYToRgb;
+  int8 kUVToB[32];
+  int8 kUVToG[32];
+  int8 kUVToR[32];
+  int16 kUVBiasB[16];
+  int16 kUVBiasG[16];
+  int16 kUVBiasR[16];
+  int16 kYToRgb[16];
 };
 
 // Offsets into YuvConstants structure
diff --git a/include/libyuv/version.h b/include/libyuv/version.h
index ca0c062eb..5f8ca2ad6 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 1602
+#define LIBYUV_VERSION 1603
 
 #endif  // INCLUDE_LIBYUV_VERSION_H_  NOLINT
diff --git a/linux.mk b/linux.mk
index ee5a3a707..60d516696 100644
--- a/linux.mk
+++ b/linux.mk
@@ -75,7 +75,7 @@ psnr: util/psnr.cc
 
 # A C test utility that uses libyuv conversion from C.
 cpuid: util/cpuid.c libyuv.a
-	$(CC) $(CFLAGS) -o $@ util/cpuid.c libyuv.a
+	$(CC) $(CFLAGS) -o $@ util/cpuid.c libyuv.a -lc++
 
 clean:
 	/bin/rm -f source/*.o *.ii *.s libyuv.a convert cpuid psnr