diff --git a/README.chromium b/README.chromium
index d7b7ed19b..d69f8ad3b 100644
--- a/README.chromium
+++ b/README.chromium
@@ -1,6 +1,6 @@
 Name: libyuv
 URL: http://code.google.com/p/libyuv/
-Version: 495
+Version: 496
 License: BSD
 License File: LICENSE
 
diff --git a/include/libyuv/basic_types.h b/include/libyuv/basic_types.h
index 2ebc333cd..19a24ef8f 100644
--- a/include/libyuv/basic_types.h
+++ b/include/libyuv/basic_types.h
@@ -13,13 +13,11 @@
 
 #include <stddef.h>  // for NULL, size_t
 
-#if !(defined(_MSC_VER) && (_MSC_VER < 1600))
-#if defined(__ANDROID__)
+#if defined(__ANDROID__) || (defined(_MSC_VER) && (_MSC_VER < 1600))
 #include <sys/types.h>  // for uintptr_t on x86
 #else
 #include <stdint.h>  // for uintptr_t
 #endif
-#endif
 
 #ifndef INT_TYPES_DEFINED
 #define INT_TYPES_DEFINED
diff --git a/include/libyuv/version.h b/include/libyuv/version.h
index b82ed3ae0..37d92933c 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 495
+#define LIBYUV_VERSION 496
 
 #endif  // INCLUDE_LIBYUV_VERSION_H_  NOLINT
diff --git a/source/convert_from_argb.cc b/source/convert_from_argb.cc
index ed1d1eee8..a9a287f47 100644
--- a/source/convert_from_argb.cc
+++ b/source/convert_from_argb.cc
@@ -873,4 +873,3 @@ int ARGBToARGB4444(const uint8* src_argb, int src_stride_argb,
 }  // extern "C"
 }  // namespace libyuv
 #endif
-
diff --git a/source/scale_argb_neon.cc b/source/scale_argb_neon.cc
index edb2df3cf..24893ad25 100644
--- a/source/scale_argb_neon.cc
+++ b/source/scale_argb_neon.cc
@@ -136,11 +136,9 @@ void ScaleARGBRowDownEvenInt_NEON(const uint8* src_argb, ptrdiff_t src_stride,
   : "memory", "cc", "r12", "q0", "q1", "q2", "q3"
   );
 }
-
 #endif  // __ARM_NEON__
 
 #ifdef __cplusplus
 }  // extern "C"
 }  // namespace libyuv
 #endif
-
diff --git a/source/scale_neon.cc b/source/scale_neon.cc
index 961e362fc..d7bf26654 100644
--- a/source/scale_neon.cc
+++ b/source/scale_neon.cc
@@ -552,11 +552,9 @@ void ScaleFilterRows_NEON(uint8* dst_ptr,
   : "q0", "q1", "d4", "d5", "q13", "q14", "memory", "cc"
   );
 }
-
 #endif  // __ARM_NEON__
 
 #ifdef __cplusplus
 }  // extern "C"
 }  // namespace libyuv
 #endif
-