diff --git a/include/cef_browser.h b/include/cef_browser.h
index 03e553be..540e4b9c 100644
--- a/include/cef_browser.h
+++ b/include/cef_browser.h
@@ -39,10 +39,10 @@
 #pragma once
 
 #include "include/cef_base.h"
+#include "include/cef_frame.h"
 #include <vector>
 
 class CefClient;
-class CefFrame;
 
 ///
 // Class used to represent a browser window. The methods of this class may be
diff --git a/include/cef_content_filter.h b/include/cef_content_filter.h
index 223ab426..af5cf175 100644
--- a/include/cef_content_filter.h
+++ b/include/cef_content_filter.h
@@ -39,8 +39,7 @@
 #pragma once
 
 #include "include/cef_base.h"
-
-class CefStreamReader;
+#include "include/cef_stream.h"
 
 ///
 // Interface to implement for filtering response content. The methods of this
diff --git a/include/cef_display_handler.h b/include/cef_display_handler.h
index f2d055b9..2c55445d 100644
--- a/include/cef_display_handler.h
+++ b/include/cef_display_handler.h
@@ -39,9 +39,8 @@
 #pragma once
 
 #include "include/cef_base.h"
-
-class CefBrowser;
-class CefFrame;
+#include "include/cef_browser.h"
+#include "include/cef_frame.h"
 
 ///
 // Implement this interface to handle events related to browser display state.
diff --git a/include/cef_drag_handler.h b/include/cef_drag_handler.h
index 078b9630..79d90e57 100644
--- a/include/cef_drag_handler.h
+++ b/include/cef_drag_handler.h
@@ -40,8 +40,7 @@
 
 #include "include/cef_base.h"
 #include "include/cef_drag_data.h"
-
-class CefBrowser;
+#include "include/cef_browser.h"
 
 ///
 // Implement this interface to handle events related to dragging. The methods of
diff --git a/include/cef_find_handler.h b/include/cef_find_handler.h
index a5d22e44..bead6fee 100644
--- a/include/cef_find_handler.h
+++ b/include/cef_find_handler.h
@@ -39,8 +39,7 @@
 #pragma once
 
 #include "include/cef_base.h"
-
-class CefBrowser;
+#include "include/cef_browser.h"
 
 ///
 // Implement this interface to handle events related to find results. The
diff --git a/include/cef_focus_handler.h b/include/cef_focus_handler.h
index 0b4df8cf..a45b6f52 100644
--- a/include/cef_focus_handler.h
+++ b/include/cef_focus_handler.h
@@ -39,10 +39,9 @@
 #pragma once
 
 #include "include/cef_base.h"
+#include "include/cef_browser.h"
 #include "include/cef_dom.h"
-
-class CefBrowser;
-class CefFrame;
+#include "include/cef_frame.h"
 
 ///
 // Implement this interface to handle events related to focus. The methods of
diff --git a/include/cef_frame.h b/include/cef_frame.h
index 4b3a7911..edc40e00 100644
--- a/include/cef_frame.h
+++ b/include/cef_frame.h
@@ -39,11 +39,11 @@
 #pragma once
 
 #include "include/cef_base.h"
+#include "include/cef_dom.h"
+#include "include/cef_request.h"
+#include "include/cef_stream.h"
 
 class CefBrowser;
-class CefDOMVisitor;
-class CefRequest;
-class CefStreamReader;
 class CefV8Context;
 
 ///
diff --git a/include/cef_jsdialog_handler.h b/include/cef_jsdialog_handler.h
index f0db01ee..b3426124 100644
--- a/include/cef_jsdialog_handler.h
+++ b/include/cef_jsdialog_handler.h
@@ -39,9 +39,8 @@
 #pragma once
 
 #include "include/cef_base.h"
-
-class CefBrowser;
-class CefFrame;
+#include "include/cef_browser.h"
+#include "include/cef_frame.h"
 
 ///
 // Implement this interface to handle events related to JavaScript dialogs. The
diff --git a/include/cef_keyboard_handler.h b/include/cef_keyboard_handler.h
index e61b383c..a8133e91 100644
--- a/include/cef_keyboard_handler.h
+++ b/include/cef_keyboard_handler.h
@@ -39,8 +39,7 @@
 #pragma once
 
 #include "include/cef_base.h"
-
-class CefBrowser;
+#include "include/cef_browser.h"
 
 ///
 // Implement this interface to handle events related to keyboard input. The
diff --git a/include/cef_life_span_handler.h b/include/cef_life_span_handler.h
index 62753d52..907d755a 100644
--- a/include/cef_life_span_handler.h
+++ b/include/cef_life_span_handler.h
@@ -39,8 +39,8 @@
 #pragma once
 
 #include "include/cef_base.h"
+#include "include/cef_browser.h"
 
-class CefBrowser;
 class CefClient;
 
 ///
diff --git a/include/cef_load_handler.h b/include/cef_load_handler.h
index 3e1184b1..bfa01df2 100644
--- a/include/cef_load_handler.h
+++ b/include/cef_load_handler.h
@@ -39,9 +39,8 @@
 #pragma once
 
 #include "include/cef_base.h"
-
-class CefBrowser;
-class CefFrame;
+#include "include/cef_browser.h"
+#include "include/cef_frame.h"
 
 ///
 // Implement this interface to handle events related to browser load status. The
diff --git a/include/cef_menu_handler.h b/include/cef_menu_handler.h
index 40509cc0..81fe115b 100644
--- a/include/cef_menu_handler.h
+++ b/include/cef_menu_handler.h
@@ -39,8 +39,7 @@
 #pragma once
 
 #include "include/cef_base.h"
-
-class CefBrowser;
+#include "include/cef_browser.h"
 
 ///
 // Implement this interface to handle events related to browser context menus.
diff --git a/include/cef_permission_handler.h b/include/cef_permission_handler.h
index 40cafcda..aea8e46b 100644
--- a/include/cef_permission_handler.h
+++ b/include/cef_permission_handler.h
@@ -39,9 +39,8 @@
 #pragma once
 
 #include "include/cef_base.h"
-
-class CefBrowser;
-class CefFrame;
+#include "include/cef_browser.h"
+#include "include/cef_frame.h"
 
 ///
 // Implement this interface to handle events related to browser permissions.
diff --git a/include/cef_print_handler.h b/include/cef_print_handler.h
index 9c2935af..d47fbf63 100644
--- a/include/cef_print_handler.h
+++ b/include/cef_print_handler.h
@@ -39,9 +39,8 @@
 #pragma once
 
 #include "include/cef_base.h"
-
-class CefBrowser;
-class CefFrame;
+#include "include/cef_browser.h"
+#include "include/cef_frame.h"
 
 ///
 // Implement this interface to handle events related to printing. The methods of
diff --git a/include/cef_render_handler.h b/include/cef_render_handler.h
index f75a73d2..9bb9f68a 100644
--- a/include/cef_render_handler.h
+++ b/include/cef_render_handler.h
@@ -39,10 +39,9 @@
 #pragma once
 
 #include "include/cef_base.h"
+#include "include/cef_browser.h"
 #include <vector>
 
-class CefBrowser;
-
 ///
 // Implement this interface to handle events when window rendering is disabled.
 // The methods of this class will be called on the UI thread.
diff --git a/include/cef_request_handler.h b/include/cef_request_handler.h
index 9f178b08..ceb005de 100644
--- a/include/cef_request_handler.h
+++ b/include/cef_request_handler.h
@@ -39,15 +39,14 @@
 #pragma once
 
 #include "include/cef_base.h"
+#include "include/cef_browser.h"
 #include "include/cef_download_handler.h"
+#include "include/cef_frame.h"
 #include "include/cef_content_filter.h"
 #include "include/cef_response.h"
 #include "include/cef_request.h"
 #include "include/cef_stream.h"
 
-class CefBrowser;
-class CefFrame;
-
 ///
 // Implement this interface to handle events related to browser requests. The
 // methods of this class will be called on the thread indicated.
diff --git a/include/cef_resource_bundle_handler.h b/include/cef_resource_bundle_handler.h
index 0c8c1743..e7a37d1b 100644
--- a/include/cef_resource_bundle_handler.h
+++ b/include/cef_resource_bundle_handler.h
@@ -40,9 +40,6 @@
 
 #include "include/cef_base.h"
 
-class CefBrowser;
-class CefStreamReader;
-
 ///
 // Class used to implement a custom resource bundle interface. The methods of
 // this class may be called on multiple threads.
diff --git a/include/cef_scheme.h b/include/cef_scheme.h
index d031acec..939dba72 100644
--- a/include/cef_scheme.h
+++ b/include/cef_scheme.h
@@ -39,10 +39,10 @@
 #pragma once
 
 #include "include/cef_base.h"
+#include "include/cef_browser.h"
+#include "include/cef_response.h"
+#include "include/cef_request.h"
 
-class CefBrowser;
-class CefRequest;
-class CefResponse;
 class CefSchemeHandler;
 class CefSchemeHandlerFactory;
 
diff --git a/include/cef_v8.h b/include/cef_v8.h
index 02ec885f..6024ce4a 100644
--- a/include/cef_v8.h
+++ b/include/cef_v8.h
@@ -40,10 +40,10 @@
 #pragma once
 
 #include "include/cef_base.h"
+#include "include/cef_browser.h"
+#include "include/cef_frame.h"
 #include <vector>
 
-class CefBrowser;
-class CefFrame;
 class CefV8Handler;
 class CefV8Value;
 
diff --git a/include/cef_v8context_handler.h b/include/cef_v8context_handler.h
index ff77f9b6..5fd82da0 100644
--- a/include/cef_v8context_handler.h
+++ b/include/cef_v8context_handler.h
@@ -39,11 +39,10 @@
 #pragma once
 
 #include "include/cef_base.h"
+#include "include/cef_browser.h"
+#include "include/cef_frame.h"
 #include "include/cef_v8.h"
 
-class CefBrowser;
-class CefFrame;
-
 ///
 // Implement this interface to handle V8 context events. The methods of this
 // class will be called on the UI thread.
diff --git a/include/cef_web_urlrequest.h b/include/cef_web_urlrequest.h
index 9b3be1cf..c5f471f9 100644
--- a/include/cef_web_urlrequest.h
+++ b/include/cef_web_urlrequest.h
@@ -39,9 +39,9 @@
 #pragma once
 
 #include "include/cef_base.h"
+#include "include/cef_request.h"
+#include "include/cef_response.h"
 
-class CefRequest;
-class CefResponse;
 class CefWebURLRequestClient;
 
 ///
diff --git a/include/cef_xml_reader.h b/include/cef_xml_reader.h
index 781e0dac..e457e0d8 100644
--- a/include/cef_xml_reader.h
+++ b/include/cef_xml_reader.h
@@ -39,8 +39,7 @@
 #pragma once
 
 #include "include/cef_base.h"
-
-class CefStreamReader;
+#include "include/cef_stream.h"
 
 ///
 // Class that supports the reading of XML data via the libxml streaming API.
diff --git a/include/cef_zip_reader.h b/include/cef_zip_reader.h
index f417b62b..9498f06e 100644
--- a/include/cef_zip_reader.h
+++ b/include/cef_zip_reader.h
@@ -38,8 +38,7 @@
 #define CEF_INCLUDE_CEF_ZIP_READER_H_
 
 #include "include/cef_base.h"
-
-class CefStreamReader;
+#include "include/cef_stream.h"
 
 ///
 // Class that supports the reading of zip archives via the zlib unzip API.
diff --git a/libcef_dll/cpptoc/browser_cpptoc.h b/libcef_dll/cpptoc/browser_cpptoc.h
index 5caac850..eb899416 100644
--- a/libcef_dll/cpptoc/browser_cpptoc.h
+++ b/libcef_dll/cpptoc/browser_cpptoc.h
@@ -22,8 +22,6 @@
 #include "include/capi/cef_browser_capi.h"
 #include "include/cef_client.h"
 #include "include/capi/cef_client_capi.h"
-#include "include/cef_frame.h"
-#include "include/capi/cef_frame_capi.h"
 #include "libcef_dll/cpptoc/cpptoc.h"
 
 // Wrap a C++ class with a C structure.
diff --git a/libcef_dll/cpptoc/content_filter_cpptoc.h b/libcef_dll/cpptoc/content_filter_cpptoc.h
index 2fb8fe7d..a1af009c 100644
--- a/libcef_dll/cpptoc/content_filter_cpptoc.h
+++ b/libcef_dll/cpptoc/content_filter_cpptoc.h
@@ -20,8 +20,6 @@
 
 #include "include/cef_content_filter.h"
 #include "include/capi/cef_content_filter_capi.h"
-#include "include/cef_stream.h"
-#include "include/capi/cef_stream_capi.h"
 #include "libcef_dll/cpptoc/cpptoc.h"
 
 // Wrap a C++ class with a C structure.
diff --git a/libcef_dll/cpptoc/display_handler_cpptoc.h b/libcef_dll/cpptoc/display_handler_cpptoc.h
index 6fef44eb..0622ced1 100644
--- a/libcef_dll/cpptoc/display_handler_cpptoc.h
+++ b/libcef_dll/cpptoc/display_handler_cpptoc.h
@@ -20,10 +20,6 @@
 
 #include "include/cef_display_handler.h"
 #include "include/capi/cef_display_handler_capi.h"
-#include "include/cef_browser.h"
-#include "include/capi/cef_browser_capi.h"
-#include "include/cef_frame.h"
-#include "include/capi/cef_frame_capi.h"
 #include "libcef_dll/cpptoc/cpptoc.h"
 
 // Wrap a C++ class with a C structure.
diff --git a/libcef_dll/cpptoc/drag_handler_cpptoc.h b/libcef_dll/cpptoc/drag_handler_cpptoc.h
index 06c244c0..94138f84 100644
--- a/libcef_dll/cpptoc/drag_handler_cpptoc.h
+++ b/libcef_dll/cpptoc/drag_handler_cpptoc.h
@@ -20,8 +20,6 @@
 
 #include "include/cef_drag_handler.h"
 #include "include/capi/cef_drag_handler_capi.h"
-#include "include/cef_browser.h"
-#include "include/capi/cef_browser_capi.h"
 #include "libcef_dll/cpptoc/cpptoc.h"
 
 // Wrap a C++ class with a C structure.
diff --git a/libcef_dll/cpptoc/find_handler_cpptoc.h b/libcef_dll/cpptoc/find_handler_cpptoc.h
index 27dcc6ec..9bb2c68b 100644
--- a/libcef_dll/cpptoc/find_handler_cpptoc.h
+++ b/libcef_dll/cpptoc/find_handler_cpptoc.h
@@ -20,8 +20,6 @@
 
 #include "include/cef_find_handler.h"
 #include "include/capi/cef_find_handler_capi.h"
-#include "include/cef_browser.h"
-#include "include/capi/cef_browser_capi.h"
 #include "libcef_dll/cpptoc/cpptoc.h"
 
 // Wrap a C++ class with a C structure.
diff --git a/libcef_dll/cpptoc/focus_handler_cpptoc.h b/libcef_dll/cpptoc/focus_handler_cpptoc.h
index 79a65736..b88e246e 100644
--- a/libcef_dll/cpptoc/focus_handler_cpptoc.h
+++ b/libcef_dll/cpptoc/focus_handler_cpptoc.h
@@ -20,10 +20,6 @@
 
 #include "include/cef_focus_handler.h"
 #include "include/capi/cef_focus_handler_capi.h"
-#include "include/cef_browser.h"
-#include "include/capi/cef_browser_capi.h"
-#include "include/cef_frame.h"
-#include "include/capi/cef_frame_capi.h"
 #include "libcef_dll/cpptoc/cpptoc.h"
 
 // Wrap a C++ class with a C structure.
diff --git a/libcef_dll/cpptoc/frame_cpptoc.h b/libcef_dll/cpptoc/frame_cpptoc.h
index acbb97e5..0392777d 100644
--- a/libcef_dll/cpptoc/frame_cpptoc.h
+++ b/libcef_dll/cpptoc/frame_cpptoc.h
@@ -22,12 +22,6 @@
 #include "include/capi/cef_frame_capi.h"
 #include "include/cef_browser.h"
 #include "include/capi/cef_browser_capi.h"
-#include "include/cef_dom.h"
-#include "include/capi/cef_dom_capi.h"
-#include "include/cef_request.h"
-#include "include/capi/cef_request_capi.h"
-#include "include/cef_stream.h"
-#include "include/capi/cef_stream_capi.h"
 #include "include/cef_v8.h"
 #include "include/capi/cef_v8_capi.h"
 #include "libcef_dll/cpptoc/cpptoc.h"
diff --git a/libcef_dll/cpptoc/jsdialog_handler_cpptoc.h b/libcef_dll/cpptoc/jsdialog_handler_cpptoc.h
index 96b16f87..af58e704 100644
--- a/libcef_dll/cpptoc/jsdialog_handler_cpptoc.h
+++ b/libcef_dll/cpptoc/jsdialog_handler_cpptoc.h
@@ -20,10 +20,6 @@
 
 #include "include/cef_jsdialog_handler.h"
 #include "include/capi/cef_jsdialog_handler_capi.h"
-#include "include/cef_browser.h"
-#include "include/capi/cef_browser_capi.h"
-#include "include/cef_frame.h"
-#include "include/capi/cef_frame_capi.h"
 #include "libcef_dll/cpptoc/cpptoc.h"
 
 // Wrap a C++ class with a C structure.
diff --git a/libcef_dll/cpptoc/keyboard_handler_cpptoc.h b/libcef_dll/cpptoc/keyboard_handler_cpptoc.h
index 7d46593e..4685a74e 100644
--- a/libcef_dll/cpptoc/keyboard_handler_cpptoc.h
+++ b/libcef_dll/cpptoc/keyboard_handler_cpptoc.h
@@ -20,8 +20,6 @@
 
 #include "include/cef_keyboard_handler.h"
 #include "include/capi/cef_keyboard_handler_capi.h"
-#include "include/cef_browser.h"
-#include "include/capi/cef_browser_capi.h"
 #include "libcef_dll/cpptoc/cpptoc.h"
 
 // Wrap a C++ class with a C structure.
diff --git a/libcef_dll/cpptoc/life_span_handler_cpptoc.h b/libcef_dll/cpptoc/life_span_handler_cpptoc.h
index 88a8e379..247d131b 100644
--- a/libcef_dll/cpptoc/life_span_handler_cpptoc.h
+++ b/libcef_dll/cpptoc/life_span_handler_cpptoc.h
@@ -20,8 +20,6 @@
 
 #include "include/cef_life_span_handler.h"
 #include "include/capi/cef_life_span_handler_capi.h"
-#include "include/cef_browser.h"
-#include "include/capi/cef_browser_capi.h"
 #include "include/cef_client.h"
 #include "include/capi/cef_client_capi.h"
 #include "libcef_dll/cpptoc/cpptoc.h"
diff --git a/libcef_dll/cpptoc/load_handler_cpptoc.h b/libcef_dll/cpptoc/load_handler_cpptoc.h
index 11244b2b..f5af7e73 100644
--- a/libcef_dll/cpptoc/load_handler_cpptoc.h
+++ b/libcef_dll/cpptoc/load_handler_cpptoc.h
@@ -20,10 +20,6 @@
 
 #include "include/cef_load_handler.h"
 #include "include/capi/cef_load_handler_capi.h"
-#include "include/cef_browser.h"
-#include "include/capi/cef_browser_capi.h"
-#include "include/cef_frame.h"
-#include "include/capi/cef_frame_capi.h"
 #include "libcef_dll/cpptoc/cpptoc.h"
 
 // Wrap a C++ class with a C structure.
diff --git a/libcef_dll/cpptoc/menu_handler_cpptoc.h b/libcef_dll/cpptoc/menu_handler_cpptoc.h
index d4806454..20086f43 100644
--- a/libcef_dll/cpptoc/menu_handler_cpptoc.h
+++ b/libcef_dll/cpptoc/menu_handler_cpptoc.h
@@ -20,8 +20,6 @@
 
 #include "include/cef_menu_handler.h"
 #include "include/capi/cef_menu_handler_capi.h"
-#include "include/cef_browser.h"
-#include "include/capi/cef_browser_capi.h"
 #include "libcef_dll/cpptoc/cpptoc.h"
 
 // Wrap a C++ class with a C structure.
diff --git a/libcef_dll/cpptoc/permission_handler_cpptoc.h b/libcef_dll/cpptoc/permission_handler_cpptoc.h
index 6c8d2f86..a7e2f44a 100644
--- a/libcef_dll/cpptoc/permission_handler_cpptoc.h
+++ b/libcef_dll/cpptoc/permission_handler_cpptoc.h
@@ -20,10 +20,6 @@
 
 #include "include/cef_permission_handler.h"
 #include "include/capi/cef_permission_handler_capi.h"
-#include "include/cef_browser.h"
-#include "include/capi/cef_browser_capi.h"
-#include "include/cef_frame.h"
-#include "include/capi/cef_frame_capi.h"
 #include "libcef_dll/cpptoc/cpptoc.h"
 
 // Wrap a C++ class with a C structure.
diff --git a/libcef_dll/cpptoc/print_handler_cpptoc.h b/libcef_dll/cpptoc/print_handler_cpptoc.h
index 6dea3a47..9289aa50 100644
--- a/libcef_dll/cpptoc/print_handler_cpptoc.h
+++ b/libcef_dll/cpptoc/print_handler_cpptoc.h
@@ -20,10 +20,6 @@
 
 #include "include/cef_print_handler.h"
 #include "include/capi/cef_print_handler_capi.h"
-#include "include/cef_browser.h"
-#include "include/capi/cef_browser_capi.h"
-#include "include/cef_frame.h"
-#include "include/capi/cef_frame_capi.h"
 #include "libcef_dll/cpptoc/cpptoc.h"
 
 // Wrap a C++ class with a C structure.
diff --git a/libcef_dll/cpptoc/render_handler_cpptoc.h b/libcef_dll/cpptoc/render_handler_cpptoc.h
index 2ae7c11a..8c9b65c2 100644
--- a/libcef_dll/cpptoc/render_handler_cpptoc.h
+++ b/libcef_dll/cpptoc/render_handler_cpptoc.h
@@ -20,8 +20,6 @@
 
 #include "include/cef_render_handler.h"
 #include "include/capi/cef_render_handler_capi.h"
-#include "include/cef_browser.h"
-#include "include/capi/cef_browser_capi.h"
 #include "libcef_dll/cpptoc/cpptoc.h"
 
 // Wrap a C++ class with a C structure.
diff --git a/libcef_dll/cpptoc/request_handler_cpptoc.h b/libcef_dll/cpptoc/request_handler_cpptoc.h
index 9249e878..1b4c7916 100644
--- a/libcef_dll/cpptoc/request_handler_cpptoc.h
+++ b/libcef_dll/cpptoc/request_handler_cpptoc.h
@@ -20,10 +20,6 @@
 
 #include "include/cef_request_handler.h"
 #include "include/capi/cef_request_handler_capi.h"
-#include "include/cef_browser.h"
-#include "include/capi/cef_browser_capi.h"
-#include "include/cef_frame.h"
-#include "include/capi/cef_frame_capi.h"
 #include "libcef_dll/cpptoc/cpptoc.h"
 
 // Wrap a C++ class with a C structure.
diff --git a/libcef_dll/cpptoc/resource_bundle_handler_cpptoc.h b/libcef_dll/cpptoc/resource_bundle_handler_cpptoc.h
index 122e8813..3b11fb62 100644
--- a/libcef_dll/cpptoc/resource_bundle_handler_cpptoc.h
+++ b/libcef_dll/cpptoc/resource_bundle_handler_cpptoc.h
@@ -20,10 +20,6 @@
 
 #include "include/cef_resource_bundle_handler.h"
 #include "include/capi/cef_resource_bundle_handler_capi.h"
-#include "include/cef_browser.h"
-#include "include/capi/cef_browser_capi.h"
-#include "include/cef_stream.h"
-#include "include/capi/cef_stream_capi.h"
 #include "libcef_dll/cpptoc/cpptoc.h"
 
 // Wrap a C++ class with a C structure.
diff --git a/libcef_dll/cpptoc/scheme_handler_callback_cpptoc.h b/libcef_dll/cpptoc/scheme_handler_callback_cpptoc.h
index fe5d268d..3dd5d462 100644
--- a/libcef_dll/cpptoc/scheme_handler_callback_cpptoc.h
+++ b/libcef_dll/cpptoc/scheme_handler_callback_cpptoc.h
@@ -20,12 +20,6 @@
 
 #include "include/cef_scheme.h"
 #include "include/capi/cef_scheme_capi.h"
-#include "include/cef_browser.h"
-#include "include/capi/cef_browser_capi.h"
-#include "include/cef_request.h"
-#include "include/capi/cef_request_capi.h"
-#include "include/cef_response.h"
-#include "include/capi/cef_response_capi.h"
 #include "libcef_dll/cpptoc/cpptoc.h"
 
 // Wrap a C++ class with a C structure.
diff --git a/libcef_dll/cpptoc/scheme_handler_cpptoc.h b/libcef_dll/cpptoc/scheme_handler_cpptoc.h
index a151e069..e38e705f 100644
--- a/libcef_dll/cpptoc/scheme_handler_cpptoc.h
+++ b/libcef_dll/cpptoc/scheme_handler_cpptoc.h
@@ -20,12 +20,6 @@
 
 #include "include/cef_scheme.h"
 #include "include/capi/cef_scheme_capi.h"
-#include "include/cef_browser.h"
-#include "include/capi/cef_browser_capi.h"
-#include "include/cef_request.h"
-#include "include/capi/cef_request_capi.h"
-#include "include/cef_response.h"
-#include "include/capi/cef_response_capi.h"
 #include "libcef_dll/cpptoc/cpptoc.h"
 
 // Wrap a C++ class with a C structure.
diff --git a/libcef_dll/cpptoc/scheme_handler_factory_cpptoc.h b/libcef_dll/cpptoc/scheme_handler_factory_cpptoc.h
index e49998b4..c47b338d 100644
--- a/libcef_dll/cpptoc/scheme_handler_factory_cpptoc.h
+++ b/libcef_dll/cpptoc/scheme_handler_factory_cpptoc.h
@@ -20,12 +20,6 @@
 
 #include "include/cef_scheme.h"
 #include "include/capi/cef_scheme_capi.h"
-#include "include/cef_browser.h"
-#include "include/capi/cef_browser_capi.h"
-#include "include/cef_request.h"
-#include "include/capi/cef_request_capi.h"
-#include "include/cef_response.h"
-#include "include/capi/cef_response_capi.h"
 #include "libcef_dll/cpptoc/cpptoc.h"
 
 // Wrap a C++ class with a C structure.
diff --git a/libcef_dll/cpptoc/v8accessor_cpptoc.h b/libcef_dll/cpptoc/v8accessor_cpptoc.h
index 10cdbdb5..b0dbb8eb 100644
--- a/libcef_dll/cpptoc/v8accessor_cpptoc.h
+++ b/libcef_dll/cpptoc/v8accessor_cpptoc.h
@@ -20,10 +20,6 @@
 
 #include "include/cef_v8.h"
 #include "include/capi/cef_v8_capi.h"
-#include "include/cef_browser.h"
-#include "include/capi/cef_browser_capi.h"
-#include "include/cef_frame.h"
-#include "include/capi/cef_frame_capi.h"
 #include "libcef_dll/cpptoc/cpptoc.h"
 
 // Wrap a C++ class with a C structure.
diff --git a/libcef_dll/cpptoc/v8context_cpptoc.h b/libcef_dll/cpptoc/v8context_cpptoc.h
index 2eeae4a5..c19fff2a 100644
--- a/libcef_dll/cpptoc/v8context_cpptoc.h
+++ b/libcef_dll/cpptoc/v8context_cpptoc.h
@@ -20,10 +20,6 @@
 
 #include "include/cef_v8.h"
 #include "include/capi/cef_v8_capi.h"
-#include "include/cef_browser.h"
-#include "include/capi/cef_browser_capi.h"
-#include "include/cef_frame.h"
-#include "include/capi/cef_frame_capi.h"
 #include "libcef_dll/cpptoc/cpptoc.h"
 
 // Wrap a C++ class with a C structure.
diff --git a/libcef_dll/cpptoc/v8context_handler_cpptoc.h b/libcef_dll/cpptoc/v8context_handler_cpptoc.h
index 153fbce6..d77b908e 100644
--- a/libcef_dll/cpptoc/v8context_handler_cpptoc.h
+++ b/libcef_dll/cpptoc/v8context_handler_cpptoc.h
@@ -20,10 +20,6 @@
 
 #include "include/cef_v8context_handler.h"
 #include "include/capi/cef_v8context_handler_capi.h"
-#include "include/cef_browser.h"
-#include "include/capi/cef_browser_capi.h"
-#include "include/cef_frame.h"
-#include "include/capi/cef_frame_capi.h"
 #include "libcef_dll/cpptoc/cpptoc.h"
 
 // Wrap a C++ class with a C structure.
diff --git a/libcef_dll/cpptoc/v8exception_cpptoc.h b/libcef_dll/cpptoc/v8exception_cpptoc.h
index 3179a9e5..040d782a 100644
--- a/libcef_dll/cpptoc/v8exception_cpptoc.h
+++ b/libcef_dll/cpptoc/v8exception_cpptoc.h
@@ -20,10 +20,6 @@
 
 #include "include/cef_v8.h"
 #include "include/capi/cef_v8_capi.h"
-#include "include/cef_browser.h"
-#include "include/capi/cef_browser_capi.h"
-#include "include/cef_frame.h"
-#include "include/capi/cef_frame_capi.h"
 #include "libcef_dll/cpptoc/cpptoc.h"
 
 // Wrap a C++ class with a C structure.
diff --git a/libcef_dll/cpptoc/v8handler_cpptoc.h b/libcef_dll/cpptoc/v8handler_cpptoc.h
index c6c159ee..1dd0886e 100644
--- a/libcef_dll/cpptoc/v8handler_cpptoc.h
+++ b/libcef_dll/cpptoc/v8handler_cpptoc.h
@@ -20,10 +20,6 @@
 
 #include "include/cef_v8.h"
 #include "include/capi/cef_v8_capi.h"
-#include "include/cef_browser.h"
-#include "include/capi/cef_browser_capi.h"
-#include "include/cef_frame.h"
-#include "include/capi/cef_frame_capi.h"
 #include "libcef_dll/cpptoc/cpptoc.h"
 
 // Wrap a C++ class with a C structure.
diff --git a/libcef_dll/cpptoc/v8value_cpptoc.h b/libcef_dll/cpptoc/v8value_cpptoc.h
index a3164753..086bda36 100644
--- a/libcef_dll/cpptoc/v8value_cpptoc.h
+++ b/libcef_dll/cpptoc/v8value_cpptoc.h
@@ -20,10 +20,6 @@
 
 #include "include/cef_v8.h"
 #include "include/capi/cef_v8_capi.h"
-#include "include/cef_browser.h"
-#include "include/capi/cef_browser_capi.h"
-#include "include/cef_frame.h"
-#include "include/capi/cef_frame_capi.h"
 #include "libcef_dll/cpptoc/cpptoc.h"
 
 // Wrap a C++ class with a C structure.
diff --git a/libcef_dll/cpptoc/web_urlrequest_client_cpptoc.h b/libcef_dll/cpptoc/web_urlrequest_client_cpptoc.h
index 80e599b4..1aca5c15 100644
--- a/libcef_dll/cpptoc/web_urlrequest_client_cpptoc.h
+++ b/libcef_dll/cpptoc/web_urlrequest_client_cpptoc.h
@@ -20,10 +20,6 @@
 
 #include "include/cef_web_urlrequest.h"
 #include "include/capi/cef_web_urlrequest_capi.h"
-#include "include/cef_request.h"
-#include "include/capi/cef_request_capi.h"
-#include "include/cef_response.h"
-#include "include/capi/cef_response_capi.h"
 #include "libcef_dll/cpptoc/cpptoc.h"
 
 // Wrap a C++ class with a C structure.
diff --git a/libcef_dll/cpptoc/web_urlrequest_cpptoc.h b/libcef_dll/cpptoc/web_urlrequest_cpptoc.h
index 83e3ee2b..840844ea 100644
--- a/libcef_dll/cpptoc/web_urlrequest_cpptoc.h
+++ b/libcef_dll/cpptoc/web_urlrequest_cpptoc.h
@@ -20,10 +20,6 @@
 
 #include "include/cef_web_urlrequest.h"
 #include "include/capi/cef_web_urlrequest_capi.h"
-#include "include/cef_request.h"
-#include "include/capi/cef_request_capi.h"
-#include "include/cef_response.h"
-#include "include/capi/cef_response_capi.h"
 #include "libcef_dll/cpptoc/cpptoc.h"
 
 // Wrap a C++ class with a C structure.
diff --git a/libcef_dll/cpptoc/xml_reader_cpptoc.h b/libcef_dll/cpptoc/xml_reader_cpptoc.h
index 8d02da2d..1674b2fa 100644
--- a/libcef_dll/cpptoc/xml_reader_cpptoc.h
+++ b/libcef_dll/cpptoc/xml_reader_cpptoc.h
@@ -20,8 +20,6 @@
 
 #include "include/cef_xml_reader.h"
 #include "include/capi/cef_xml_reader_capi.h"
-#include "include/cef_stream.h"
-#include "include/capi/cef_stream_capi.h"
 #include "libcef_dll/cpptoc/cpptoc.h"
 
 // Wrap a C++ class with a C structure.
diff --git a/libcef_dll/cpptoc/zip_reader_cpptoc.h b/libcef_dll/cpptoc/zip_reader_cpptoc.h
index 5e6ab59c..2bfbbada 100644
--- a/libcef_dll/cpptoc/zip_reader_cpptoc.h
+++ b/libcef_dll/cpptoc/zip_reader_cpptoc.h
@@ -20,8 +20,6 @@
 
 #include "include/cef_zip_reader.h"
 #include "include/capi/cef_zip_reader_capi.h"
-#include "include/cef_stream.h"
-#include "include/capi/cef_stream_capi.h"
 #include "libcef_dll/cpptoc/cpptoc.h"
 
 // Wrap a C++ class with a C structure.
diff --git a/libcef_dll/ctocpp/browser_ctocpp.h b/libcef_dll/ctocpp/browser_ctocpp.h
index b0ff458b..8c917e1c 100644
--- a/libcef_dll/ctocpp/browser_ctocpp.h
+++ b/libcef_dll/ctocpp/browser_ctocpp.h
@@ -23,8 +23,6 @@
 #include "include/capi/cef_browser_capi.h"
 #include "include/cef_client.h"
 #include "include/capi/cef_client_capi.h"
-#include "include/cef_frame.h"
-#include "include/capi/cef_frame_capi.h"
 #include "libcef_dll/ctocpp/ctocpp.h"
 
 // Wrap a C structure with a C++ class.
diff --git a/libcef_dll/ctocpp/content_filter_ctocpp.h b/libcef_dll/ctocpp/content_filter_ctocpp.h
index add5338b..716cc0f5 100644
--- a/libcef_dll/ctocpp/content_filter_ctocpp.h
+++ b/libcef_dll/ctocpp/content_filter_ctocpp.h
@@ -20,8 +20,6 @@
 
 #include "include/cef_content_filter.h"
 #include "include/capi/cef_content_filter_capi.h"
-#include "include/cef_stream.h"
-#include "include/capi/cef_stream_capi.h"
 #include "libcef_dll/ctocpp/ctocpp.h"
 
 // Wrap a C structure with a C++ class.
diff --git a/libcef_dll/ctocpp/display_handler_ctocpp.h b/libcef_dll/ctocpp/display_handler_ctocpp.h
index 85f78aab..d539035f 100644
--- a/libcef_dll/ctocpp/display_handler_ctocpp.h
+++ b/libcef_dll/ctocpp/display_handler_ctocpp.h
@@ -20,10 +20,6 @@
 
 #include "include/cef_display_handler.h"
 #include "include/capi/cef_display_handler_capi.h"
-#include "include/cef_browser.h"
-#include "include/capi/cef_browser_capi.h"
-#include "include/cef_frame.h"
-#include "include/capi/cef_frame_capi.h"
 #include "libcef_dll/ctocpp/ctocpp.h"
 
 // Wrap a C structure with a C++ class.
diff --git a/libcef_dll/ctocpp/drag_handler_ctocpp.h b/libcef_dll/ctocpp/drag_handler_ctocpp.h
index 49f94c5a..4f8aeb8a 100644
--- a/libcef_dll/ctocpp/drag_handler_ctocpp.h
+++ b/libcef_dll/ctocpp/drag_handler_ctocpp.h
@@ -20,8 +20,6 @@
 
 #include "include/cef_drag_handler.h"
 #include "include/capi/cef_drag_handler_capi.h"
-#include "include/cef_browser.h"
-#include "include/capi/cef_browser_capi.h"
 #include "libcef_dll/ctocpp/ctocpp.h"
 
 // Wrap a C structure with a C++ class.
diff --git a/libcef_dll/ctocpp/find_handler_ctocpp.h b/libcef_dll/ctocpp/find_handler_ctocpp.h
index be5e2396..0ee37606 100644
--- a/libcef_dll/ctocpp/find_handler_ctocpp.h
+++ b/libcef_dll/ctocpp/find_handler_ctocpp.h
@@ -20,8 +20,6 @@
 
 #include "include/cef_find_handler.h"
 #include "include/capi/cef_find_handler_capi.h"
-#include "include/cef_browser.h"
-#include "include/capi/cef_browser_capi.h"
 #include "libcef_dll/ctocpp/ctocpp.h"
 
 // Wrap a C structure with a C++ class.
diff --git a/libcef_dll/ctocpp/focus_handler_ctocpp.h b/libcef_dll/ctocpp/focus_handler_ctocpp.h
index e45233c8..e2644f43 100644
--- a/libcef_dll/ctocpp/focus_handler_ctocpp.h
+++ b/libcef_dll/ctocpp/focus_handler_ctocpp.h
@@ -20,10 +20,6 @@
 
 #include "include/cef_focus_handler.h"
 #include "include/capi/cef_focus_handler_capi.h"
-#include "include/cef_browser.h"
-#include "include/capi/cef_browser_capi.h"
-#include "include/cef_frame.h"
-#include "include/capi/cef_frame_capi.h"
 #include "libcef_dll/ctocpp/ctocpp.h"
 
 // Wrap a C structure with a C++ class.
diff --git a/libcef_dll/ctocpp/frame_ctocpp.h b/libcef_dll/ctocpp/frame_ctocpp.h
index bb4995f4..091d85ca 100644
--- a/libcef_dll/ctocpp/frame_ctocpp.h
+++ b/libcef_dll/ctocpp/frame_ctocpp.h
@@ -22,12 +22,6 @@
 #include "include/capi/cef_frame_capi.h"
 #include "include/cef_browser.h"
 #include "include/capi/cef_browser_capi.h"
-#include "include/cef_dom.h"
-#include "include/capi/cef_dom_capi.h"
-#include "include/cef_request.h"
-#include "include/capi/cef_request_capi.h"
-#include "include/cef_stream.h"
-#include "include/capi/cef_stream_capi.h"
 #include "include/cef_v8.h"
 #include "include/capi/cef_v8_capi.h"
 #include "libcef_dll/ctocpp/ctocpp.h"
diff --git a/libcef_dll/ctocpp/jsdialog_handler_ctocpp.h b/libcef_dll/ctocpp/jsdialog_handler_ctocpp.h
index e9f24a41..55feb843 100644
--- a/libcef_dll/ctocpp/jsdialog_handler_ctocpp.h
+++ b/libcef_dll/ctocpp/jsdialog_handler_ctocpp.h
@@ -20,10 +20,6 @@
 
 #include "include/cef_jsdialog_handler.h"
 #include "include/capi/cef_jsdialog_handler_capi.h"
-#include "include/cef_browser.h"
-#include "include/capi/cef_browser_capi.h"
-#include "include/cef_frame.h"
-#include "include/capi/cef_frame_capi.h"
 #include "libcef_dll/ctocpp/ctocpp.h"
 
 // Wrap a C structure with a C++ class.
diff --git a/libcef_dll/ctocpp/keyboard_handler_ctocpp.h b/libcef_dll/ctocpp/keyboard_handler_ctocpp.h
index ee6a1c40..91eabc78 100644
--- a/libcef_dll/ctocpp/keyboard_handler_ctocpp.h
+++ b/libcef_dll/ctocpp/keyboard_handler_ctocpp.h
@@ -20,8 +20,6 @@
 
 #include "include/cef_keyboard_handler.h"
 #include "include/capi/cef_keyboard_handler_capi.h"
-#include "include/cef_browser.h"
-#include "include/capi/cef_browser_capi.h"
 #include "libcef_dll/ctocpp/ctocpp.h"
 
 // Wrap a C structure with a C++ class.
diff --git a/libcef_dll/ctocpp/life_span_handler_ctocpp.h b/libcef_dll/ctocpp/life_span_handler_ctocpp.h
index e8657b01..7b5e45b4 100644
--- a/libcef_dll/ctocpp/life_span_handler_ctocpp.h
+++ b/libcef_dll/ctocpp/life_span_handler_ctocpp.h
@@ -20,8 +20,6 @@
 
 #include "include/cef_life_span_handler.h"
 #include "include/capi/cef_life_span_handler_capi.h"
-#include "include/cef_browser.h"
-#include "include/capi/cef_browser_capi.h"
 #include "include/cef_client.h"
 #include "include/capi/cef_client_capi.h"
 #include "libcef_dll/ctocpp/ctocpp.h"
diff --git a/libcef_dll/ctocpp/load_handler_ctocpp.h b/libcef_dll/ctocpp/load_handler_ctocpp.h
index 0ceb655d..182c8eb8 100644
--- a/libcef_dll/ctocpp/load_handler_ctocpp.h
+++ b/libcef_dll/ctocpp/load_handler_ctocpp.h
@@ -20,10 +20,6 @@
 
 #include "include/cef_load_handler.h"
 #include "include/capi/cef_load_handler_capi.h"
-#include "include/cef_browser.h"
-#include "include/capi/cef_browser_capi.h"
-#include "include/cef_frame.h"
-#include "include/capi/cef_frame_capi.h"
 #include "libcef_dll/ctocpp/ctocpp.h"
 
 // Wrap a C structure with a C++ class.
diff --git a/libcef_dll/ctocpp/menu_handler_ctocpp.h b/libcef_dll/ctocpp/menu_handler_ctocpp.h
index 31f74c6f..8c2bf2cf 100644
--- a/libcef_dll/ctocpp/menu_handler_ctocpp.h
+++ b/libcef_dll/ctocpp/menu_handler_ctocpp.h
@@ -20,8 +20,6 @@
 
 #include "include/cef_menu_handler.h"
 #include "include/capi/cef_menu_handler_capi.h"
-#include "include/cef_browser.h"
-#include "include/capi/cef_browser_capi.h"
 #include "libcef_dll/ctocpp/ctocpp.h"
 
 // Wrap a C structure with a C++ class.
diff --git a/libcef_dll/ctocpp/permission_handler_ctocpp.h b/libcef_dll/ctocpp/permission_handler_ctocpp.h
index 0bffa2a8..a5b7d4d0 100644
--- a/libcef_dll/ctocpp/permission_handler_ctocpp.h
+++ b/libcef_dll/ctocpp/permission_handler_ctocpp.h
@@ -20,10 +20,6 @@
 
 #include "include/cef_permission_handler.h"
 #include "include/capi/cef_permission_handler_capi.h"
-#include "include/cef_browser.h"
-#include "include/capi/cef_browser_capi.h"
-#include "include/cef_frame.h"
-#include "include/capi/cef_frame_capi.h"
 #include "libcef_dll/ctocpp/ctocpp.h"
 
 // Wrap a C structure with a C++ class.
diff --git a/libcef_dll/ctocpp/print_handler_ctocpp.h b/libcef_dll/ctocpp/print_handler_ctocpp.h
index 042701fe..1f20efb7 100644
--- a/libcef_dll/ctocpp/print_handler_ctocpp.h
+++ b/libcef_dll/ctocpp/print_handler_ctocpp.h
@@ -20,10 +20,6 @@
 
 #include "include/cef_print_handler.h"
 #include "include/capi/cef_print_handler_capi.h"
-#include "include/cef_browser.h"
-#include "include/capi/cef_browser_capi.h"
-#include "include/cef_frame.h"
-#include "include/capi/cef_frame_capi.h"
 #include "libcef_dll/ctocpp/ctocpp.h"
 
 // Wrap a C structure with a C++ class.
diff --git a/libcef_dll/ctocpp/render_handler_ctocpp.h b/libcef_dll/ctocpp/render_handler_ctocpp.h
index 86933c8c..3cd4daa5 100644
--- a/libcef_dll/ctocpp/render_handler_ctocpp.h
+++ b/libcef_dll/ctocpp/render_handler_ctocpp.h
@@ -20,8 +20,6 @@
 
 #include "include/cef_render_handler.h"
 #include "include/capi/cef_render_handler_capi.h"
-#include "include/cef_browser.h"
-#include "include/capi/cef_browser_capi.h"
 #include "libcef_dll/ctocpp/ctocpp.h"
 
 // Wrap a C structure with a C++ class.
diff --git a/libcef_dll/ctocpp/request_handler_ctocpp.h b/libcef_dll/ctocpp/request_handler_ctocpp.h
index be820e4d..24fff116 100644
--- a/libcef_dll/ctocpp/request_handler_ctocpp.h
+++ b/libcef_dll/ctocpp/request_handler_ctocpp.h
@@ -20,10 +20,6 @@
 
 #include "include/cef_request_handler.h"
 #include "include/capi/cef_request_handler_capi.h"
-#include "include/cef_browser.h"
-#include "include/capi/cef_browser_capi.h"
-#include "include/cef_frame.h"
-#include "include/capi/cef_frame_capi.h"
 #include "libcef_dll/ctocpp/ctocpp.h"
 
 // Wrap a C structure with a C++ class.
diff --git a/libcef_dll/ctocpp/resource_bundle_handler_ctocpp.h b/libcef_dll/ctocpp/resource_bundle_handler_ctocpp.h
index 601be612..73279e7f 100644
--- a/libcef_dll/ctocpp/resource_bundle_handler_ctocpp.h
+++ b/libcef_dll/ctocpp/resource_bundle_handler_ctocpp.h
@@ -20,10 +20,6 @@
 
 #include "include/cef_resource_bundle_handler.h"
 #include "include/capi/cef_resource_bundle_handler_capi.h"
-#include "include/cef_browser.h"
-#include "include/capi/cef_browser_capi.h"
-#include "include/cef_stream.h"
-#include "include/capi/cef_stream_capi.h"
 #include "libcef_dll/ctocpp/ctocpp.h"
 
 // Wrap a C structure with a C++ class.
diff --git a/libcef_dll/ctocpp/scheme_handler_callback_ctocpp.h b/libcef_dll/ctocpp/scheme_handler_callback_ctocpp.h
index 5eb8db53..27f06908 100644
--- a/libcef_dll/ctocpp/scheme_handler_callback_ctocpp.h
+++ b/libcef_dll/ctocpp/scheme_handler_callback_ctocpp.h
@@ -20,12 +20,6 @@
 
 #include "include/cef_scheme.h"
 #include "include/capi/cef_scheme_capi.h"
-#include "include/cef_browser.h"
-#include "include/capi/cef_browser_capi.h"
-#include "include/cef_request.h"
-#include "include/capi/cef_request_capi.h"
-#include "include/cef_response.h"
-#include "include/capi/cef_response_capi.h"
 #include "libcef_dll/ctocpp/ctocpp.h"
 
 // Wrap a C structure with a C++ class.
diff --git a/libcef_dll/ctocpp/scheme_handler_ctocpp.h b/libcef_dll/ctocpp/scheme_handler_ctocpp.h
index e4a78a45..42167577 100644
--- a/libcef_dll/ctocpp/scheme_handler_ctocpp.h
+++ b/libcef_dll/ctocpp/scheme_handler_ctocpp.h
@@ -20,12 +20,6 @@
 
 #include "include/cef_scheme.h"
 #include "include/capi/cef_scheme_capi.h"
-#include "include/cef_browser.h"
-#include "include/capi/cef_browser_capi.h"
-#include "include/cef_request.h"
-#include "include/capi/cef_request_capi.h"
-#include "include/cef_response.h"
-#include "include/capi/cef_response_capi.h"
 #include "libcef_dll/ctocpp/ctocpp.h"
 
 // Wrap a C structure with a C++ class.
diff --git a/libcef_dll/ctocpp/scheme_handler_factory_ctocpp.h b/libcef_dll/ctocpp/scheme_handler_factory_ctocpp.h
index 90cfd7f7..896bd591 100644
--- a/libcef_dll/ctocpp/scheme_handler_factory_ctocpp.h
+++ b/libcef_dll/ctocpp/scheme_handler_factory_ctocpp.h
@@ -20,12 +20,6 @@
 
 #include "include/cef_scheme.h"
 #include "include/capi/cef_scheme_capi.h"
-#include "include/cef_browser.h"
-#include "include/capi/cef_browser_capi.h"
-#include "include/cef_request.h"
-#include "include/capi/cef_request_capi.h"
-#include "include/cef_response.h"
-#include "include/capi/cef_response_capi.h"
 #include "libcef_dll/ctocpp/ctocpp.h"
 
 // Wrap a C structure with a C++ class.
diff --git a/libcef_dll/ctocpp/v8accessor_ctocpp.h b/libcef_dll/ctocpp/v8accessor_ctocpp.h
index 31ba313c..3ae106e9 100644
--- a/libcef_dll/ctocpp/v8accessor_ctocpp.h
+++ b/libcef_dll/ctocpp/v8accessor_ctocpp.h
@@ -20,10 +20,6 @@
 
 #include "include/cef_v8.h"
 #include "include/capi/cef_v8_capi.h"
-#include "include/cef_browser.h"
-#include "include/capi/cef_browser_capi.h"
-#include "include/cef_frame.h"
-#include "include/capi/cef_frame_capi.h"
 #include "libcef_dll/ctocpp/ctocpp.h"
 
 // Wrap a C structure with a C++ class.
diff --git a/libcef_dll/ctocpp/v8context_ctocpp.h b/libcef_dll/ctocpp/v8context_ctocpp.h
index c2e0f1c9..a128e7fd 100644
--- a/libcef_dll/ctocpp/v8context_ctocpp.h
+++ b/libcef_dll/ctocpp/v8context_ctocpp.h
@@ -20,10 +20,6 @@
 
 #include "include/cef_v8.h"
 #include "include/capi/cef_v8_capi.h"
-#include "include/cef_browser.h"
-#include "include/capi/cef_browser_capi.h"
-#include "include/cef_frame.h"
-#include "include/capi/cef_frame_capi.h"
 #include "libcef_dll/ctocpp/ctocpp.h"
 
 // Wrap a C structure with a C++ class.
diff --git a/libcef_dll/ctocpp/v8context_handler_ctocpp.h b/libcef_dll/ctocpp/v8context_handler_ctocpp.h
index 18a494e0..e02de1d6 100644
--- a/libcef_dll/ctocpp/v8context_handler_ctocpp.h
+++ b/libcef_dll/ctocpp/v8context_handler_ctocpp.h
@@ -20,10 +20,6 @@
 
 #include "include/cef_v8context_handler.h"
 #include "include/capi/cef_v8context_handler_capi.h"
-#include "include/cef_browser.h"
-#include "include/capi/cef_browser_capi.h"
-#include "include/cef_frame.h"
-#include "include/capi/cef_frame_capi.h"
 #include "libcef_dll/ctocpp/ctocpp.h"
 
 // Wrap a C structure with a C++ class.
diff --git a/libcef_dll/ctocpp/v8exception_ctocpp.h b/libcef_dll/ctocpp/v8exception_ctocpp.h
index e972c727..8966e61a 100644
--- a/libcef_dll/ctocpp/v8exception_ctocpp.h
+++ b/libcef_dll/ctocpp/v8exception_ctocpp.h
@@ -20,10 +20,6 @@
 
 #include "include/cef_v8.h"
 #include "include/capi/cef_v8_capi.h"
-#include "include/cef_browser.h"
-#include "include/capi/cef_browser_capi.h"
-#include "include/cef_frame.h"
-#include "include/capi/cef_frame_capi.h"
 #include "libcef_dll/ctocpp/ctocpp.h"
 
 // Wrap a C structure with a C++ class.
diff --git a/libcef_dll/ctocpp/v8handler_ctocpp.h b/libcef_dll/ctocpp/v8handler_ctocpp.h
index 6cf3c8f7..ea3bba1c 100644
--- a/libcef_dll/ctocpp/v8handler_ctocpp.h
+++ b/libcef_dll/ctocpp/v8handler_ctocpp.h
@@ -20,10 +20,6 @@
 
 #include "include/cef_v8.h"
 #include "include/capi/cef_v8_capi.h"
-#include "include/cef_browser.h"
-#include "include/capi/cef_browser_capi.h"
-#include "include/cef_frame.h"
-#include "include/capi/cef_frame_capi.h"
 #include "libcef_dll/ctocpp/ctocpp.h"
 
 // Wrap a C structure with a C++ class.
diff --git a/libcef_dll/ctocpp/v8value_ctocpp.h b/libcef_dll/ctocpp/v8value_ctocpp.h
index fc1b6549..80766b72 100644
--- a/libcef_dll/ctocpp/v8value_ctocpp.h
+++ b/libcef_dll/ctocpp/v8value_ctocpp.h
@@ -21,10 +21,6 @@
 #include <vector>
 #include "include/cef_v8.h"
 #include "include/capi/cef_v8_capi.h"
-#include "include/cef_browser.h"
-#include "include/capi/cef_browser_capi.h"
-#include "include/cef_frame.h"
-#include "include/capi/cef_frame_capi.h"
 #include "libcef_dll/ctocpp/ctocpp.h"
 
 // Wrap a C structure with a C++ class.
diff --git a/libcef_dll/ctocpp/web_urlrequest_client_ctocpp.h b/libcef_dll/ctocpp/web_urlrequest_client_ctocpp.h
index f30707db..405d7380 100644
--- a/libcef_dll/ctocpp/web_urlrequest_client_ctocpp.h
+++ b/libcef_dll/ctocpp/web_urlrequest_client_ctocpp.h
@@ -20,10 +20,6 @@
 
 #include "include/cef_web_urlrequest.h"
 #include "include/capi/cef_web_urlrequest_capi.h"
-#include "include/cef_request.h"
-#include "include/capi/cef_request_capi.h"
-#include "include/cef_response.h"
-#include "include/capi/cef_response_capi.h"
 #include "libcef_dll/ctocpp/ctocpp.h"
 
 // Wrap a C structure with a C++ class.
diff --git a/libcef_dll/ctocpp/web_urlrequest_ctocpp.h b/libcef_dll/ctocpp/web_urlrequest_ctocpp.h
index 399e0a8c..0a363fc0 100644
--- a/libcef_dll/ctocpp/web_urlrequest_ctocpp.h
+++ b/libcef_dll/ctocpp/web_urlrequest_ctocpp.h
@@ -20,10 +20,6 @@
 
 #include "include/cef_web_urlrequest.h"
 #include "include/capi/cef_web_urlrequest_capi.h"
-#include "include/cef_request.h"
-#include "include/capi/cef_request_capi.h"
-#include "include/cef_response.h"
-#include "include/capi/cef_response_capi.h"
 #include "libcef_dll/ctocpp/ctocpp.h"
 
 // Wrap a C structure with a C++ class.
diff --git a/libcef_dll/ctocpp/xml_reader_ctocpp.h b/libcef_dll/ctocpp/xml_reader_ctocpp.h
index e798ab06..eeaad3dd 100644
--- a/libcef_dll/ctocpp/xml_reader_ctocpp.h
+++ b/libcef_dll/ctocpp/xml_reader_ctocpp.h
@@ -20,8 +20,6 @@
 
 #include "include/cef_xml_reader.h"
 #include "include/capi/cef_xml_reader_capi.h"
-#include "include/cef_stream.h"
-#include "include/capi/cef_stream_capi.h"
 #include "libcef_dll/ctocpp/ctocpp.h"
 
 // Wrap a C structure with a C++ class.
diff --git a/libcef_dll/ctocpp/zip_reader_ctocpp.h b/libcef_dll/ctocpp/zip_reader_ctocpp.h
index fa66515d..c9464a7d 100644
--- a/libcef_dll/ctocpp/zip_reader_ctocpp.h
+++ b/libcef_dll/ctocpp/zip_reader_ctocpp.h
@@ -20,8 +20,6 @@
 
 #include "include/cef_zip_reader.h"
 #include "include/capi/cef_zip_reader_capi.h"
-#include "include/cef_stream.h"
-#include "include/capi/cef_stream_capi.h"
 #include "libcef_dll/ctocpp/ctocpp.h"
 
 // Wrap a C structure with a C++ class.