diff --git a/cef1/cef.gyp b/cef1/cef.gyp
index 24f680191..8e544702f 100644
--- a/cef1/cef.gyp
+++ b/cef1/cef.gyp
@@ -14,7 +14,7 @@
         '<!(python ../chrome/tools/build/version.py -f ../chrome/VERSION -t "1<(revision).@BUILD_HI@.@BUILD_LO@" -e "BUILD_HI=int(BUILD)/256" -e "BUILD_LO=int(BUILD)%256")',
   },
   'conditions': [
-    [ 'os_posix==1 and OS!="mac" and OS!="android" and gcc_version==46', {
+    [ 'os_posix==1 and OS!="mac" and OS!="android" and gcc_version>=46', {
       'target_defaults': {
         # Disable warnings about c++0x compatibility, as some names (such
         # as nullptr) conflict with upcoming c++0x types.
diff --git a/cef1/include/internal/cef_types_wrappers.h b/cef1/include/internal/cef_types_wrappers.h
index f136e3a75..32b7d347c 100644
--- a/cef1/include/internal/cef_types_wrappers.h
+++ b/cef1/include/internal/cef_types_wrappers.h
@@ -507,8 +507,8 @@ class CefTime : public CefStructBase<CefTimeTraits> {
   }
 
   // Return the delta between this object and |other| in milliseconds.
-  int64 Delta(const CefTime& other) {
-    int64 delta = 0;
+  long long Delta(const CefTime& other) {
+    long long delta = 0;
     cef_time_delta(this, &other, &delta);
     return delta;
   }
diff --git a/cef3/cef.gyp b/cef3/cef.gyp
index 301b8150c..5b6adc8be 100644
--- a/cef3/cef.gyp
+++ b/cef3/cef.gyp
@@ -999,7 +999,7 @@
     },
   ],
   'conditions': [
-    ['os_posix==1 and OS!="mac" and OS!="android" and gcc_version==46', {
+    ['os_posix==1 and OS!="mac" and OS!="android" and gcc_version>=46', {
       'target_defaults': {
         # Disable warnings about c++0x compatibility, as some names (such
         # as nullptr) conflict with upcoming c++0x types.
diff --git a/cef3/include/cef_trace_event.h b/cef3/include/cef_trace_event.h
index b93a2cf9a..e46b4f189 100644
--- a/cef3/include/cef_trace_event.h
+++ b/cef3/include/cef_trace_event.h
@@ -184,7 +184,7 @@ CEF_EXPORT void cef_trace_event_end(const char* category,
                                     const char* arg2_name,
                                     uint64 arg2_val,
                                     int copy);
-CEF_EXPORT void cef_trace_event_if_longer_than(long long threshold_us,
+CEF_EXPORT void cef_trace_event_if_longer_than(int64 threshold_us,
                                                const char* category,
                                                const char* name,
                                                const char* arg1_name,
diff --git a/cef3/include/internal/cef_types_wrappers.h b/cef3/include/internal/cef_types_wrappers.h
index b2c0001b1..59bf77173 100644
--- a/cef3/include/internal/cef_types_wrappers.h
+++ b/cef3/include/internal/cef_types_wrappers.h
@@ -503,8 +503,8 @@ class CefTime : public CefStructBase<CefTimeTraits> {
   }
 
   // Return the delta between this object and |other| in milliseconds.
-  int64 Delta(const CefTime& other) {
-    int64 delta = 0;
+  long long Delta(const CefTime& other) {
+    long long delta = 0;
     cef_time_delta(this, &other, &delta);
     return delta;
   }
diff --git a/cef3/tests/unittests/urlrequest_unittest.cc b/cef3/tests/unittests/urlrequest_unittest.cc
index 2ab793519..7f0fe6e45 100644
--- a/cef3/tests/unittests/urlrequest_unittest.cc
+++ b/cef3/tests/unittests/urlrequest_unittest.cc
@@ -842,6 +842,9 @@ class RequestRendererTest : public ClientApp::RenderDelegate,
 class RequestTestHandler : public TestHandler,
                            public RequestTestRunner::Delegate {
  public:
+  // Don't hide the DestroyTest method.
+  using TestHandler::DestroyTest;
+
   RequestTestHandler(RequestTestMode test_mode,
                      bool test_in_browser,
                      const char* test_url)
diff --git a/cef3/tests/unittests/v8_unittest.cc b/cef3/tests/unittests/v8_unittest.cc
index 67977db58..b30ea57fa 100644
--- a/cef3/tests/unittests/v8_unittest.cc
+++ b/cef3/tests/unittests/v8_unittest.cc
@@ -1955,8 +1955,9 @@ class V8TestHandler : public TestHandler {
                          int httpStatusCode) OVERRIDE {
     if (test_mode_ == V8TEST_ON_UNCAUGHT_EXCEPTION_DEV_TOOLS) {
       if (browser->IsPopup()) {
-        EXPECT_STREQ(GetBrowser()->GetHost()->GetDevToolsURL(true).c_str(),
-                     frame->GetURL().c_str());
+        EXPECT_STREQ(
+            GetBrowser()->GetHost()->GetDevToolsURL(true).ToString().c_str(),
+            frame->GetURL().ToString().c_str());
         CefRefPtr<CefProcessMessage> return_msg =
             CefProcessMessage::Create(kV8DevToolsLoadHookMsg);
         EXPECT_TRUE(browser->SendProcessMessage(PID_RENDERER, return_msg));