diff --git a/base/logging.h b/base/logging.h
index 2084739..d865744 100644
--- base/logging.h
+++ base/logging.h
@@ -102,6 +102,18 @@
 // There is also the special severity of DFATAL, which logs FATAL in
 // debug mode, ERROR in normal mode.

+// XXX better comment -- must be before we use << and in global namespace
+// These functions are provided as a convenience for logging, which is where we
+// use streams (it is against Google style to use streams in other places). It
+// is designed to allow you to emit non-ASCII Unicode strings to the log file,
+// which is normally ASCII. It is relatively slow, so try not to use it for
+// common cases. Non-ASCII characters will be converted to UTF-8 by these
+// operators.
+std::ostream& operator<<(std::ostream& out, const wchar_t* wstr);
+inline std::ostream& operator<<(std::ostream& out, const std::wstring& wstr) {
+  return out << wstr.c_str();
+}
+
 namespace logging {

 // Where to record logging output? A flat file and/or system debug log via
@@ -842,17 +854,6 @@ void RawLog(int level, const char* message);

 }  // namespace logging

-// These functions are provided as a convenience for logging, which is where we
-// use streams (it is against Google style to use streams in other places). It
-// is designed to allow you to emit non-ASCII Unicode strings to the log file,
-// which is normally ASCII. It is relatively slow, so try not to use it for
-// common cases. Non-ASCII characters will be converted to UTF-8 by these
-// operators.
-std::ostream& operator<<(std::ostream& out, const wchar_t* wstr);
-inline std::ostream& operator<<(std::ostream& out, const std::wstring& wstr) {
-  return out << wstr.c_str();
-}
-
 // The NOTIMPLEMENTED() macro annotates codepaths which have
 // not been implemented yet.
 //
diff -ru chrome/plugin/plugin_main_linux.cc.orig chrome/plugin/plugin_main_linux.cc
--- chrome/plugin/plugin_main_linux.cc.orig	2010-10-23 17:25:49.000000000 -0700
+++ chrome/plugin/plugin_main_linux.cc	2010-10-23 13:57:10.000000000 -0700
@@ -5,7 +5,7 @@
 #include <signal.h>
 #include <string.h>
 #include <sys/types.h>
-#include <syscall.h>
+#include <sys/syscall.h>
 #include <unistd.h>
 
 #include "build/build_config.h"
--- net/base/ssl_config_service.h.orig	2010-09-21 08:01:26.000000000 +0000
+++ net/base/ssl_config_service.h	2010-11-13 07:22:48.000000000 +0000
@@ -121,10 +121,10 @@
   // True if we use False Start for SSL and TLS.
   static bool false_start_enabled();
 
- protected:
   // SetFlags sets the values of several flags based on global configuration.
   static void SetSSLConfigFlags(SSLConfig*);
 
+ protected:
   friend class base::RefCountedThreadSafe<SSLConfigService>;
 
   virtual ~SSLConfigService() {}
--- third_party/ffmpeg/patched-ffmpeg-mt/libavcodec/x86/dsputil_mmx.c.orig	2010-09-21 08:06:29.000000000 +0000
+++ third_party/ffmpeg/patched-ffmpeg-mt/libavcodec/x86/dsputil_mmx.c	2010-11-13 07:22:15.000000000 +0000
@@ -615,7 +615,7 @@
     __asm__ volatile(
         "mov    %7, %3 \n"
         "1: \n"
-        "movzx (%3,%4), %2 \n"
+        "movzbl (%3,%4), %2 \n"
         "mov    %2, %k3 \n"
         "sub   %b1, %b3 \n"
         "add   %b0, %b3 \n"
Index: third_party/libjingle/source/talk/base/stringutils.h
===================================================================
--- third_party/libjingle/source/talk/base/stringutils.h        (revision 29)
+++ third_party/libjingle/source/talk/base/stringutils.h        (working copy)
@@ -37,7 +37,7 @@
 #define alloca _alloca
 #endif  // WIN32
 #ifdef POSIX
-#include <alloca.h>
+#include <stdlib.h>
 #endif  // POSIX

 #include <cstring>
diff -ru third_party/skia/include/core/SkPreConfig.h.orig third_party/skia/include/core/SkPreConfig.h
--- third_party/skia/include/core/SkPreConfig.h.orig	2010-08-18 01:03:49.000000000 -0700
+++ third_party/skia/include/core/SkPreConfig.h	2010-10-23 12:54:33.000000000 -0700
@@ -57,6 +57,8 @@
 #if !defined(SK_RESTRICT)
     #define SK_RESTRICT __restrict__
 #endif
+#undef SK_RESTRICT
+#define SK_RESTRICT
 
 //////////////////////////////////////////////////////////////////////
 
