diff --git a/include/cef_browser.h b/include/cef_browser.h
index 03e553be4..540e4b9c6 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 223ab4264..af5cf1755 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 f2d055b9e..2c55445d8 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 078b9630c..79d90e57e 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 a5d22e444..bead6feeb 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 0b4df8cfd..a45b6f52e 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 4b3a7911f..edc40e00d 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 f0db01ee2..b34261241 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 e61b383c4..a8133e91f 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 62753d52d..907d755a8 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 3e1184b1d..bfa01df25 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 40509cc02..81fe115b1 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 40cafcda7..aea8e46bb 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 9c2935af9..d47fbf632 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 f75a73d2e..9bb9f68af 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 9f178b082..ceb005de0 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 0c8c17431..e7a37d1b5 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 d031acec2..939dba72a 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 02ec885fa..6024ce4a9 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 ff77f9b64..5fd82da03 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 9b3be1cf2..c5f471f9a 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 781e0daca..e457e0d8d 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 f417b62b4..9498f06ed 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 5caac8502..eb8994163 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 2fb8fe7db..a1af009ca 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 6fef44eb2..0622ced14 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 06c244c08..94138f843 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 27dcc6ec5..9bb2c68b0 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 79a65736b..b88e246ec 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 acbb97e53..0392777de 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 96b16f871..af58e7049 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 7d46593eb..4685a74ea 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 88a8e379f..247d131bc 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 11244b2bb..f5af7e734 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 d48064542..20086f438 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 6c8d2f86d..a7e2f44af 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 6dea3a479..9289aa503 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 2ae7c11ac..8c9b65c2a 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 9249e8788..1b4c79160 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 122e88132..3b11fb62c 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 fe5d268d1..3dd5d462b 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 a151e0696..e38e705f1 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 e49998b41..c47b338da 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 10cdbdb59..b0dbb8ebd 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 2eeae4a5c..c19fff2ad 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 153fbce6f..d77b908e2 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 3179a9e57..040d782a4 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 c6c159ee7..1dd0886e9 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 a3164753e..086bda36d 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 80e599b4d..1aca5c15a 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 83e3ee2b9..840844eae 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 8d02da2de..1674b2faf 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 5e6ab59ca..2bfbbada8 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 b0ff458bf..8c917e1c8 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 add5338bc..716cc0f5b 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 85f78aab4..d539035fe 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 49f94c5ae..4f8aeb8ab 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 be5e23965..0ee376063 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 e45233c8d..e2644f436 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 bb4995f42..091d85cad 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 e9f24a41f..55feb8430 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 ee6a1c402..91eabc78c 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 e8657b019..7b5e45b48 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 0ceb655df..182c8eb8c 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 31f74c6f8..8c2bf2cf0 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 0bffa2a81..a5b7d4d04 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 042701fe0..1f20efb77 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 86933c8cf..3cd4daa5f 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 be820e4d5..24fff116c 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 601be6125..73279e7fc 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 5eb8db539..27f069086 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 e4a78a45f..421675774 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 90cfd7f72..896bd591c 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 31ba313cc..3ae106e93 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 c2e0f1c9a..a128e7fd6 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 18a494e02..e02de1d6b 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 e972c7270..8966e61a2 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 6cf3c8f73..ea3bba1c3 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 fc1b65499..80766b72a 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 f30707dbf..405d7380c 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 399e0a8c6..0a363fc01 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 e798ab063..eeaad3dd6 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 fa66515dc..c9464a7d3 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.