diff --git a/include/cef_render_handler.h b/include/cef_render_handler.h
index 636d72ea0..1b84f2f9a 100644
--- a/include/cef_render_handler.h
+++ b/include/cef_render_handler.h
@@ -38,10 +38,11 @@
 #define CEF_INCLUDE_CEF_RENDER_HANDLER_H_
 #pragma once
 
+#include <vector>
+
 #include "include/cef_base.h"
 #include "include/cef_browser.h"
 #include "include/cef_drag_data.h"
-#include <vector>
 
 ///
 // Implement this interface to handle events when window rendering is disabled.
diff --git a/include/cef_request_handler.h b/include/cef_request_handler.h
index fa83a1a36..69334397a 100644
--- a/include/cef_request_handler.h
+++ b/include/cef_request_handler.h
@@ -38,6 +38,8 @@
 #define CEF_INCLUDE_CEF_REQUEST_HANDLER_H_
 #pragma once
 
+#include <vector>
+
 #include "include/cef_auth_callback.h"
 #include "include/cef_base.h"
 #include "include/cef_browser.h"
@@ -96,6 +98,7 @@ class CefRequestHandler : public virtual CefBase {
   typedef cef_termination_status_t TerminationStatus;
   typedef cef_urlrequest_status_t URLRequestStatus;
   typedef cef_window_open_disposition_t WindowOpenDisposition;
+  typedef std::vector<CefRefPtr<CefX509Certificate> > X509CertificateList;
 
   ///
   // Called on the UI thread before browser navigation. Return true to cancel
@@ -315,7 +318,7 @@ class CefRequestHandler : public virtual CefBase {
       bool isProxy,
       const CefString& host,
       int port,
-      const CefX509CertificateList& certificates,
+      const X509CertificateList& certificates,
       CefRefPtr<CefSelectClientCertificateCallback> callback) {
     return false;
   }
diff --git a/include/cef_x509_certificate.h b/include/cef_x509_certificate.h
index b81839f29..f036ab5ed 100644
--- a/include/cef_x509_certificate.h
+++ b/include/cef_x509_certificate.h
@@ -185,6 +185,4 @@ class CefX509Certificate : public virtual CefBase {
   virtual void GetPEMEncodedIssuerChain(IssuerChainBinaryList& chain) =0;
 };
 
-typedef std::vector<CefRefPtr<CefX509Certificate> > CefX509CertificateList;
-
 #endif  // CEF_INCLUDE_CEF_X509_CERTIFICATE_H_
diff --git a/libcef/browser/content_browser_client.cc b/libcef/browser/content_browser_client.cc
index c521813b3..1e729fe82 100644
--- a/libcef/browser/content_browser_client.cc
+++ b/libcef/browser/content_browser_client.cc
@@ -780,7 +780,7 @@ void CefContentBrowserClient::SelectClientCertificate(
     return;
   }
 
-  CefX509CertificateList certs;
+  CefRequestHandler::X509CertificateList certs;
   for (std::vector<scoped_refptr<net::X509Certificate> >::iterator iter =
            cert_request_info->client_certs.begin();
          iter != cert_request_info->client_certs.end(); iter++) {
diff --git a/libcef_dll/ctocpp/request_handler_ctocpp.cc b/libcef_dll/ctocpp/request_handler_ctocpp.cc
index 805daa0fd..9ebac931c 100644
--- a/libcef_dll/ctocpp/request_handler_ctocpp.cc
+++ b/libcef_dll/ctocpp/request_handler_ctocpp.cc
@@ -455,7 +455,7 @@ bool CefRequestHandlerCToCpp::OnCertificateError(CefRefPtr<CefBrowser> browser,
 
 bool CefRequestHandlerCToCpp::OnSelectClientCertificate(
     CefRefPtr<CefBrowser> browser, bool isProxy, const CefString& host,
-    int port, const CefX509CertificateList& certificates,
+    int port, const X509CertificateList& certificates,
     CefRefPtr<CefSelectClientCertificateCallback> callback) {
   cef_request_handler_t* _struct = GetStruct();
   if (CEF_MEMBER_MISSING(_struct, on_select_client_certificate))
diff --git a/libcef_dll/ctocpp/request_handler_ctocpp.h b/libcef_dll/ctocpp/request_handler_ctocpp.h
index 326296475..6052082a6 100644
--- a/libcef_dll/ctocpp/request_handler_ctocpp.h
+++ b/libcef_dll/ctocpp/request_handler_ctocpp.h
@@ -70,8 +70,7 @@ class CefRequestHandlerCToCpp
       CefRefPtr<CefSSLInfo> ssl_info,
       CefRefPtr<CefRequestCallback> callback) override;
   bool OnSelectClientCertificate(CefRefPtr<CefBrowser> browser, bool isProxy,
-      const CefString& host, int port,
-      const CefX509CertificateList& certificates,
+      const CefString& host, int port, const X509CertificateList& certificates,
       CefRefPtr<CefSelectClientCertificateCallback> callback) override;
   void OnPluginCrashed(CefRefPtr<CefBrowser> browser,
       const CefString& plugin_path) override;
diff --git a/tests/cefclient/browser/client_handler.cc b/tests/cefclient/browser/client_handler.cc
index 75ccb8d53..d9b196b7c 100644
--- a/tests/cefclient/browser/client_handler.cc
+++ b/tests/cefclient/browser/client_handler.cc
@@ -705,7 +705,7 @@ bool ClientHandler::OnSelectClientCertificate(
     bool isProxy,
     const CefString& host,
     int port,
-    const CefX509CertificateList& certificates,
+    const X509CertificateList& certificates,
     CefRefPtr<CefSelectClientCertificateCallback> callback) {
   CEF_REQUIRE_UI_THREAD();
 
diff --git a/tests/cefclient/browser/client_handler.h b/tests/cefclient/browser/client_handler.h
index 0b013b8e9..a5b2e6ea3 100644
--- a/tests/cefclient/browser/client_handler.h
+++ b/tests/cefclient/browser/client_handler.h
@@ -257,7 +257,7 @@ class ClientHandler : public CefClient,
       bool isProxy,
       const CefString& host,
       int port,
-      const CefX509CertificateList& certificates,
+      const X509CertificateList& certificates,
       CefRefPtr<CefSelectClientCertificateCallback> callback) OVERRIDE;
   void OnRenderProcessTerminated(CefRefPtr<CefBrowser> browser,
                                  TerminationStatus status) OVERRIDE;