diff --git a/chrome_browser_proxy_resolver.cc b/chrome_browser_proxy_resolver.cc
index 307f276..7e00051 100644
--- a/chrome_browser_proxy_resolver.cc
+++ b/chrome_browser_proxy_resolver.cc
@@ -7,8 +7,8 @@
 #include <map>
 #include <string>
 
-#include <base/string_tokenizer.h>
 #include <base/string_util.h>
+#include <base/strings/string_tokenizer.h>
 #include <dbus/dbus-glib.h>
 #include <dbus/dbus-glib-lowlevel.h>
 #include <google/protobuf/stubs/common.h>
@@ -18,6 +18,7 @@
 
 namespace chromeos_update_engine {
 
+using base::StringTokenizer;
 using google::protobuf::Closure;
 using google::protobuf::NewCallback;
 using std::deque;
diff --git a/chrome_proxy_resolver.cc b/chrome_proxy_resolver.cc
index 25af4f6..2c1c1ca 100644
--- a/chrome_proxy_resolver.cc
+++ b/chrome_proxy_resolver.cc
@@ -111,10 +111,7 @@
     std::deque<std::string>* out_proxies) {
   base::JSONReader parser;
 
-  scoped_ptr<Value> root(
-      parser.JsonToValue(json_settings,
-                         true,  // check root is obj/arr
-                         false));  // false = disallow trailing comma
+  scoped_ptr<Value> root(parser.ReadToValue(json_settings));
   if (!root.get()) {
     LOG(ERROR) << "Unable to parse \"" << json_settings << "\": "
                << parser.GetErrorMessage();
diff --git a/file_descriptor.cc b/file_descriptor.cc
index a064925..255307d 100644
--- a/file_descriptor.cc
+++ b/file_descriptor.cc
@@ -8,7 +8,7 @@
 #include <sys/stat.h>
 #include <sys/types.h>
 
-#include <base/eintr_wrapper.h>
+#include <base/posix/eintr_wrapper.h>
 
 namespace chromeos_update_engine {
 
diff --git a/filesystem_copier_action_unittest.cc b/filesystem_copier_action_unittest.cc
index f7bb618..bf44c4f 100644
--- a/filesystem_copier_action_unittest.cc
+++ b/filesystem_copier_action_unittest.cc
@@ -8,7 +8,7 @@
 #include <string>
 #include <vector>
 
-#include <base/eintr_wrapper.h>
+#include <base/posix/eintr_wrapper.h>
 #include <base/string_util.h>
 #include <base/stringprintf.h>
 #include <glib.h>
diff --git a/omaha_hash_calculator.cc b/omaha_hash_calculator.cc
index 245706d..2159d28 100644
--- a/omaha_hash_calculator.cc
+++ b/omaha_hash_calculator.cc
@@ -6,8 +6,8 @@
 
 #include <fcntl.h>
 
-#include <base/eintr_wrapper.h>
 #include <base/logging.h>
+#include <base/posix/eintr_wrapper.h>
 #include <openssl/bio.h>
 #include <openssl/buffer.h>
 #include <openssl/evp.h>
diff --git a/utils.cc b/utils.cc
index fee3439..2276ac4 100644
--- a/utils.cc
+++ b/utils.cc
@@ -19,10 +19,10 @@
 
 #include <algorithm>
 
-#include <base/eintr_wrapper.h>
 #include <base/file_path.h>
 #include <base/file_util.h>
 #include <base/logging.h>
+#include <base/posix/eintr_wrapper.h>
 #include <base/rand_util.h>
 #include <base/string_number_conversions.h>
 #include <base/string_util.h>
diff --git a/utils.h b/utils.h
index 6c17853..569556c 100644
--- a/utils.h
+++ b/utils.h
@@ -12,7 +12,7 @@
 #include <unistd.h>
 #include <vector>
 
-#include <base/eintr_wrapper.h>
+#include <base/posix/eintr_wrapper.h>
 #include <base/time.h>
 #include <ext2fs/ext2fs.h>
 #include <glib.h>