diff --git a/README.chromium b/README.chromium
index 75c657200..8eab14b37 100644
--- a/README.chromium
+++ b/README.chromium
@@ -1,6 +1,6 @@
 Name: libyuv
 URL: http://code.google.com/p/libyuv/
-Version: 182
+Version: 183
 License: BSD
 License File: LICENSE
 
diff --git a/include/libyuv/version.h b/include/libyuv/version.h
index 31bd8bf82..f71c1d660 100644
--- a/include/libyuv/version.h
+++ b/include/libyuv/version.h
@@ -11,7 +11,7 @@
 #ifndef INCLUDE_LIBYUV_VERSION_H_
 #define INCLUDE_LIBYUV_VERSION_H_
 
-#define LIBYUV_VERSION 182
+#define LIBYUV_VERSION 183
 
 #endif  // INCLUDE_LIBYUV_VERSION_H_
 
diff --git a/libyuv.gyp b/libyuv.gyp
index f237d5a4c..f1ded26c2 100644
--- a/libyuv.gyp
+++ b/libyuv.gyp
@@ -11,9 +11,13 @@
     {
       'target_name': 'libyuv',
       'type': 'static_library',
+      'defines': [
+        #'HAVE_JPEG',
+      ],
       'include_dirs': [
         'include',
         '.',
+	#'third_party/libjpeg_turbo',
       ],
       'direct_dependent_settings': {
         'include_dirs': [
@@ -42,32 +46,16 @@
         'source/cpu_id.cc',
         'source/format_conversion.cc',
         'source/planar_functions.cc',
+        #'source/mjpeg_decoder.cc',
         'source/rotate.cc',
+        'source/rotate_neon.cc',
         'source/row_common.cc',
+        'source/row_posix.cc',
+        'source/row_neon.cc',
+        'source/row_win.cc',
         'source/scale.cc',
         'source/video_common.cc',
       ],
-      'conditions': [
-        ['OS=="win"', {
-         'sources': [
-           'source/row_win.cc',
-         ],
-        },{ # else
-         'sources': [
-            'source/row_posix.cc',
-          ],
-        }],
-        ['target_arch=="arm"',{
-          'conditions': [
-            ['arm_neon==1', {
-              'sources' : [
-                'source/rotate_neon.cc',
-                'source/row_neon.cc',
-              ],
-            }],
-          ],
-        }],
-      ]
     },
   ], # targets
 }
diff --git a/libyuv_test.gyp b/libyuv_test.gyp
index 52e11fdc1..24e7892bf 100644
--- a/libyuv_test.gyp
+++ b/libyuv_test.gyp
@@ -16,6 +16,7 @@
          # The tests are based on gtest
          'testing/gtest.gyp:gtest',
          'testing/gtest.gyp:gtest_main',
+         #'third_party/libjpeg_turbo/libjpeg.gyp:libjpeg',
       ],
       'sources': [
          # headers
diff --git a/source/convert.cc b/source/convert.cc
index 5851bdc96..79a954c51 100644
--- a/source/convert.cc
+++ b/source/convert.cc
@@ -647,6 +647,13 @@ int Q420ToI420(const uint8* src_y, int src_stride_y,
 // READSAFE_ALWAYS - enables read ahead on systems without memory exceptions
 //   or where buffers are padded by 64 bytes.
 
+#if defined(HAS_RGB24TOARGBROW_SSSE3) || \
+    defined(HAS_RGB24TOARGBROW_SSSE3) || \
+    defined(HAS_RAWTOARGBROW_SSSE3) || \
+    defined(HAS_RGB565TOARGBROW_SSE2) || \
+    defined(HAS_ARGB1555TOARGBROW_SSE2) || \
+    defined(HAS_ARGB4444TOARGBROW_SSE2)
+
 #define READSAFE_ODDHEIGHT
 
 static bool TestReadSafe(const uint8* src_yuy2, int src_stride_yuy2,
@@ -676,6 +683,7 @@ static bool TestReadSafe(const uint8* src_yuy2, int src_stride_yuy2,
   return false;
 #endif
 }
+#endif
 
 // Convert YUY2 to I420.
 int YUY2ToI420(const uint8* src_yuy2, int src_stride_yuy2,
diff --git a/source/mjpeg_decoder.cc b/source/mjpeg_decoder.cc
index 0ec8af500..fd6c45dc4 100644
--- a/source/mjpeg_decoder.cc
+++ b/source/mjpeg_decoder.cc
@@ -29,13 +29,7 @@ typedef signed int INT32;
 #endif
 
 extern "C" {
-// TODO(fbarchard): Port libjpeg_turbo to arm/neon
-#if defined(__arm__)
-// On ARM, require a system-installed libjpeg if JPEG support is enabled.
 #include <jpeglib.h>
-#else
-#include "third_party/libjpeg_turbo/src/jpeglib.h"
-#endif
 }
 
 namespace libyuv {
diff --git a/source/planar_functions.cc b/source/planar_functions.cc
index 2691db7ea..e4c0d9dfa 100644
--- a/source/planar_functions.cc
+++ b/source/planar_functions.cc
@@ -10,6 +10,8 @@
 
 #include "libyuv/planar_functions.h"
 
+#include <string.h> // for memset()
+
 #include "libyuv/cpu_id.h"
 #include "row.h"