diff --git a/README.chromium b/README.chromium
index a1f021c4f..05683b863 100644
--- a/README.chromium
+++ b/README.chromium
@@ -1,6 +1,6 @@
 Name: libyuv
 URL: http://code.google.com/p/libyuv/
-Version: 380
+Version: 381
 License: BSD
 License File: LICENSE
 
diff --git a/include/libyuv/basic_types.h b/include/libyuv/basic_types.h
index 73c82c8ce..5b9a6172b 100644
--- a/include/libyuv/basic_types.h
+++ b/include/libyuv/basic_types.h
@@ -70,9 +70,11 @@ typedef signed char int8;
 #define CPU_ARM 1
 #endif
 
+#ifndef ALIGNP
 #define ALIGNP(p, t) \
     (reinterpret_cast<uint8*>(((reinterpret_cast<uintptr_t>(p) + \
     ((t) - 1)) & ~((t) - 1))))
+#endif
 
 #if !defined(LIBYUV_API)
 #if defined(_WIN32) || defined(__CYGWIN__)
diff --git a/include/libyuv/version.h b/include/libyuv/version.h
index f72313dfc..b5e537e19 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 380
+#define LIBYUV_VERSION 381
 
 #endif  // INCLUDE_LIBYUV_VERSION_H_  NOLINT