Add unittests target to the binary distribution (issue #1632)

- Move all tests from the top-level directory to tests/. - Move files shared by cefclient and unittests to tests/shared/. - Add a fused (single header/source file) version of gtest in tests/gtest/ with associated CMake configuration. - Test-only headers are now exposed in include/test/. Unit test targets must define UNIT_TEST in order to access them. - Replace usage of USING_CEF_SHARED with WRAPPING_CEF_SHARED for clarity (only the libcef_dll_wrapper target should define it). - Remove the RENAME_DIRECTORY CMake macro which is no longer used. - Remove C++11 usage from unittests sources for compatibility with the binary distribution configuration. - Windows: Fix build errors due to chrome_elf.dll and imm32.lib missing from the CMake configuration.
2025-06-05 21:39:12 +02:00 · 2016-11-17 18:52:42 -05:00
parent fe419c09ec
commit a76670a3ed
495 changed files with 2386 additions and 1903 deletions
--- a/BUILD.gn
+++ b/BUILD.gn
@@ -198,6 +198,7 @@ group("cef") {
 # Configuration that will be applied to all targets that depend on
 # libcef_static.
 config("libcef_static_config") {
+  # CEF targets use includes relative to the CEF root directory.
  include_dirs = [ "." ]
  defines = [
    "BUILDING_CEF_SHARED",
@@ -863,14 +864,12 @@ static_library("libcef_static") {
 # libcef_dll_wrapper.
 config("libcef_dll_wrapper_config") {
  include_dirs = [
+    # CEF sources use include paths relative to the CEF root directory.
    ".",
-    # Source files included in the binary distrib use include paths relative to
-    # the tests directory.
-    "tests",
-    # For generated include headers.
+    # CEF generates some header files that also need to be discoverable.
+    # They will be copied to the include/ directory in the binary distribution.
    "$root_out_dir/includes",
  ]
-  defines = [ "USING_CEF_SHARED" ]
 }

 # libcef_dll_wrapper target.
@@ -884,6 +883,8 @@ static_library("libcef_dll_wrapper") {
            gypi_paths2.libcef_dll_wrapper_sources_common +
            gypi_paths.autogen_client_side

+  defines = [ "WRAPPING_CEF_SHARED" ]
+
  configs += [ ":libcef_dll_wrapper_config" ]
  public_configs = [ ":libcef_dll_wrapper_config" ]
 }
@@ -896,6 +897,7 @@ static_library("libcef_dll_wrapper") {
 if (is_win) {
  static_library("cef_sandbox") {
    sources = [ "libcef_dll/sandbox/sandbox_win.cc" ]
+    # CEF sources use include paths relative to the CEF root directory.
    include_dirs = [ "." ]
    deps = [ "//sandbox" ]
  }
@@ -1301,112 +1303,6 @@ if (is_mac) {
 # Executable/app targets.
 #

-# cef_unittests shared sources.
-cef_unittests_sources = [
-  "tests/cefclient/browser/client_app_browser.cc",
-  "tests/cefclient/browser/client_app_browser.h",
-  "tests/cefclient/browser/geometry_util.cc",
-  "tests/cefclient/browser/geometry_util.h",
-  "tests/cefclient/browser/main_message_loop.cc",
-  "tests/cefclient/browser/main_message_loop.h",
-  "tests/cefclient/browser/main_message_loop_external_pump.cc",
-  "tests/cefclient/browser/main_message_loop_external_pump.h",
-  "tests/cefclient/browser/main_message_loop_std.cc",
-  "tests/cefclient/browser/main_message_loop_std.h",
-  "tests/cefclient/browser/resource_util.h",
-  "tests/cefclient/browser/resource_util.cc",
-  "tests/cefclient/browser/resource_util.h",
-  "tests/cefclient/common/client_app.cc",
-  "tests/cefclient/common/client_app.h",
-  "tests/cefclient/common/client_app_other.cc",
-  "tests/cefclient/common/client_app_other.h",
-  "tests/cefclient/common/client_switches.cc",
-  "tests/cefclient/common/client_switches.h",
-  "tests/cefclient/renderer/client_app_renderer.cc",
-  "tests/cefclient/renderer/client_app_renderer.h",
-  "tests/cefclient/resources/osr_test.html",
-  "tests/cefclient/resources/pdf.html",
-  "tests/cefclient/resources/pdf.pdf",
-  "tests/cefclient/resources/window_icon.1x.png",
-  "tests/cefclient/resources/window_icon.1x.png",
-  "tests/unittests/browser_info_map_unittest.cc",
-  "tests/unittests/command_line_unittest.cc",
-  "tests/unittests/cookie_unittest.cc",
-  "tests/unittests/dialog_unittest.cc",
-  "tests/unittests/display_unittest.cc",
-  "tests/unittests/dom_unittest.cc",
-  "tests/unittests/download_unittest.cc",
-  "tests/unittests/draggable_regions_unittest.cc",
-  "tests/unittests/file_util.cc",
-  "tests/unittests/file_util.h",
-  "tests/unittests/file_util_unittest.cc",
-  "tests/unittests/frame_unittest.cc",
-  "tests/unittests/geolocation_unittest.cc",
-  "tests/unittests/image_unittest.cc",
-  "tests/unittests/image_util.cc",
-  "tests/unittests/image_util.h",
-  "tests/unittests/jsdialog_unittest.cc",
-  "tests/unittests/life_span_unittest.cc",
-  "tests/unittests/message_router_unittest.cc",
-  "tests/unittests/navigation_unittest.cc",
-  "tests/unittests/os_rendering_unittest.cc",
-  "tests/unittests/parser_unittest.cc",
-  "tests/unittests/plugin_unittest.cc",
-  "tests/unittests/preference_unittest.cc",
-  "tests/unittests/print_unittest.cc",
-  "tests/unittests/process_message_unittest.cc",
-  "tests/unittests/request_context_unittest.cc",
-  "tests/unittests/request_handler_unittest.cc",
-  "tests/unittests/request_unittest.cc",
-  "tests/unittests/resource_manager_unittest.cc",
-  "tests/unittests/routing_test_handler.cc",
-  "tests/unittests/routing_test_handler.h",
-  "tests/unittests/run_all_unittests.cc",
-  "tests/unittests/scheme_handler_unittest.cc",
-  "tests/unittests/scoped_temp_dir_unittest.cc",
-  "tests/unittests/stream_unittest.cc",
-  "tests/unittests/stream_resource_handler_unittest.cc",
-  "tests/unittests/string_unittest.cc",
-  "tests/unittests/client_app_delegates.cc",
-  "tests/unittests/task_unittest.cc",
-  "tests/unittests/test_handler.cc",
-  "tests/unittests/test_handler.h",
-  "tests/unittests/test_suite.cc",
-  "tests/unittests/test_suite.h",
-  "tests/unittests/test_util.cc",
-  "tests/unittests/test_util.h",
-  "tests/unittests/thread_helper.cc",
-  "tests/unittests/thread_helper.h",
-  "tests/unittests/thread_unittest.cc",
-  "tests/unittests/tracing_unittest.cc",
-  "tests/unittests/translator_unittest.cc",
-  "tests/unittests/urlrequest_unittest.cc",
-  "tests/unittests/v8_unittest.cc",
-  "tests/unittests/values_unittest.cc",
-  "tests/unittests/version_unittest.cc",
-  "tests/unittests/waitable_event_unittest.cc",
-  "tests/unittests/webui_unittest.cc",
-  "tests/unittests/xml_reader_unittest.cc",
-  "tests/unittests/zip_reader_unittest.cc",
-]
-
-if (use_aura) {
-  cef_unittests_sources += [
-    "tests/unittests/views/button_unittest.cc",
-    "tests/unittests/views/panel_unittest.cc",
-    "tests/unittests/views/scroll_view_unittest.cc",
-    "tests/unittests/views/test_window_delegate.cc",
-    "tests/unittests/views/test_window_delegate.h",
-    "tests/unittests/views/textfield_unittest.cc",
-    "tests/unittests/views/window_unittest.cc",
-  ]
-}
-
-# cef_unittests shared deps.
-cef_unittests_deps = [
-  "//testing/gtest",
-]
-
 if (is_mac) {
  # Helper for generating the CEF app bundle.
  template("cef_app") {
@@ -1516,7 +1412,8 @@ if (is_mac) {
  #

  bundle_data("cefclient_resources_bundle_data") {
-    sources = gypi_paths2.cefclient_sources_resources + [
+    sources = gypi_paths2.shared_sources_resources +
+              gypi_paths2.cefclient_sources_resources + [
      "tests/cefclient/resources/mac/cefclient.icns",
    ]

@@ -1548,9 +1445,11 @@ if (is_mac) {
    helper_sources = gypi_paths2.includes_mac +
                     gypi_paths2.includes_common +
                     gypi_paths2.includes_wrapper +
+                     gypi_paths2.shared_sources_common +
+                     gypi_paths2.shared_sources_renderer +
+                     gypi_paths2.shared_sources_mac_helper +
                     gypi_paths2.cefclient_sources_common +
-                     gypi_paths2.cefclient_sources_renderer +
-                     gypi_paths2.cefclient_sources_mac_helper
+                     gypi_paths2.cefclient_sources_renderer
    helper_deps = [
      ":libcef_dll_wrapper",
    ]
@@ -1559,6 +1458,9 @@ if (is_mac) {
    sources = gypi_paths2.includes_mac +
              gypi_paths2.includes_common +
              gypi_paths2.includes_wrapper +
+              gypi_paths2.shared_sources_browser +
+              gypi_paths2.shared_sources_common +
+              gypi_paths2.shared_sources_mac +
              gypi_paths2.cefclient_sources_browser +
              gypi_paths2.cefclient_sources_common +
              gypi_paths2.cefclient_sources_mac
@@ -1636,71 +1538,62 @@ if (is_mac) {
  # cef_unittests app targets.
  #

+  bundle_data("cef_unittests_resources_bundle_data") {
+    sources = gypi_paths2.shared_sources_resources + [
+      "tests/unittests/resources/mac/unittests.icns",
+    ]
+
+    outputs = [
+      "{{bundle_resources_dir}}/{{source_file_part}}",
+    ]
+  }
+
+  bundle_data("cef_unittests_resources_bundle_data_english") {
+    sources = [
+      "tests/unittests/resources/mac/English.lproj/InfoPlist.strings",
+    ]
+
+    outputs = [
+      "{{bundle_resources_dir}}/English.lproj/{{source_file_part}}",
+    ]
+  }
+
+  mac_xib_bundle_data("cef_unittests_xibs") {
+    sources = [
+      "tests/unittests/resources/mac/English.lproj/MainMenu.xib",
+    ]
+
+    output_path = "{{bundle_resources_dir}}/English.lproj"
+  }
+
  cef_app("cef_unittests") {
    testonly = true

-    helper_info_plist = "tests/cefclient/resources/mac/helper-Info.plist"
-    helper_sources = [
-      "tests/cefclient/browser/resource_util.cc",
-      "tests/cefclient/browser/resource_util.h",
-      "tests/cefclient/browser/resource_util_mac.mm",
-      "tests/cefclient/browser/resource_util_posix.cc",
-      "tests/cefclient/common/client_app.cc",
-      "tests/cefclient/common/client_app.h",
-      "tests/cefclient/common/client_app_other.cc",
-      "tests/cefclient/common/client_app_other.h",
-      "tests/cefclient/common/client_switches.cc",
-      "tests/cefclient/common/client_switches.h",
-      "tests/cefclient/process_helper_mac.cc",
-      "tests/cefclient/renderer/client_app_renderer.cc",
-      "tests/cefclient/renderer/client_app_renderer.h",
-      "tests/unittests/client_app_delegates.cc",
-      "tests/unittests/cookie_unittest.cc",
-      "tests/unittests/dom_unittest.cc",
-      "tests/unittests/file_util.cc",
-      "tests/unittests/file_util.h",
-      "tests/unittests/frame_unittest.cc",
-      "tests/unittests/message_router_unittest.cc",
-      "tests/unittests/navigation_unittest.cc",
-      "tests/unittests/plugin_unittest.cc",
-      "tests/unittests/preference_unittest.cc",
-      "tests/unittests/process_message_unittest.cc",
-      "tests/unittests/request_handler_unittest.cc",
-      "tests/unittests/request_unittest.cc",
-      "tests/unittests/routing_test_handler.cc",
-      "tests/unittests/routing_test_handler.h",
-      "tests/unittests/scheme_handler_unittest.cc",
-      "tests/unittests/urlrequest_unittest.cc",
-      "tests/unittests/test_handler.cc",
-      "tests/unittests/test_handler.h",
-      "tests/unittests/test_suite.cc",
-      "tests/unittests/test_suite.h",
-      "tests/unittests/test_util.cc",
-      "tests/unittests/test_util.h",
-      "tests/unittests/thread_helper.cc",
-      "tests/unittests/thread_helper.h",
-      "tests/unittests/thread_unittest.cc",
-      "tests/unittests/tracing_unittest.cc",
-      "tests/unittests/v8_unittest.cc",
-    ]
-    helper_deps = cef_unittests_deps + [
+    helper_info_plist = "tests/unittests/resources/mac/helper-Info.plist"
+    helper_sources = gypi_paths2.shared_sources_common +
+                     gypi_paths2.shared_sources_renderer +
+                     gypi_paths2.shared_sources_mac_helper +
+                     gypi_paths2.unittests_sources_mac_helper
+    helper_deps = [
      ":libcef_dll_wrapper",
+      "//testing/gtest",
    ]

-    info_plist = "tests/cefclient/resources/mac/Info.plist"
-    sources = cef_unittests_sources + [
-      "tests/cefclient/browser/main_message_loop_external_pump_mac.mm",
-      "tests/cefclient/browser/resource_util_mac.mm",
-      "tests/cefclient/browser/resource_util_posix.cc",
-      "tests/unittests/os_rendering_unittest_mac.h",
-      "tests/unittests/os_rendering_unittest_mac.mm",
-      "tests/unittests/run_all_unittests_mac.mm",
-    ]
-    deps = cef_unittests_deps + [
-      ":cefclient_resources_bundle_data",
-      ":cefclient_resources_bundle_data_english",
-      ":cefclient_xibs",
+    info_plist = "tests/unittests/resources/mac/Info.plist"
+    sources = gypi_paths2.includes_mac +
+              gypi_paths2.includes_common +
+              gypi_paths2.includes_wrapper +
+              gypi_paths2.shared_sources_browser +
+              gypi_paths2.shared_sources_common +
+              gypi_paths2.shared_sources_mac +
+              gypi_paths2.unittests_sources_common +
+              gypi_paths2.unittests_sources_mac
+    deps = [
+      ":cef_unittests_resources_bundle_data",
+      ":cef_unittests_resources_bundle_data_english",
+      ":cef_unittests_xibs",
      ":libcef_dll_wrapper",
+      "//testing/gtest",
    ]
    libs = [
      "AppKit.framework",
@@ -1732,14 +1625,19 @@ if (is_mac) {

  if (is_linux) {
    copy("copy_cefclient_files") {
-      sources = gypi_paths2.cefclient_sources_resources
-      outputs = [ "${root_out_dir}/files/{{source_file_part}}" ]
+      sources = gypi_paths2.shared_sources_resources +
+                gypi_paths2.cefclient_sources_resources
+      outputs = [ "${root_out_dir}/cefclient_files/{{source_file_part}}" ]
    }
  }

  executable("cefclient") {
    sources = gypi_paths2.includes_common +
              gypi_paths2.includes_wrapper +
+              gypi_paths2.shared_sources_browser +
+              gypi_paths2.shared_sources_common +
+              gypi_paths2.shared_sources_renderer +
+              gypi_paths2.shared_sources_resources +
              gypi_paths2.cefclient_sources_browser +
              gypi_paths2.cefclient_sources_common +
              gypi_paths2.cefclient_sources_renderer +
@@ -1753,6 +1651,7 @@ if (is_mac) {

    if (is_win) {
      sources += gypi_paths2.includes_win +
+                 gypi_paths2.shared_sources_win +
                 gypi_paths2.cefclient_sources_win

      # Set /SUBSYSTEM:WINDOWS.
@@ -1784,6 +1683,7 @@ if (is_mac) {

    if (is_linux) {
      sources += gypi_paths2.includes_linux +
+                 gypi_paths2.shared_sources_linux +
                 gypi_paths2.cefclient_sources_linux

      deps += [
@@ -1868,25 +1768,35 @@ if (is_mac) {
  # cef_unittests targets.
  #
  
+  if (is_linux) {
+    copy("copy_cef_unittests_files") {
+      sources = gypi_paths2.shared_sources_resources
+      outputs = [ "${root_out_dir}/unittests_files/{{source_file_part}}" ]
+    }
+  }
+
  executable("cef_unittests") {
    testonly = true

-    sources = cef_unittests_sources
+    sources = gypi_paths2.includes_common +
+              gypi_paths2.includes_wrapper +
+              gypi_paths2.shared_sources_browser +
+              gypi_paths2.shared_sources_common +
+              gypi_paths2.shared_sources_renderer +
+              gypi_paths2.shared_sources_resources +
+              gypi_paths2.unittests_sources_common +
+              gypi_paths2.unittests_sources_views

-    deps = cef_unittests_deps + [
+    deps = [
      ":libcef",
      ":libcef_dll_wrapper",
      "//build/config/sanitizers:deps",
+      "//testing/gtest",
    ]

    if (is_win) {
-      sources += [
-        "tests/cefclient/browser/main_message_loop_external_pump_win.cc",
-        "tests/cefclient/browser/resource_util_win.cc",
-        "tests/cefclient/browser/util_win.cc",
-        "tests/cefclient/browser/util_win.h",
-        "tests/cefclient/resources/win/cefclient.rc",
-      ]
+      sources += gypi_paths2.shared_sources_win +
+                 gypi_paths2.unittests_sources_win

      defines = [
        "CEF_USE_SANDBOX",
@@ -1899,18 +1809,15 @@ if (is_mac) {
    }

    if (is_linux) {
-      sources += [
-        "tests/cefclient/browser/main_message_loop_external_pump_linux.cc",
-        "tests/cefclient/browser/resource_util_linux.cc",
-        "tests/cefclient/browser/resource_util_posix.cc",
-      ]
+      sources += gypi_paths2.shared_sources_linux +
+                 gypi_paths2.unittests_sources_linux

      libs = [
        "X11",
      ]

      deps += [
-        ":copy_cefclient_files",
+        ":copy_cef_unittests_files",
      ]
    }

--- a/CMakeLists.txt.in
+++ b/CMakeLists.txt.in
@@ -27,8 +27,7 @@
 # CMakeLists.txt              Bootstrap that sets up the CMake environment.
 # cmake/*.cmake               CEF configuration files shared by all targets.
 # libcef_dll/CMakeLists.txt   Defines the libcef_dll_wrapper target.
-# cefclient/CMakeLists.txt    Defines the cefclient target.
-# cefsimple/CMakeLists.txt    Defines the cefsimple target.
+# tests/*/CMakeLists.txt      Defines the test application target.
 #
 # See the "TODO:" comments below for guidance on how to integrate this CEF
 # binary distribution into a new or existing CMake project.
@@ -200,8 +199,10 @@ add_subdirectory(${CEF_LIBCEF_DLL_WRAPPER_PATH} libcef_dll_wrapper)
 # Include application targets.
 # Comes from the <target>/CMakeLists.txt file in the current directory.
 # TODO: Change these lines to match your project target when you copy this file.
-add_subdirectory(cefclient)
-add_subdirectory(cefsimple)
+add_subdirectory(tests/cefclient)
+add_subdirectory(tests/cefsimple)
+add_subdirectory(tests/gtest)
+add_subdirectory(tests/unittests)

 # Display configuration settings.
 PRINT_CEF_CONFIG()
--- a/cef_paths2.gypi
+++ b/cef_paths2.gypi
@@ -133,6 +133,58 @@
      'libcef_dll/wrapper/libcef_dll_wrapper.cc',
      'libcef_dll/wrapper/libcef_dll_wrapper2.cc',
    ],
+    'shared_sources_browser': [
+      'tests/shared/browser/client_app_browser.cc',
+      'tests/shared/browser/client_app_browser.h',
+      'tests/shared/browser/geometry_util.cc',
+      'tests/shared/browser/geometry_util.h',
+      'tests/shared/browser/main_message_loop.cc',
+      'tests/shared/browser/main_message_loop.h',
+      'tests/shared/browser/main_message_loop_external_pump.cc',
+      'tests/shared/browser/main_message_loop_external_pump.h',
+      'tests/shared/browser/main_message_loop_std.cc',
+      'tests/shared/browser/main_message_loop_std.h',
+      'tests/shared/browser/resource_util.h',
+      'tests/shared/browser/resource_util.cc',
+      'tests/shared/browser/resource_util.h',
+    ],
+    'shared_sources_common': [
+      'tests/shared/common/client_app.cc',
+      'tests/shared/common/client_app.h',
+      'tests/shared/common/client_app_other.cc',
+      'tests/shared/common/client_app_other.h',
+      'tests/shared/common/client_switches.cc',
+      'tests/shared/common/client_switches.h',
+    ],
+    'shared_sources_renderer': [
+      'tests/shared/renderer/client_app_renderer.cc',
+      'tests/shared/renderer/client_app_renderer.h',
+    ],
+    'shared_sources_resources': [
+      'tests/shared/resources/osr_test.html',
+      'tests/shared/resources/pdf.html',
+      'tests/shared/resources/pdf.pdf',
+      'tests/shared/resources/window_icon.1x.png',
+      'tests/shared/resources/window_icon.2x.png',
+    ],
+    'shared_sources_linux': [
+      'tests/shared/browser/main_message_loop_external_pump_linux.cc',
+      'tests/shared/browser/resource_util_posix.cc',
+    ],
+    'shared_sources_mac': [
+      'tests/shared/browser/main_message_loop_external_pump_mac.mm',
+      'tests/shared/browser/resource_util_mac.mm',
+      'tests/shared/browser/resource_util_posix.cc',
+    ],
+    'shared_sources_mac_helper': [
+      'tests/shared/process_helper_mac.cc',
+    ],
+    'shared_sources_win': [
+      'tests/shared/browser/main_message_loop_external_pump_win.cc',
+      'tests/shared/browser/resource_util_win.cc',
+      'tests/shared/browser/util_win.cc',
+      'tests/shared/browser/util_win.h',
+    ],
    'cefclient_sources_browser': [
      'tests/cefclient/browser/binding_test.cc',
      'tests/cefclient/browser/binding_test.h',
@@ -140,8 +192,6 @@
      'tests/cefclient/browser/browser_window.h',
      'tests/cefclient/browser/bytes_write_handler.cc',
      'tests/cefclient/browser/bytes_write_handler.h',
-      'tests/cefclient/browser/client_app_browser.cc',
-      'tests/cefclient/browser/client_app_browser.h',
      'tests/cefclient/browser/client_app_delegates_browser.cc',
      'tests/cefclient/browser/client_handler.cc',
      'tests/cefclient/browser/client_handler.h',
@@ -154,26 +204,16 @@
      'tests/cefclient/browser/dialog_test.h',
      'tests/cefclient/browser/drm_test.cc',
      'tests/cefclient/browser/drm_test.h',
-      'tests/cefclient/browser/geometry_util.cc',
-      'tests/cefclient/browser/geometry_util.h',
      'tests/cefclient/browser/main_context.cc',
      'tests/cefclient/browser/main_context.h',
      'tests/cefclient/browser/main_context_impl.cc',
      'tests/cefclient/browser/main_context_impl.h',
-      'tests/cefclient/browser/main_message_loop.h',
-      'tests/cefclient/browser/main_message_loop.cc',
-      'tests/cefclient/browser/main_message_loop_external_pump.cc',
-      'tests/cefclient/browser/main_message_loop_external_pump.h',
-      'tests/cefclient/browser/main_message_loop_std.h',
-      'tests/cefclient/browser/main_message_loop_std.cc',
      'tests/cefclient/browser/osr_dragdrop_events.h',
      'tests/cefclient/browser/osr_renderer.h',
      'tests/cefclient/browser/osr_renderer.cc',
      'tests/cefclient/browser/preferences_test.cc',
      'tests/cefclient/browser/preferences_test.h',
      'tests/cefclient/browser/resource.h',
-      'tests/cefclient/browser/resource_util.cc',
-      'tests/cefclient/browser/resource_util.h',
      'tests/cefclient/browser/response_filter_test.cc',
      'tests/cefclient/browser/response_filter_test.h',
      'tests/cefclient/browser/root_window.cc',
@@ -194,20 +234,12 @@
      'tests/cefclient/browser/window_test_runner.h',
    ],
    'cefclient_sources_common': [
-      'tests/cefclient/common/client_app.cc',
-      'tests/cefclient/common/client_app.h',
      'tests/cefclient/common/client_app_delegates_common.cc',
-      'tests/cefclient/common/client_app_other.cc',
-      'tests/cefclient/common/client_app_other.h',
-      'tests/cefclient/common/client_switches.cc',
-      'tests/cefclient/common/client_switches.h',
      'tests/cefclient/common/scheme_test_common.cc',
      'tests/cefclient/common/scheme_test_common.h',
    ],
    'cefclient_sources_renderer': [
      'tests/cefclient/renderer/client_app_delegates_renderer.cc',
-      'tests/cefclient/renderer/client_app_renderer.cc',
-      'tests/cefclient/renderer/client_app_renderer.h',
      'tests/cefclient/renderer/client_renderer.cc',
      'tests/cefclient/renderer/client_renderer.h',
      'tests/cefclient/renderer/performance_test.cc',
@@ -224,10 +256,7 @@
      'tests/cefclient/resources/logo.png',
      'tests/cefclient/resources/menu_icon.1x.png',
      'tests/cefclient/resources/menu_icon.2x.png',
-      'tests/cefclient/resources/osr_test.html',
      'tests/cefclient/resources/other_tests.html',
-      'tests/cefclient/resources/pdf.html',
-      'tests/cefclient/resources/pdf.pdf',
      'tests/cefclient/resources/performance.html',
      'tests/cefclient/resources/performance2.html',
      'tests/cefclient/resources/preferences.html',
@@ -235,8 +264,6 @@
      'tests/cefclient/resources/transparency.html',
      'tests/cefclient/resources/urlrequest.html',
      'tests/cefclient/resources/window.html',
-      'tests/cefclient/resources/window_icon.1x.png',
-      'tests/cefclient/resources/window_icon.2x.png',
      'tests/cefclient/resources/xmlhttprequest.html',
    ],
    'cefclient_sources_win': [
@@ -245,7 +272,6 @@
      'tests/cefclient/browser/browser_window_std_win.cc',
      'tests/cefclient/browser/browser_window_std_win.h',
      'tests/cefclient/browser/main_context_impl_win.cc',
-      'tests/cefclient/browser/main_message_loop_external_pump_win.cc',
      'tests/cefclient/browser/main_message_loop_multithreaded_win.cc',
      'tests/cefclient/browser/main_message_loop_multithreaded_win.h',
      'tests/cefclient/browser/osr_dragdrop_win.cc',
@@ -254,15 +280,13 @@
      'tests/cefclient/browser/osr_ime_handler_win.h',
      'tests/cefclient/browser/osr_window_win.cc',
      'tests/cefclient/browser/osr_window_win.h',
-      'tests/cefclient/browser/resource_util_win.cc',
+      'tests/cefclient/browser/resource_util_win_idmap.cc',
      'tests/cefclient/browser/root_window_views.cc',
      'tests/cefclient/browser/root_window_views.h',
      'tests/cefclient/browser/root_window_win.cc',
      'tests/cefclient/browser/root_window_win.h',
      'tests/cefclient/browser/temp_window_win.cc',
      'tests/cefclient/browser/temp_window_win.h',
-      'tests/cefclient/browser/util_win.cc',
-      'tests/cefclient/browser/util_win.h',
      'tests/cefclient/browser/views_window.cc',
      'tests/cefclient/browser/views_window.h',
      'tests/cefclient/browser/window_test_runner_views.cc',
@@ -281,9 +305,6 @@
      'tests/cefclient/browser/browser_window_std_mac.h',
      'tests/cefclient/browser/browser_window_std_mac.mm',
      'tests/cefclient/browser/main_context_impl_posix.cc',
-      'tests/cefclient/browser/main_message_loop_external_pump_mac.mm',
-      'tests/cefclient/browser/resource_util_mac.mm',
-      'tests/cefclient/browser/resource_util_posix.cc',
      'tests/cefclient/browser/root_window_mac.h',
      'tests/cefclient/browser/root_window_mac.mm',
      'tests/cefclient/browser/temp_window_mac.h',
@@ -293,9 +314,6 @@
      'tests/cefclient/browser/window_test_runner_mac.h',
      'tests/cefclient/browser/window_test_runner_mac.mm',
      'tests/cefclient/cefclient_mac.mm',
-   ],
-    'cefclient_sources_mac_helper': [
-      'tests/cefclient/process_helper_mac.cc',
   ],
    'cefclient_bundle_resources_mac': [
      'tests/cefclient/resources/mac/cefclient.icns',
@@ -311,11 +329,9 @@
      'tests/cefclient/browser/dialog_handler_gtk.cc',
      'tests/cefclient/browser/dialog_handler_gtk.h',
      'tests/cefclient/browser/main_context_impl_posix.cc',
-      'tests/cefclient/browser/main_message_loop_external_pump_linux.cc',
      'tests/cefclient/browser/print_handler_gtk.cc',
      'tests/cefclient/browser/print_handler_gtk.h',
      'tests/cefclient/browser/resource_util_linux.cc',
-      'tests/cefclient/browser/resource_util_posix.cc',
      'tests/cefclient/browser/root_window_gtk.cc',
      'tests/cefclient/browser/root_window_gtk.h',
      'tests/cefclient/browser/root_window_views.cc',
@@ -362,5 +378,131 @@
      'tests/cefsimple/cefsimple_linux.cc',
      'tests/cefsimple/simple_handler_linux.cc',
    ],
+    'unittests_sources_common': [
+      'tests/unittests/browser_info_map_unittest.cc',
+      'tests/unittests/command_line_unittest.cc',
+      'tests/unittests/cookie_unittest.cc',
+      'tests/unittests/dialog_unittest.cc',
+      'tests/unittests/display_unittest.cc',
+      'tests/unittests/dom_unittest.cc',
+      'tests/unittests/download_unittest.cc',
+      'tests/unittests/draggable_regions_unittest.cc',
+      'tests/unittests/file_util.cc',
+      'tests/unittests/file_util.h',
+      'tests/unittests/file_util_unittest.cc',
+      'tests/unittests/frame_unittest.cc',
+      'tests/unittests/geolocation_unittest.cc',
+      'tests/unittests/image_unittest.cc',
+      'tests/unittests/image_util.cc',
+      'tests/unittests/image_util.h',
+      'tests/unittests/jsdialog_unittest.cc',
+      'tests/unittests/life_span_unittest.cc',
+      'tests/unittests/message_router_unittest.cc',
+      'tests/unittests/navigation_unittest.cc',
+      'tests/unittests/os_rendering_unittest.cc',
+      'tests/unittests/parser_unittest.cc',
+      'tests/unittests/plugin_unittest.cc',
+      'tests/unittests/preference_unittest.cc',
+      'tests/unittests/print_unittest.cc',
+      'tests/unittests/process_message_unittest.cc',
+      'tests/unittests/request_context_unittest.cc',
+      'tests/unittests/request_handler_unittest.cc',
+      'tests/unittests/request_unittest.cc',
+      'tests/unittests/resource.h',
+      'tests/unittests/resource_manager_unittest.cc',
+      'tests/unittests/routing_test_handler.cc',
+      'tests/unittests/routing_test_handler.h',
+      'tests/unittests/run_all_unittests.cc',
+      'tests/unittests/scheme_handler_unittest.cc',
+      'tests/unittests/scoped_temp_dir_unittest.cc',
+      'tests/unittests/stream_unittest.cc',
+      'tests/unittests/stream_resource_handler_unittest.cc',
+      'tests/unittests/string_unittest.cc',
+      'tests/unittests/client_app_delegates.cc',
+      'tests/unittests/task_unittest.cc',
+      'tests/unittests/test_handler.cc',
+      'tests/unittests/test_handler.h',
+      'tests/unittests/test_suite.cc',
+      'tests/unittests/test_suite.h',
+      'tests/unittests/test_util.cc',
+      'tests/unittests/test_util.h',
+      'tests/unittests/thread_helper.cc',
+      'tests/unittests/thread_helper.h',
+      'tests/unittests/thread_unittest.cc',
+      'tests/unittests/tracing_unittest.cc',
+      'tests/unittests/translator_unittest.cc',
+      'tests/unittests/urlrequest_unittest.cc',
+      'tests/unittests/v8_unittest.cc',
+      'tests/unittests/values_unittest.cc',
+      'tests/unittests/version_unittest.cc',
+      'tests/unittests/waitable_event_unittest.cc',
+      'tests/unittests/webui_unittest.cc',
+      'tests/unittests/xml_reader_unittest.cc',
+      'tests/unittests/zip_reader_unittest.cc',
+    ],
+    'unittests_sources_views': [
+      'tests/unittests/views/button_unittest.cc',
+      'tests/unittests/views/panel_unittest.cc',
+      'tests/unittests/views/scroll_view_unittest.cc',
+      'tests/unittests/views/test_window_delegate.cc',
+      'tests/unittests/views/test_window_delegate.h',
+      'tests/unittests/views/textfield_unittest.cc',
+      'tests/unittests/views/window_unittest.cc',
+    ],
+    'unittests_sources_win': [
+      'tests/unittests/resource_util_win_idmap.cc',
+      'tests/unittests/resources/win/cef_unittests.exe.manifest',
+      'tests/unittests/resources/win/unittests.ico',
+      'tests/unittests/resources/win/unittests.rc',
+      'tests/unittests/resources/win/small.ico',
+    ],
+    'unittests_sources_mac': [
+      'tests/unittests/os_rendering_unittest_mac.h',
+      'tests/unittests/os_rendering_unittest_mac.mm',
+      'tests/unittests/run_all_unittests_mac.mm',
+    ],
+    'unittests_sources_mac_helper': [
+      'tests/shared/browser/resource_util.cc',
+      'tests/shared/browser/resource_util.h',
+      'tests/shared/browser/resource_util_mac.mm',
+      'tests/shared/browser/resource_util_posix.cc',
+      'tests/unittests/client_app_delegates.cc',
+      'tests/unittests/cookie_unittest.cc',
+      'tests/unittests/dom_unittest.cc',
+      'tests/unittests/file_util.cc',
+      'tests/unittests/file_util.h',
+      'tests/unittests/frame_unittest.cc',
+      'tests/unittests/message_router_unittest.cc',
+      'tests/unittests/navigation_unittest.cc',
+      'tests/unittests/plugin_unittest.cc',
+      'tests/unittests/preference_unittest.cc',
+      'tests/unittests/process_message_unittest.cc',
+      'tests/unittests/request_handler_unittest.cc',
+      'tests/unittests/request_unittest.cc',
+      'tests/unittests/routing_test_handler.cc',
+      'tests/unittests/routing_test_handler.h',
+      'tests/unittests/scheme_handler_unittest.cc',
+      'tests/unittests/urlrequest_unittest.cc',
+      'tests/unittests/test_handler.cc',
+      'tests/unittests/test_handler.h',
+      'tests/unittests/test_suite.cc',
+      'tests/unittests/test_suite.h',
+      'tests/unittests/test_util.cc',
+      'tests/unittests/test_util.h',
+      'tests/unittests/thread_helper.cc',
+      'tests/unittests/thread_helper.h',
+      'tests/unittests/thread_unittest.cc',
+      'tests/unittests/tracing_unittest.cc',
+      'tests/unittests/v8_unittest.cc',
+    ],
+    'unittests_bundle_resources_mac': [
+      'tests/unittests/resources/mac/unittests.icns',
+      'tests/unittests/resources/mac/English.lproj/InfoPlist.strings',
+      'tests/unittests/resources/mac/English.lproj/MainMenu.xib',
+      'tests/unittests/resources/mac/Info.plist',
+    ],
+    'unittests_sources_linux': [
+      'tests/unittests/resource_util_linux.cc',
+    ],
  },
 }
--- a/cmake/cef_macros.cmake.in
+++ b/cmake/cef_macros.cmake.in
@@ -96,10 +96,12 @@ macro(SET_CEF_TARGET_OUT_DIR)
 endmacro()

 # Copy a list of files from one directory to another. Relative files paths are maintained.
+# The path component of the source |file_list| will be removed.
 macro(COPY_FILES target file_list source_dir target_dir)
  foreach(FILENAME ${file_list})
    set(source_file ${source_dir}/${FILENAME})
-    set(target_file ${target_dir}/${FILENAME})
+    get_filename_component(target_name ${FILENAME} NAME)
+    set(target_file ${target_dir}/${target_name})
    if(IS_DIRECTORY ${source_file})
      add_custom_command(
        TARGET ${target}
@@ -118,19 +120,6 @@ macro(COPY_FILES target file_list source_dir target_dir)
  endforeach()
 endmacro()

-# Rename a directory replacing the target if it already exists.
-macro(RENAME_DIRECTORY target source_dir target_dir)
-  add_custom_command(
-    TARGET ${target}
-    POST_BUILD
-    # Remove the target directory if it already exists.
-    COMMAND ${CMAKE_COMMAND} -E remove_directory "${target_dir}"
-    # Rename the source directory to target directory.
-    COMMAND ${CMAKE_COMMAND} -E rename "${source_dir}" "${target_dir}"
-    VERBATIM
-    )
-endmacro()
-

 #
 # Linux macros.
--- a/cmake/cef_variables.cmake.in
+++ b/cmake/cef_variables.cmake.in
@@ -411,6 +411,7 @@ if(OS_WINDOWS)

  # List of CEF binary files.
  set(CEF_BINARY_FILES
+    chrome_elf.dll
    d3dcompiler_43.dll
    d3dcompiler_47.dll
    libcef.dll
--- a/include/capi/test/cef_translator_test_capi.h
+++ b/include/capi/test/cef_translator_test_capi.h
@@ -38,6 +38,11 @@
 #define CEF_INCLUDE_CAPI_TEST_CEF_TRANSLATOR_TEST_CAPI_H_
 #pragma once

+#if !defined(BUILDING_CEF_SHARED) && !defined(WRAPPING_CEF_SHARED) && \
+    !defined(UNIT_TEST)
+#error This file can be included for unit tests only
+#endif
+
 #include "include/capi/cef_base_capi.h"

 #ifdef __cplusplus
--- a/include/test/cef_translator_test.h
+++ b/include/test/cef_translator_test.h
@@ -35,16 +35,19 @@
 //
 // THIS FILE IS FOR TESTING PURPOSES ONLY.
 //
-// The APIs defined in this file are for testing purposes only. They will not be
-// exposed via the binary distribution. All classes in this file must include
-// the 'no_debugct_check' attribute to avoid problems when building the binary
-// distribution.
+// The APIs defined in this file are for testing purposes only. They should only
+// be included from unit test targets.
 //

 #ifndef CEF_INCLUDE_TEST_CEF_TEST_H_
 #define CEF_INCLUDE_TEST_CEF_TEST_H_
 #pragma once

+#if !defined(BUILDING_CEF_SHARED) && !defined(WRAPPING_CEF_SHARED) && \
+    !defined(UNIT_TEST)
+#error This file can be included for unit tests only
+#endif
+
 #include <map>
 #include <vector>

--- a/libcef_dll/CMakeLists.txt.in
+++ b/libcef_dll/CMakeLists.txt.in
@@ -2,8 +2,6 @@
 # reserved. Use of this source code is governed by a BSD-style license that
 # can be found in the LICENSE file.

-add_definitions(-DUSING_CEF_SHARED)
-
 # Append platform specific sources to a list of sources.
 macro(LIBCEF_APPEND_PLATFORM_SOURCES name_of_list)
  if("${CMAKE_SYSTEM_NAME}" STREQUAL "Darwin" AND ${name_of_list}_MACOSX)
@@ -17,9 +15,11 @@ macro(LIBCEF_APPEND_PLATFORM_SOURCES name_of_list)
  endif()
 endmacro()

+set(CEF_TARGET libcef_dll_wrapper)
+
 {{
  'prefix': 'libcef',
-  'library': 'libcef_dll_wrapper',
+  'library': '${CEF_TARGET}',
  'append_macro': 'LIBCEF_APPEND_PLATFORM_SOURCES',
  'includes': [
    'includes_common',
@@ -35,7 +35,10 @@ endmacro()
    'autogen_client_side',
  ],
 }}
-SET_LIBRARY_TARGET_PROPERTIES(libcef_dll_wrapper)
+SET_LIBRARY_TARGET_PROPERTIES(${CEF_TARGET})
+
+# Creating the CEF wrapper library. Do not define this for dependent targets.
+target_compile_definitions(${CEF_TARGET} PRIVATE -DWRAPPING_CEF_SHARED)

 # Remove the default "lib" prefix from the resulting library.
-set_target_properties(libcef_dll_wrapper PROPERTIES PREFIX "")
+set_target_properties(${CEF_TARGET} PROPERTIES PREFIX "")
--- a/libcef_dll/cpptoc/app_cpptoc.h
+++ b/libcef_dll/cpptoc/app_cpptoc.h
@@ -14,9 +14,9 @@
 #define CEF_LIBCEF_DLL_CPPTOC_APP_CPPTOC_H_
 #pragma once

-#ifndef USING_CEF_SHARED
-#pragma message("Warning: "__FILE__" may be accessed wrapper-side only")
-#else  // USING_CEF_SHARED
+#if !defined(WRAPPING_CEF_SHARED)
+#error This file can be included wrapper-side only
+#endif

 #include "include/cef_app.h"
 #include "include/capi/cef_app_capi.h"
@@ -30,5 +30,4 @@ class CefAppCppToC
  CefAppCppToC();
 };

-#endif  // USING_CEF_SHARED
 #endif  // CEF_LIBCEF_DLL_CPPTOC_APP_CPPTOC_H_
--- a/libcef_dll/cpptoc/auth_callback_cpptoc.h
+++ b/libcef_dll/cpptoc/auth_callback_cpptoc.h
@@ -14,9 +14,9 @@
 #define CEF_LIBCEF_DLL_CPPTOC_AUTH_CALLBACK_CPPTOC_H_
 #pragma once

-#ifndef BUILDING_CEF_SHARED
-#pragma message("Warning: "__FILE__" may be accessed DLL-side only")
-#else  // BUILDING_CEF_SHARED
+#if !defined(BUILDING_CEF_SHARED)
+#error This file can be included DLL-side only
+#endif

 #include "include/cef_auth_callback.h"
 #include "include/capi/cef_auth_callback_capi.h"
@@ -31,5 +31,4 @@ class CefAuthCallbackCppToC
  CefAuthCallbackCppToC();
 };

-#endif  // BUILDING_CEF_SHARED
 #endif  // CEF_LIBCEF_DLL_CPPTOC_AUTH_CALLBACK_CPPTOC_H_
--- a/libcef_dll/cpptoc/base_cpptoc.h
+++ b/libcef_dll/cpptoc/base_cpptoc.h
@@ -10,9 +10,9 @@
 #include "include/capi/cef_base_capi.h"
 #include "libcef_dll/cpptoc/cpptoc.h"

-#ifndef USING_CEF_SHARED
-#pragma message("Warning: "__FILE__" may be accessed wrapper-side only")
-#else  // USING_CEF_SHARED
+#if !defined(WRAPPING_CEF_SHARED)
+#error This file can be included wrapper-side only
+#endif

 // Wrap a C++ class with a C structure.
 class CefBaseCppToC
@@ -21,5 +21,4 @@ class CefBaseCppToC
  CefBaseCppToC();
 };

-#endif  // USING_CEF_SHARED
 #endif  // CEF_LIBCEF_DLL_CPPTOC_BASE_CPPTOC_H_
--- a/libcef_dll/cpptoc/before_download_callback_cpptoc.h
+++ b/libcef_dll/cpptoc/before_download_callback_cpptoc.h
@@ -14,9 +14,9 @@
 #define CEF_LIBCEF_DLL_CPPTOC_BEFORE_DOWNLOAD_CALLBACK_CPPTOC_H_
 #pragma once

-#ifndef BUILDING_CEF_SHARED
-#pragma message("Warning: "__FILE__" may be accessed DLL-side only")
-#else  // BUILDING_CEF_SHARED
+#if !defined(BUILDING_CEF_SHARED)
+#error This file can be included DLL-side only
+#endif

 #include "include/cef_download_handler.h"
 #include "include/capi/cef_download_handler_capi.h"
@@ -31,5 +31,4 @@ class CefBeforeDownloadCallbackCppToC
  CefBeforeDownloadCallbackCppToC();
 };

-#endif  // BUILDING_CEF_SHARED
 #endif  // CEF_LIBCEF_DLL_CPPTOC_BEFORE_DOWNLOAD_CALLBACK_CPPTOC_H_
--- a/libcef_dll/cpptoc/binary_value_cpptoc.h
+++ b/libcef_dll/cpptoc/binary_value_cpptoc.h
@@ -14,9 +14,9 @@
 #define CEF_LIBCEF_DLL_CPPTOC_BINARY_VALUE_CPPTOC_H_
 #pragma once

-#ifndef BUILDING_CEF_SHARED
-#pragma message("Warning: "__FILE__" may be accessed DLL-side only")
-#else  // BUILDING_CEF_SHARED
+#if !defined(BUILDING_CEF_SHARED)
+#error This file can be included DLL-side only
+#endif

 #include "include/cef_values.h"
 #include "include/capi/cef_values_capi.h"
@@ -31,5 +31,4 @@ class CefBinaryValueCppToC
  CefBinaryValueCppToC();
 };

-#endif  // BUILDING_CEF_SHARED
 #endif  // CEF_LIBCEF_DLL_CPPTOC_BINARY_VALUE_CPPTOC_H_
--- a/libcef_dll/cpptoc/browser_cpptoc.h
+++ b/libcef_dll/cpptoc/browser_cpptoc.h
@@ -14,9 +14,9 @@
 #define CEF_LIBCEF_DLL_CPPTOC_BROWSER_CPPTOC_H_
 #pragma once

-#ifndef BUILDING_CEF_SHARED
-#pragma message("Warning: "__FILE__" may be accessed DLL-side only")
-#else  // BUILDING_CEF_SHARED
+#if !defined(BUILDING_CEF_SHARED)
+#error This file can be included DLL-side only
+#endif

 #include "include/cef_browser.h"
 #include "include/capi/cef_browser_capi.h"
@@ -32,5 +32,4 @@ class CefBrowserCppToC
  CefBrowserCppToC();
 };

-#endif  // BUILDING_CEF_SHARED
 #endif  // CEF_LIBCEF_DLL_CPPTOC_BROWSER_CPPTOC_H_
--- a/libcef_dll/cpptoc/browser_host_cpptoc.h
+++ b/libcef_dll/cpptoc/browser_host_cpptoc.h
@@ -14,9 +14,9 @@
 #define CEF_LIBCEF_DLL_CPPTOC_BROWSER_HOST_CPPTOC_H_
 #pragma once

-#ifndef BUILDING_CEF_SHARED
-#pragma message("Warning: "__FILE__" may be accessed DLL-side only")
-#else  // BUILDING_CEF_SHARED
+#if !defined(BUILDING_CEF_SHARED)
+#error This file can be included DLL-side only
+#endif

 #include "include/cef_browser.h"
 #include "include/capi/cef_browser_capi.h"
@@ -33,5 +33,4 @@ class CefBrowserHostCppToC
  CefBrowserHostCppToC();
 };

-#endif  // BUILDING_CEF_SHARED
 #endif  // CEF_LIBCEF_DLL_CPPTOC_BROWSER_HOST_CPPTOC_H_
--- a/libcef_dll/cpptoc/browser_process_handler_cpptoc.h
+++ b/libcef_dll/cpptoc/browser_process_handler_cpptoc.h
@@ -14,9 +14,9 @@
 #define CEF_LIBCEF_DLL_CPPTOC_BROWSER_PROCESS_HANDLER_CPPTOC_H_
 #pragma once

-#ifndef USING_CEF_SHARED
-#pragma message("Warning: "__FILE__" may be accessed wrapper-side only")
-#else  // USING_CEF_SHARED
+#if !defined(WRAPPING_CEF_SHARED)
+#error This file can be included wrapper-side only
+#endif

 #include "include/cef_browser_process_handler.h"
 #include "include/capi/cef_browser_process_handler_capi.h"
@@ -31,5 +31,4 @@ class CefBrowserProcessHandlerCppToC
  CefBrowserProcessHandlerCppToC();
 };

-#endif  // USING_CEF_SHARED
 #endif  // CEF_LIBCEF_DLL_CPPTOC_BROWSER_PROCESS_HANDLER_CPPTOC_H_
--- a/libcef_dll/cpptoc/callback_cpptoc.h
+++ b/libcef_dll/cpptoc/callback_cpptoc.h
@@ -14,9 +14,9 @@
 #define CEF_LIBCEF_DLL_CPPTOC_CALLBACK_CPPTOC_H_
 #pragma once

-#ifndef BUILDING_CEF_SHARED
-#pragma message("Warning: "__FILE__" may be accessed DLL-side only")
-#else  // BUILDING_CEF_SHARED
+#if !defined(BUILDING_CEF_SHARED)
+#error This file can be included DLL-side only
+#endif

 #include "include/cef_callback.h"
 #include "include/capi/cef_callback_capi.h"
@@ -30,5 +30,4 @@ class CefCallbackCppToC
  CefCallbackCppToC();
 };

-#endif  // BUILDING_CEF_SHARED
 #endif  // CEF_LIBCEF_DLL_CPPTOC_CALLBACK_CPPTOC_H_
--- a/libcef_dll/cpptoc/client_cpptoc.h
+++ b/libcef_dll/cpptoc/client_cpptoc.h
@@ -14,9 +14,9 @@
 #define CEF_LIBCEF_DLL_CPPTOC_CLIENT_CPPTOC_H_
 #pragma once

-#ifndef USING_CEF_SHARED
-#pragma message("Warning: "__FILE__" may be accessed wrapper-side only")
-#else  // USING_CEF_SHARED
+#if !defined(WRAPPING_CEF_SHARED)
+#error This file can be included wrapper-side only
+#endif

 #include "include/cef_client.h"
 #include "include/capi/cef_client_capi.h"
@@ -30,5 +30,4 @@ class CefClientCppToC
  CefClientCppToC();
 };

-#endif  // USING_CEF_SHARED
 #endif  // CEF_LIBCEF_DLL_CPPTOC_CLIENT_CPPTOC_H_
--- a/libcef_dll/cpptoc/command_line_cpptoc.h
+++ b/libcef_dll/cpptoc/command_line_cpptoc.h
@@ -14,9 +14,9 @@
 #define CEF_LIBCEF_DLL_CPPTOC_COMMAND_LINE_CPPTOC_H_
 #pragma once

-#ifndef BUILDING_CEF_SHARED
-#pragma message("Warning: "__FILE__" may be accessed DLL-side only")
-#else  // BUILDING_CEF_SHARED
+#if !defined(BUILDING_CEF_SHARED)
+#error This file can be included DLL-side only
+#endif

 #include "include/cef_command_line.h"
 #include "include/capi/cef_command_line_capi.h"
@@ -31,5 +31,4 @@ class CefCommandLineCppToC
  CefCommandLineCppToC();
 };

-#endif  // BUILDING_CEF_SHARED
 #endif  // CEF_LIBCEF_DLL_CPPTOC_COMMAND_LINE_CPPTOC_H_
--- a/libcef_dll/cpptoc/completion_callback_cpptoc.h
+++ b/libcef_dll/cpptoc/completion_callback_cpptoc.h
@@ -14,9 +14,9 @@
 #define CEF_LIBCEF_DLL_CPPTOC_COMPLETION_CALLBACK_CPPTOC_H_
 #pragma once

-#ifndef USING_CEF_SHARED
-#pragma message("Warning: "__FILE__" may be accessed wrapper-side only")
-#else  // USING_CEF_SHARED
+#if !defined(WRAPPING_CEF_SHARED)
+#error This file can be included wrapper-side only
+#endif

 #include "include/cef_callback.h"
 #include "include/capi/cef_callback_capi.h"
@@ -31,5 +31,4 @@ class CefCompletionCallbackCppToC
  CefCompletionCallbackCppToC();
 };

-#endif  // USING_CEF_SHARED
 #endif  // CEF_LIBCEF_DLL_CPPTOC_COMPLETION_CALLBACK_CPPTOC_H_
--- a/libcef_dll/cpptoc/context_menu_handler_cpptoc.h
+++ b/libcef_dll/cpptoc/context_menu_handler_cpptoc.h
@@ -14,9 +14,9 @@
 #define CEF_LIBCEF_DLL_CPPTOC_CONTEXT_MENU_HANDLER_CPPTOC_H_
 #pragma once

-#ifndef USING_CEF_SHARED
-#pragma message("Warning: "__FILE__" may be accessed wrapper-side only")
-#else  // USING_CEF_SHARED
+#if !defined(WRAPPING_CEF_SHARED)
+#error This file can be included wrapper-side only
+#endif

 #include "include/cef_context_menu_handler.h"
 #include "include/capi/cef_context_menu_handler_capi.h"
@@ -31,5 +31,4 @@ class CefContextMenuHandlerCppToC
  CefContextMenuHandlerCppToC();
 };

-#endif  // USING_CEF_SHARED
 #endif  // CEF_LIBCEF_DLL_CPPTOC_CONTEXT_MENU_HANDLER_CPPTOC_H_
--- a/libcef_dll/cpptoc/context_menu_params_cpptoc.h
+++ b/libcef_dll/cpptoc/context_menu_params_cpptoc.h
@@ -14,9 +14,9 @@
 #define CEF_LIBCEF_DLL_CPPTOC_CONTEXT_MENU_PARAMS_CPPTOC_H_
 #pragma once

-#ifndef BUILDING_CEF_SHARED
-#pragma message("Warning: "__FILE__" may be accessed DLL-side only")
-#else  // BUILDING_CEF_SHARED
+#if !defined(BUILDING_CEF_SHARED)
+#error This file can be included DLL-side only
+#endif

 #include "include/cef_context_menu_handler.h"
 #include "include/capi/cef_context_menu_handler_capi.h"
@@ -31,5 +31,4 @@ class CefContextMenuParamsCppToC
  CefContextMenuParamsCppToC();
 };

-#endif  // BUILDING_CEF_SHARED
 #endif  // CEF_LIBCEF_DLL_CPPTOC_CONTEXT_MENU_PARAMS_CPPTOC_H_
--- a/libcef_dll/cpptoc/cookie_manager_cpptoc.h
+++ b/libcef_dll/cpptoc/cookie_manager_cpptoc.h
@@ -14,9 +14,9 @@
 #define CEF_LIBCEF_DLL_CPPTOC_COOKIE_MANAGER_CPPTOC_H_
 #pragma once

-#ifndef BUILDING_CEF_SHARED
-#pragma message("Warning: "__FILE__" may be accessed DLL-side only")
-#else  // BUILDING_CEF_SHARED
+#if !defined(BUILDING_CEF_SHARED)
+#error This file can be included DLL-side only
+#endif

 #include "include/cef_cookie.h"
 #include "include/capi/cef_cookie_capi.h"
@@ -31,5 +31,4 @@ class CefCookieManagerCppToC
  CefCookieManagerCppToC();
 };

-#endif  // BUILDING_CEF_SHARED
 #endif  // CEF_LIBCEF_DLL_CPPTOC_COOKIE_MANAGER_CPPTOC_H_
--- a/libcef_dll/cpptoc/cookie_visitor_cpptoc.h
+++ b/libcef_dll/cpptoc/cookie_visitor_cpptoc.h
@@ -14,9 +14,9 @@
 #define CEF_LIBCEF_DLL_CPPTOC_COOKIE_VISITOR_CPPTOC_H_
 #pragma once

-#ifndef USING_CEF_SHARED
-#pragma message("Warning: "__FILE__" may be accessed wrapper-side only")
-#else  // USING_CEF_SHARED
+#if !defined(WRAPPING_CEF_SHARED)
+#error This file can be included wrapper-side only
+#endif

 #include "include/cef_cookie.h"
 #include "include/capi/cef_cookie_capi.h"
@@ -31,5 +31,4 @@ class CefCookieVisitorCppToC
  CefCookieVisitorCppToC();
 };

-#endif  // USING_CEF_SHARED
 #endif  // CEF_LIBCEF_DLL_CPPTOC_COOKIE_VISITOR_CPPTOC_H_
--- a/libcef_dll/cpptoc/delete_cookies_callback_cpptoc.h
+++ b/libcef_dll/cpptoc/delete_cookies_callback_cpptoc.h
@@ -14,9 +14,9 @@
 #define CEF_LIBCEF_DLL_CPPTOC_DELETE_COOKIES_CALLBACK_CPPTOC_H_
 #pragma once

-#ifndef USING_CEF_SHARED
-#pragma message("Warning: "__FILE__" may be accessed wrapper-side only")
-#else  // USING_CEF_SHARED
+#if !defined(WRAPPING_CEF_SHARED)
+#error This file can be included wrapper-side only
+#endif

 #include "include/cef_cookie.h"
 #include "include/capi/cef_cookie_capi.h"
@@ -31,5 +31,4 @@ class CefDeleteCookiesCallbackCppToC
  CefDeleteCookiesCallbackCppToC();
 };

-#endif  // USING_CEF_SHARED
 #endif  // CEF_LIBCEF_DLL_CPPTOC_DELETE_COOKIES_CALLBACK_CPPTOC_H_
--- a/libcef_dll/cpptoc/dialog_handler_cpptoc.h
+++ b/libcef_dll/cpptoc/dialog_handler_cpptoc.h
@@ -14,9 +14,9 @@
 #define CEF_LIBCEF_DLL_CPPTOC_DIALOG_HANDLER_CPPTOC_H_
 #pragma once

-#ifndef USING_CEF_SHARED
-#pragma message("Warning: "__FILE__" may be accessed wrapper-side only")
-#else  // USING_CEF_SHARED
+#if !defined(WRAPPING_CEF_SHARED)
+#error This file can be included wrapper-side only
+#endif

 #include "include/cef_dialog_handler.h"
 #include "include/capi/cef_dialog_handler_capi.h"
@@ -31,5 +31,4 @@ class CefDialogHandlerCppToC
  CefDialogHandlerCppToC();
 };

-#endif  // USING_CEF_SHARED
 #endif  // CEF_LIBCEF_DLL_CPPTOC_DIALOG_HANDLER_CPPTOC_H_
--- a/libcef_dll/cpptoc/dictionary_value_cpptoc.h
+++ b/libcef_dll/cpptoc/dictionary_value_cpptoc.h
@@ -14,9 +14,9 @@
 #define CEF_LIBCEF_DLL_CPPTOC_DICTIONARY_VALUE_CPPTOC_H_
 #pragma once

-#ifndef BUILDING_CEF_SHARED
-#pragma message("Warning: "__FILE__" may be accessed DLL-side only")
-#else  // BUILDING_CEF_SHARED
+#if !defined(BUILDING_CEF_SHARED)
+#error This file can be included DLL-side only
+#endif

 #include "include/cef_values.h"
 #include "include/capi/cef_values_capi.h"
@@ -31,5 +31,4 @@ class CefDictionaryValueCppToC
  CefDictionaryValueCppToC();
 };

-#endif  // BUILDING_CEF_SHARED
 #endif  // CEF_LIBCEF_DLL_CPPTOC_DICTIONARY_VALUE_CPPTOC_H_
--- a/libcef_dll/cpptoc/display_handler_cpptoc.h
+++ b/libcef_dll/cpptoc/display_handler_cpptoc.h
@@ -14,9 +14,9 @@
 #define CEF_LIBCEF_DLL_CPPTOC_DISPLAY_HANDLER_CPPTOC_H_
 #pragma once

-#ifndef USING_CEF_SHARED
-#pragma message("Warning: "__FILE__" may be accessed wrapper-side only")
-#else  // USING_CEF_SHARED
+#if !defined(WRAPPING_CEF_SHARED)
+#error This file can be included wrapper-side only
+#endif

 #include "include/cef_display_handler.h"
 #include "include/capi/cef_display_handler_capi.h"
@@ -31,5 +31,4 @@ class CefDisplayHandlerCppToC
  CefDisplayHandlerCppToC();
 };

-#endif  // USING_CEF_SHARED
 #endif  // CEF_LIBCEF_DLL_CPPTOC_DISPLAY_HANDLER_CPPTOC_H_
--- a/libcef_dll/cpptoc/domdocument_cpptoc.h
+++ b/libcef_dll/cpptoc/domdocument_cpptoc.h
@@ -14,9 +14,9 @@
 #define CEF_LIBCEF_DLL_CPPTOC_DOMDOCUMENT_CPPTOC_H_
 #pragma once

-#ifndef BUILDING_CEF_SHARED
-#pragma message("Warning: "__FILE__" may be accessed DLL-side only")
-#else  // BUILDING_CEF_SHARED
+#if !defined(BUILDING_CEF_SHARED)
+#error This file can be included DLL-side only
+#endif

 #include "include/cef_dom.h"
 #include "include/capi/cef_dom_capi.h"
@@ -31,5 +31,4 @@ class CefDOMDocumentCppToC
  CefDOMDocumentCppToC();
 };

-#endif  // BUILDING_CEF_SHARED
 #endif  // CEF_LIBCEF_DLL_CPPTOC_DOMDOCUMENT_CPPTOC_H_
--- a/libcef_dll/cpptoc/domnode_cpptoc.h
+++ b/libcef_dll/cpptoc/domnode_cpptoc.h
@@ -14,9 +14,9 @@
 #define CEF_LIBCEF_DLL_CPPTOC_DOMNODE_CPPTOC_H_
 #pragma once

-#ifndef BUILDING_CEF_SHARED
-#pragma message("Warning: "__FILE__" may be accessed DLL-side only")
-#else  // BUILDING_CEF_SHARED
+#if !defined(BUILDING_CEF_SHARED)
+#error This file can be included DLL-side only
+#endif

 #include "include/cef_dom.h"
 #include "include/capi/cef_dom_capi.h"
@@ -30,5 +30,4 @@ class CefDOMNodeCppToC
  CefDOMNodeCppToC();
 };

-#endif  // BUILDING_CEF_SHARED
 #endif  // CEF_LIBCEF_DLL_CPPTOC_DOMNODE_CPPTOC_H_
--- a/libcef_dll/cpptoc/domvisitor_cpptoc.h
+++ b/libcef_dll/cpptoc/domvisitor_cpptoc.h
@@ -14,9 +14,9 @@
 #define CEF_LIBCEF_DLL_CPPTOC_DOMVISITOR_CPPTOC_H_
 #pragma once

-#ifndef USING_CEF_SHARED
-#pragma message("Warning: "__FILE__" may be accessed wrapper-side only")
-#else  // USING_CEF_SHARED
+#if !defined(WRAPPING_CEF_SHARED)
+#error This file can be included wrapper-side only
+#endif

 #include "include/cef_dom.h"
 #include "include/capi/cef_dom_capi.h"
@@ -30,5 +30,4 @@ class CefDOMVisitorCppToC
  CefDOMVisitorCppToC();
 };

-#endif  // USING_CEF_SHARED
 #endif  // CEF_LIBCEF_DLL_CPPTOC_DOMVISITOR_CPPTOC_H_
--- a/libcef_dll/cpptoc/download_handler_cpptoc.h
+++ b/libcef_dll/cpptoc/download_handler_cpptoc.h
@@ -14,9 +14,9 @@
 #define CEF_LIBCEF_DLL_CPPTOC_DOWNLOAD_HANDLER_CPPTOC_H_
 #pragma once

-#ifndef USING_CEF_SHARED
-#pragma message("Warning: "__FILE__" may be accessed wrapper-side only")
-#else  // USING_CEF_SHARED
+#if !defined(WRAPPING_CEF_SHARED)
+#error This file can be included wrapper-side only
+#endif

 #include "include/cef_download_handler.h"
 #include "include/capi/cef_download_handler_capi.h"
@@ -31,5 +31,4 @@ class CefDownloadHandlerCppToC
  CefDownloadHandlerCppToC();
 };

-#endif  // USING_CEF_SHARED
 #endif  // CEF_LIBCEF_DLL_CPPTOC_DOWNLOAD_HANDLER_CPPTOC_H_
--- a/libcef_dll/cpptoc/download_image_callback_cpptoc.h
+++ b/libcef_dll/cpptoc/download_image_callback_cpptoc.h
@@ -14,9 +14,9 @@
 #define CEF_LIBCEF_DLL_CPPTOC_DOWNLOAD_IMAGE_CALLBACK_CPPTOC_H_
 #pragma once

-#ifndef USING_CEF_SHARED
-#pragma message("Warning: "__FILE__" may be accessed wrapper-side only")
-#else  // USING_CEF_SHARED
+#if !defined(WRAPPING_CEF_SHARED)
+#error This file can be included wrapper-side only
+#endif

 #include "include/cef_browser.h"
 #include "include/capi/cef_browser_capi.h"
@@ -33,5 +33,4 @@ class CefDownloadImageCallbackCppToC
  CefDownloadImageCallbackCppToC();
 };

-#endif  // USING_CEF_SHARED
 #endif  // CEF_LIBCEF_DLL_CPPTOC_DOWNLOAD_IMAGE_CALLBACK_CPPTOC_H_
--- a/libcef_dll/cpptoc/download_item_callback_cpptoc.h
+++ b/libcef_dll/cpptoc/download_item_callback_cpptoc.h
@@ -14,9 +14,9 @@
 #define CEF_LIBCEF_DLL_CPPTOC_DOWNLOAD_ITEM_CALLBACK_CPPTOC_H_
 #pragma once

-#ifndef BUILDING_CEF_SHARED
-#pragma message("Warning: "__FILE__" may be accessed DLL-side only")
-#else  // BUILDING_CEF_SHARED
+#if !defined(BUILDING_CEF_SHARED)
+#error This file can be included DLL-side only
+#endif

 #include "include/cef_download_handler.h"
 #include "include/capi/cef_download_handler_capi.h"
@@ -31,5 +31,4 @@ class CefDownloadItemCallbackCppToC
  CefDownloadItemCallbackCppToC();
 };

-#endif  // BUILDING_CEF_SHARED
 #endif  // CEF_LIBCEF_DLL_CPPTOC_DOWNLOAD_ITEM_CALLBACK_CPPTOC_H_
--- a/libcef_dll/cpptoc/download_item_cpptoc.h
+++ b/libcef_dll/cpptoc/download_item_cpptoc.h
@@ -14,9 +14,9 @@
 #define CEF_LIBCEF_DLL_CPPTOC_DOWNLOAD_ITEM_CPPTOC_H_
 #pragma once

-#ifndef BUILDING_CEF_SHARED
-#pragma message("Warning: "__FILE__" may be accessed DLL-side only")
-#else  // BUILDING_CEF_SHARED
+#if !defined(BUILDING_CEF_SHARED)
+#error This file can be included DLL-side only
+#endif

 #include "include/cef_download_item.h"
 #include "include/capi/cef_download_item_capi.h"
@@ -31,5 +31,4 @@ class CefDownloadItemCppToC
  CefDownloadItemCppToC();
 };

-#endif  // BUILDING_CEF_SHARED
 #endif  // CEF_LIBCEF_DLL_CPPTOC_DOWNLOAD_ITEM_CPPTOC_H_
--- a/libcef_dll/cpptoc/drag_data_cpptoc.h
+++ b/libcef_dll/cpptoc/drag_data_cpptoc.h
@@ -14,9 +14,9 @@
 #define CEF_LIBCEF_DLL_CPPTOC_DRAG_DATA_CPPTOC_H_
 #pragma once

-#ifndef BUILDING_CEF_SHARED
-#pragma message("Warning: "__FILE__" may be accessed DLL-side only")
-#else  // BUILDING_CEF_SHARED
+#if !defined(BUILDING_CEF_SHARED)
+#error This file can be included DLL-side only
+#endif

 #include "include/cef_drag_data.h"
 #include "include/capi/cef_drag_data_capi.h"
@@ -30,5 +30,4 @@ class CefDragDataCppToC
  CefDragDataCppToC();
 };

-#endif  // BUILDING_CEF_SHARED
 #endif  // CEF_LIBCEF_DLL_CPPTOC_DRAG_DATA_CPPTOC_H_
--- a/libcef_dll/cpptoc/drag_handler_cpptoc.h
+++ b/libcef_dll/cpptoc/drag_handler_cpptoc.h
@@ -14,9 +14,9 @@
 #define CEF_LIBCEF_DLL_CPPTOC_DRAG_HANDLER_CPPTOC_H_
 #pragma once

-#ifndef USING_CEF_SHARED
-#pragma message("Warning: "__FILE__" may be accessed wrapper-side only")
-#else  // USING_CEF_SHARED
+#if !defined(WRAPPING_CEF_SHARED)
+#error This file can be included wrapper-side only
+#endif

 #include "include/cef_drag_handler.h"
 #include "include/capi/cef_drag_handler_capi.h"
@@ -31,5 +31,4 @@ class CefDragHandlerCppToC
  CefDragHandlerCppToC();
 };

-#endif  // USING_CEF_SHARED
 #endif  // CEF_LIBCEF_DLL_CPPTOC_DRAG_HANDLER_CPPTOC_H_
--- a/libcef_dll/cpptoc/end_tracing_callback_cpptoc.h
+++ b/libcef_dll/cpptoc/end_tracing_callback_cpptoc.h
@@ -14,9 +14,9 @@
 #define CEF_LIBCEF_DLL_CPPTOC_END_TRACING_CALLBACK_CPPTOC_H_
 #pragma once

-#ifndef USING_CEF_SHARED
-#pragma message("Warning: "__FILE__" may be accessed wrapper-side only")
-#else  // USING_CEF_SHARED
+#if !defined(WRAPPING_CEF_SHARED)
+#error This file can be included wrapper-side only
+#endif

 #include "include/cef_trace.h"
 #include "include/capi/cef_trace_capi.h"
@@ -31,5 +31,4 @@ class CefEndTracingCallbackCppToC
  CefEndTracingCallbackCppToC();
 };

-#endif  // USING_CEF_SHARED
 #endif  // CEF_LIBCEF_DLL_CPPTOC_END_TRACING_CALLBACK_CPPTOC_H_
--- a/libcef_dll/cpptoc/file_dialog_callback_cpptoc.h
+++ b/libcef_dll/cpptoc/file_dialog_callback_cpptoc.h
@@ -14,9 +14,9 @@
 #define CEF_LIBCEF_DLL_CPPTOC_FILE_DIALOG_CALLBACK_CPPTOC_H_
 #pragma once

-#ifndef BUILDING_CEF_SHARED
-#pragma message("Warning: "__FILE__" may be accessed DLL-side only")
-#else  // BUILDING_CEF_SHARED
+#if !defined(BUILDING_CEF_SHARED)
+#error This file can be included DLL-side only
+#endif

 #include "include/cef_dialog_handler.h"
 #include "include/capi/cef_dialog_handler_capi.h"
@@ -31,5 +31,4 @@ class CefFileDialogCallbackCppToC
  CefFileDialogCallbackCppToC();
 };

-#endif  // BUILDING_CEF_SHARED
 #endif  // CEF_LIBCEF_DLL_CPPTOC_FILE_DIALOG_CALLBACK_CPPTOC_H_
--- a/libcef_dll/cpptoc/find_handler_cpptoc.h
+++ b/libcef_dll/cpptoc/find_handler_cpptoc.h
@@ -14,9 +14,9 @@
 #define CEF_LIBCEF_DLL_CPPTOC_FIND_HANDLER_CPPTOC_H_
 #pragma once

-#ifndef USING_CEF_SHARED
-#pragma message("Warning: "__FILE__" may be accessed wrapper-side only")
-#else  // USING_CEF_SHARED
+#if !defined(WRAPPING_CEF_SHARED)
+#error This file can be included wrapper-side only
+#endif

 #include "include/cef_find_handler.h"
 #include "include/capi/cef_find_handler_capi.h"
@@ -31,5 +31,4 @@ class CefFindHandlerCppToC
  CefFindHandlerCppToC();
 };

-#endif  // USING_CEF_SHARED
 #endif  // CEF_LIBCEF_DLL_CPPTOC_FIND_HANDLER_CPPTOC_H_
--- a/libcef_dll/cpptoc/focus_handler_cpptoc.h
+++ b/libcef_dll/cpptoc/focus_handler_cpptoc.h
@@ -14,9 +14,9 @@
 #define CEF_LIBCEF_DLL_CPPTOC_FOCUS_HANDLER_CPPTOC_H_
 #pragma once

-#ifndef USING_CEF_SHARED
-#pragma message("Warning: "__FILE__" may be accessed wrapper-side only")
-#else  // USING_CEF_SHARED
+#if !defined(WRAPPING_CEF_SHARED)
+#error This file can be included wrapper-side only
+#endif

 #include "include/cef_focus_handler.h"
 #include "include/capi/cef_focus_handler_capi.h"
@@ -31,5 +31,4 @@ class CefFocusHandlerCppToC
  CefFocusHandlerCppToC();
 };

-#endif  // USING_CEF_SHARED
 #endif  // CEF_LIBCEF_DLL_CPPTOC_FOCUS_HANDLER_CPPTOC_H_
--- a/libcef_dll/cpptoc/frame_cpptoc.h
+++ b/libcef_dll/cpptoc/frame_cpptoc.h
@@ -14,9 +14,9 @@
 #define CEF_LIBCEF_DLL_CPPTOC_FRAME_CPPTOC_H_
 #pragma once

-#ifndef BUILDING_CEF_SHARED
-#pragma message("Warning: "__FILE__" may be accessed DLL-side only")
-#else  // BUILDING_CEF_SHARED
+#if !defined(BUILDING_CEF_SHARED)
+#error This file can be included DLL-side only
+#endif

 #include "include/cef_frame.h"
 #include "include/capi/cef_frame_capi.h"
@@ -34,5 +34,4 @@ class CefFrameCppToC
  CefFrameCppToC();
 };

-#endif  // BUILDING_CEF_SHARED
 #endif  // CEF_LIBCEF_DLL_CPPTOC_FRAME_CPPTOC_H_
--- a/libcef_dll/cpptoc/geolocation_callback_cpptoc.h
+++ b/libcef_dll/cpptoc/geolocation_callback_cpptoc.h
@@ -14,9 +14,9 @@
 #define CEF_LIBCEF_DLL_CPPTOC_GEOLOCATION_CALLBACK_CPPTOC_H_
 #pragma once

-#ifndef BUILDING_CEF_SHARED
-#pragma message("Warning: "__FILE__" may be accessed DLL-side only")
-#else  // BUILDING_CEF_SHARED
+#if !defined(BUILDING_CEF_SHARED)
+#error This file can be included DLL-side only
+#endif

 #include "include/cef_geolocation_handler.h"
 #include "include/capi/cef_geolocation_handler_capi.h"
@@ -31,5 +31,4 @@ class CefGeolocationCallbackCppToC
  CefGeolocationCallbackCppToC();
 };

-#endif  // BUILDING_CEF_SHARED
 #endif  // CEF_LIBCEF_DLL_CPPTOC_GEOLOCATION_CALLBACK_CPPTOC_H_
--- a/libcef_dll/cpptoc/geolocation_handler_cpptoc.h
+++ b/libcef_dll/cpptoc/geolocation_handler_cpptoc.h
@@ -14,9 +14,9 @@
 #define CEF_LIBCEF_DLL_CPPTOC_GEOLOCATION_HANDLER_CPPTOC_H_
 #pragma once

-#ifndef USING_CEF_SHARED
-#pragma message("Warning: "__FILE__" may be accessed wrapper-side only")
-#else  // USING_CEF_SHARED
+#if !defined(WRAPPING_CEF_SHARED)
+#error This file can be included wrapper-side only
+#endif

 #include "include/cef_geolocation_handler.h"
 #include "include/capi/cef_geolocation_handler_capi.h"
@@ -31,5 +31,4 @@ class CefGeolocationHandlerCppToC
  CefGeolocationHandlerCppToC();
 };

-#endif  // USING_CEF_SHARED
 #endif  // CEF_LIBCEF_DLL_CPPTOC_GEOLOCATION_HANDLER_CPPTOC_H_
--- a/libcef_dll/cpptoc/get_geolocation_callback_cpptoc.h
+++ b/libcef_dll/cpptoc/get_geolocation_callback_cpptoc.h
@@ -14,9 +14,9 @@
 #define CEF_LIBCEF_DLL_CPPTOC_GET_GEOLOCATION_CALLBACK_CPPTOC_H_
 #pragma once

-#ifndef USING_CEF_SHARED
-#pragma message("Warning: "__FILE__" may be accessed wrapper-side only")
-#else  // USING_CEF_SHARED
+#if !defined(WRAPPING_CEF_SHARED)
+#error This file can be included wrapper-side only
+#endif

 #include "include/cef_geolocation.h"
 #include "include/capi/cef_geolocation_capi.h"
@@ -31,5 +31,4 @@ class CefGetGeolocationCallbackCppToC
  CefGetGeolocationCallbackCppToC();
 };

-#endif  // USING_CEF_SHARED
 #endif  // CEF_LIBCEF_DLL_CPPTOC_GET_GEOLOCATION_CALLBACK_CPPTOC_H_
--- a/libcef_dll/cpptoc/image_cpptoc.h
+++ b/libcef_dll/cpptoc/image_cpptoc.h
@@ -14,9 +14,9 @@
 #define CEF_LIBCEF_DLL_CPPTOC_IMAGE_CPPTOC_H_
 #pragma once

-#ifndef BUILDING_CEF_SHARED
-#pragma message("Warning: "__FILE__" may be accessed DLL-side only")
-#else  // BUILDING_CEF_SHARED
+#if !defined(BUILDING_CEF_SHARED)
+#error This file can be included DLL-side only
+#endif

 #include "include/cef_image.h"
 #include "include/capi/cef_image_capi.h"
@@ -30,5 +30,4 @@ class CefImageCppToC
  CefImageCppToC();
 };

-#endif  // BUILDING_CEF_SHARED
 #endif  // CEF_LIBCEF_DLL_CPPTOC_IMAGE_CPPTOC_H_
--- a/libcef_dll/cpptoc/jsdialog_callback_cpptoc.h
+++ b/libcef_dll/cpptoc/jsdialog_callback_cpptoc.h
@@ -14,9 +14,9 @@
 #define CEF_LIBCEF_DLL_CPPTOC_JSDIALOG_CALLBACK_CPPTOC_H_
 #pragma once

-#ifndef BUILDING_CEF_SHARED
-#pragma message("Warning: "__FILE__" may be accessed DLL-side only")
-#else  // BUILDING_CEF_SHARED
+#if !defined(BUILDING_CEF_SHARED)
+#error This file can be included DLL-side only
+#endif

 #include "include/cef_jsdialog_handler.h"
 #include "include/capi/cef_jsdialog_handler_capi.h"
@@ -31,5 +31,4 @@ class CefJSDialogCallbackCppToC
  CefJSDialogCallbackCppToC();
 };

-#endif  // BUILDING_CEF_SHARED
 #endif  // CEF_LIBCEF_DLL_CPPTOC_JSDIALOG_CALLBACK_CPPTOC_H_
--- a/libcef_dll/cpptoc/jsdialog_handler_cpptoc.h
+++ b/libcef_dll/cpptoc/jsdialog_handler_cpptoc.h
@@ -14,9 +14,9 @@
 #define CEF_LIBCEF_DLL_CPPTOC_JSDIALOG_HANDLER_CPPTOC_H_
 #pragma once

-#ifndef USING_CEF_SHARED
-#pragma message("Warning: "__FILE__" may be accessed wrapper-side only")
-#else  // USING_CEF_SHARED
+#if !defined(WRAPPING_CEF_SHARED)
+#error This file can be included wrapper-side only
+#endif

 #include "include/cef_jsdialog_handler.h"
 #include "include/capi/cef_jsdialog_handler_capi.h"
@@ -31,5 +31,4 @@ class CefJSDialogHandlerCppToC
  CefJSDialogHandlerCppToC();
 };

-#endif  // USING_CEF_SHARED
 #endif  // CEF_LIBCEF_DLL_CPPTOC_JSDIALOG_HANDLER_CPPTOC_H_
--- a/libcef_dll/cpptoc/keyboard_handler_cpptoc.h
+++ b/libcef_dll/cpptoc/keyboard_handler_cpptoc.h
@@ -14,9 +14,9 @@
 #define CEF_LIBCEF_DLL_CPPTOC_KEYBOARD_HANDLER_CPPTOC_H_
 #pragma once

-#ifndef USING_CEF_SHARED
-#pragma message("Warning: "__FILE__" may be accessed wrapper-side only")
-#else  // USING_CEF_SHARED
+#if !defined(WRAPPING_CEF_SHARED)
+#error This file can be included wrapper-side only
+#endif

 #include "include/cef_keyboard_handler.h"
 #include "include/capi/cef_keyboard_handler_capi.h"
@@ -31,5 +31,4 @@ class CefKeyboardHandlerCppToC
  CefKeyboardHandlerCppToC();
 };

-#endif  // USING_CEF_SHARED
 #endif  // CEF_LIBCEF_DLL_CPPTOC_KEYBOARD_HANDLER_CPPTOC_H_
--- a/libcef_dll/cpptoc/life_span_handler_cpptoc.h
+++ b/libcef_dll/cpptoc/life_span_handler_cpptoc.h
@@ -14,9 +14,9 @@
 #define CEF_LIBCEF_DLL_CPPTOC_LIFE_SPAN_HANDLER_CPPTOC_H_
 #pragma once

-#ifndef USING_CEF_SHARED
-#pragma message("Warning: "__FILE__" may be accessed wrapper-side only")
-#else  // USING_CEF_SHARED
+#if !defined(WRAPPING_CEF_SHARED)
+#error This file can be included wrapper-side only
+#endif

 #include "include/cef_life_span_handler.h"
 #include "include/capi/cef_life_span_handler_capi.h"
@@ -33,5 +33,4 @@ class CefLifeSpanHandlerCppToC
  CefLifeSpanHandlerCppToC();
 };

-#endif  // USING_CEF_SHARED
 #endif  // CEF_LIBCEF_DLL_CPPTOC_LIFE_SPAN_HANDLER_CPPTOC_H_
--- a/libcef_dll/cpptoc/list_value_cpptoc.h
+++ b/libcef_dll/cpptoc/list_value_cpptoc.h
@@ -14,9 +14,9 @@
 #define CEF_LIBCEF_DLL_CPPTOC_LIST_VALUE_CPPTOC_H_
 #pragma once

-#ifndef BUILDING_CEF_SHARED
-#pragma message("Warning: "__FILE__" may be accessed DLL-side only")
-#else  // BUILDING_CEF_SHARED
+#if !defined(BUILDING_CEF_SHARED)
+#error This file can be included DLL-side only
+#endif

 #include "include/cef_values.h"
 #include "include/capi/cef_values_capi.h"
@@ -30,5 +30,4 @@ class CefListValueCppToC
  CefListValueCppToC();
 };

-#endif  // BUILDING_CEF_SHARED
 #endif  // CEF_LIBCEF_DLL_CPPTOC_LIST_VALUE_CPPTOC_H_
--- a/libcef_dll/cpptoc/load_handler_cpptoc.h
+++ b/libcef_dll/cpptoc/load_handler_cpptoc.h
@@ -14,9 +14,9 @@
 #define CEF_LIBCEF_DLL_CPPTOC_LOAD_HANDLER_CPPTOC_H_
 #pragma once

-#ifndef USING_CEF_SHARED
-#pragma message("Warning: "__FILE__" may be accessed wrapper-side only")
-#else  // USING_CEF_SHARED
+#if !defined(WRAPPING_CEF_SHARED)
+#error This file can be included wrapper-side only
+#endif

 #include "include/cef_load_handler.h"
 #include "include/capi/cef_load_handler_capi.h"
@@ -31,5 +31,4 @@ class CefLoadHandlerCppToC
  CefLoadHandlerCppToC();
 };

-#endif  // USING_CEF_SHARED
 #endif  // CEF_LIBCEF_DLL_CPPTOC_LOAD_HANDLER_CPPTOC_H_
--- a/libcef_dll/cpptoc/menu_model_cpptoc.h
+++ b/libcef_dll/cpptoc/menu_model_cpptoc.h
@@ -14,9 +14,9 @@
 #define CEF_LIBCEF_DLL_CPPTOC_MENU_MODEL_CPPTOC_H_
 #pragma once

-#ifndef BUILDING_CEF_SHARED
-#pragma message("Warning: "__FILE__" may be accessed DLL-side only")
-#else  // BUILDING_CEF_SHARED
+#if !defined(BUILDING_CEF_SHARED)
+#error This file can be included DLL-side only
+#endif

 #include "include/cef_menu_model.h"
 #include "include/capi/cef_menu_model_capi.h"
@@ -30,5 +30,4 @@ class CefMenuModelCppToC
  CefMenuModelCppToC();
 };

-#endif  // BUILDING_CEF_SHARED
 #endif  // CEF_LIBCEF_DLL_CPPTOC_MENU_MODEL_CPPTOC_H_
--- a/libcef_dll/cpptoc/menu_model_delegate_cpptoc.h
+++ b/libcef_dll/cpptoc/menu_model_delegate_cpptoc.h
@@ -14,9 +14,9 @@
 #define CEF_LIBCEF_DLL_CPPTOC_MENU_MODEL_DELEGATE_CPPTOC_H_
 #pragma once

-#ifndef USING_CEF_SHARED
-#pragma message("Warning: "__FILE__" may be accessed wrapper-side only")
-#else  // USING_CEF_SHARED
+#if !defined(WRAPPING_CEF_SHARED)
+#error This file can be included wrapper-side only
+#endif

 #include "include/cef_menu_model_delegate.h"
 #include "include/capi/cef_menu_model_delegate_capi.h"
@@ -33,5 +33,4 @@ class CefMenuModelDelegateCppToC
  CefMenuModelDelegateCppToC();
 };

-#endif  // USING_CEF_SHARED
 #endif  // CEF_LIBCEF_DLL_CPPTOC_MENU_MODEL_DELEGATE_CPPTOC_H_
--- a/libcef_dll/cpptoc/navigation_entry_cpptoc.h
+++ b/libcef_dll/cpptoc/navigation_entry_cpptoc.h
@@ -14,9 +14,9 @@
 #define CEF_LIBCEF_DLL_CPPTOC_NAVIGATION_ENTRY_CPPTOC_H_
 #pragma once

-#ifndef BUILDING_CEF_SHARED
-#pragma message("Warning: "__FILE__" may be accessed DLL-side only")
-#else  // BUILDING_CEF_SHARED
+#if !defined(BUILDING_CEF_SHARED)
+#error This file can be included DLL-side only
+#endif

 #include "include/cef_navigation_entry.h"
 #include "include/capi/cef_navigation_entry_capi.h"
@@ -31,5 +31,4 @@ class CefNavigationEntryCppToC
  CefNavigationEntryCppToC();
 };

-#endif  // BUILDING_CEF_SHARED
 #endif  // CEF_LIBCEF_DLL_CPPTOC_NAVIGATION_ENTRY_CPPTOC_H_
--- a/libcef_dll/cpptoc/navigation_entry_visitor_cpptoc.h
+++ b/libcef_dll/cpptoc/navigation_entry_visitor_cpptoc.h
@@ -14,9 +14,9 @@
 #define CEF_LIBCEF_DLL_CPPTOC_NAVIGATION_ENTRY_VISITOR_CPPTOC_H_
 #pragma once

-#ifndef USING_CEF_SHARED
-#pragma message("Warning: "__FILE__" may be accessed wrapper-side only")
-#else  // USING_CEF_SHARED
+#if !defined(WRAPPING_CEF_SHARED)
+#error This file can be included wrapper-side only
+#endif

 #include "include/cef_browser.h"
 #include "include/capi/cef_browser_capi.h"
@@ -33,5 +33,4 @@ class CefNavigationEntryVisitorCppToC
  CefNavigationEntryVisitorCppToC();
 };

-#endif  // USING_CEF_SHARED
 #endif  // CEF_LIBCEF_DLL_CPPTOC_NAVIGATION_ENTRY_VISITOR_CPPTOC_H_
--- a/libcef_dll/cpptoc/pdf_print_callback_cpptoc.h
+++ b/libcef_dll/cpptoc/pdf_print_callback_cpptoc.h
@@ -14,9 +14,9 @@
 #define CEF_LIBCEF_DLL_CPPTOC_PDF_PRINT_CALLBACK_CPPTOC_H_
 #pragma once

-#ifndef USING_CEF_SHARED
-#pragma message("Warning: "__FILE__" may be accessed wrapper-side only")
-#else  // USING_CEF_SHARED
+#if !defined(WRAPPING_CEF_SHARED)
+#error This file can be included wrapper-side only
+#endif

 #include "include/cef_browser.h"
 #include "include/capi/cef_browser_capi.h"
@@ -33,5 +33,4 @@ class CefPdfPrintCallbackCppToC
  CefPdfPrintCallbackCppToC();
 };

-#endif  // USING_CEF_SHARED
 #endif  // CEF_LIBCEF_DLL_CPPTOC_PDF_PRINT_CALLBACK_CPPTOC_H_
--- a/libcef_dll/cpptoc/post_data_cpptoc.h
+++ b/libcef_dll/cpptoc/post_data_cpptoc.h
@@ -14,9 +14,9 @@
 #define CEF_LIBCEF_DLL_CPPTOC_POST_DATA_CPPTOC_H_
 #pragma once

-#ifndef BUILDING_CEF_SHARED
-#pragma message("Warning: "__FILE__" may be accessed DLL-side only")
-#else  // BUILDING_CEF_SHARED
+#if !defined(BUILDING_CEF_SHARED)
+#error This file can be included DLL-side only
+#endif

 #include "include/cef_request.h"
 #include "include/capi/cef_request_capi.h"
@@ -30,5 +30,4 @@ class CefPostDataCppToC
  CefPostDataCppToC();
 };

-#endif  // BUILDING_CEF_SHARED
 #endif  // CEF_LIBCEF_DLL_CPPTOC_POST_DATA_CPPTOC_H_
--- a/libcef_dll/cpptoc/post_data_element_cpptoc.h
+++ b/libcef_dll/cpptoc/post_data_element_cpptoc.h
@@ -14,9 +14,9 @@
 #define CEF_LIBCEF_DLL_CPPTOC_POST_DATA_ELEMENT_CPPTOC_H_
 #pragma once

-#ifndef BUILDING_CEF_SHARED
-#pragma message("Warning: "__FILE__" may be accessed DLL-side only")
-#else  // BUILDING_CEF_SHARED
+#if !defined(BUILDING_CEF_SHARED)
+#error This file can be included DLL-side only
+#endif

 #include "include/cef_request.h"
 #include "include/capi/cef_request_capi.h"
@@ -31,5 +31,4 @@ class CefPostDataElementCppToC
  CefPostDataElementCppToC();
 };

-#endif  // BUILDING_CEF_SHARED
 #endif  // CEF_LIBCEF_DLL_CPPTOC_POST_DATA_ELEMENT_CPPTOC_H_
--- a/libcef_dll/cpptoc/print_dialog_callback_cpptoc.h
+++ b/libcef_dll/cpptoc/print_dialog_callback_cpptoc.h
@@ -14,9 +14,9 @@
 #define CEF_LIBCEF_DLL_CPPTOC_PRINT_DIALOG_CALLBACK_CPPTOC_H_
 #pragma once

-#ifndef BUILDING_CEF_SHARED
-#pragma message("Warning: "__FILE__" may be accessed DLL-side only")
-#else  // BUILDING_CEF_SHARED
+#if !defined(BUILDING_CEF_SHARED)
+#error This file can be included DLL-side only
+#endif

 #include "include/cef_print_handler.h"
 #include "include/capi/cef_print_handler_capi.h"
@@ -31,5 +31,4 @@ class CefPrintDialogCallbackCppToC
  CefPrintDialogCallbackCppToC();
 };

-#endif  // BUILDING_CEF_SHARED
 #endif  // CEF_LIBCEF_DLL_CPPTOC_PRINT_DIALOG_CALLBACK_CPPTOC_H_
--- a/libcef_dll/cpptoc/print_handler_cpptoc.h
+++ b/libcef_dll/cpptoc/print_handler_cpptoc.h
@@ -14,9 +14,9 @@
 #define CEF_LIBCEF_DLL_CPPTOC_PRINT_HANDLER_CPPTOC_H_
 #pragma once

-#ifndef USING_CEF_SHARED
-#pragma message("Warning: "__FILE__" may be accessed wrapper-side only")
-#else  // USING_CEF_SHARED
+#if !defined(WRAPPING_CEF_SHARED)
+#error This file can be included wrapper-side only
+#endif

 #include "include/cef_print_handler.h"
 #include "include/capi/cef_print_handler_capi.h"
@@ -31,5 +31,4 @@ class CefPrintHandlerCppToC
  CefPrintHandlerCppToC();
 };

-#endif  // USING_CEF_SHARED
 #endif  // CEF_LIBCEF_DLL_CPPTOC_PRINT_HANDLER_CPPTOC_H_
--- a/libcef_dll/cpptoc/print_job_callback_cpptoc.h
+++ b/libcef_dll/cpptoc/print_job_callback_cpptoc.h
@@ -14,9 +14,9 @@
 #define CEF_LIBCEF_DLL_CPPTOC_PRINT_JOB_CALLBACK_CPPTOC_H_
 #pragma once

-#ifndef BUILDING_CEF_SHARED
-#pragma message("Warning: "__FILE__" may be accessed DLL-side only")
-#else  // BUILDING_CEF_SHARED
+#if !defined(BUILDING_CEF_SHARED)
+#error This file can be included DLL-side only
+#endif

 #include "include/cef_print_handler.h"
 #include "include/capi/cef_print_handler_capi.h"
@@ -31,5 +31,4 @@ class CefPrintJobCallbackCppToC
  CefPrintJobCallbackCppToC();
 };

-#endif  // BUILDING_CEF_SHARED
 #endif  // CEF_LIBCEF_DLL_CPPTOC_PRINT_JOB_CALLBACK_CPPTOC_H_
--- a/libcef_dll/cpptoc/print_settings_cpptoc.h
+++ b/libcef_dll/cpptoc/print_settings_cpptoc.h
@@ -14,9 +14,9 @@
 #define CEF_LIBCEF_DLL_CPPTOC_PRINT_SETTINGS_CPPTOC_H_
 #pragma once

-#ifndef BUILDING_CEF_SHARED
-#pragma message("Warning: "__FILE__" may be accessed DLL-side only")
-#else  // BUILDING_CEF_SHARED
+#if !defined(BUILDING_CEF_SHARED)
+#error This file can be included DLL-side only
+#endif

 #include "include/cef_print_settings.h"
 #include "include/capi/cef_print_settings_capi.h"
@@ -31,5 +31,4 @@ class CefPrintSettingsCppToC
  CefPrintSettingsCppToC();
 };

-#endif  // BUILDING_CEF_SHARED
 #endif  // CEF_LIBCEF_DLL_CPPTOC_PRINT_SETTINGS_CPPTOC_H_
--- a/libcef_dll/cpptoc/process_message_cpptoc.h
+++ b/libcef_dll/cpptoc/process_message_cpptoc.h
@@ -14,9 +14,9 @@
 #define CEF_LIBCEF_DLL_CPPTOC_PROCESS_MESSAGE_CPPTOC_H_
 #pragma once

-#ifndef BUILDING_CEF_SHARED
-#pragma message("Warning: "__FILE__" may be accessed DLL-side only")
-#else  // BUILDING_CEF_SHARED
+#if !defined(BUILDING_CEF_SHARED)
+#error This file can be included DLL-side only
+#endif

 #include "include/cef_process_message.h"
 #include "include/capi/cef_process_message_capi.h"
@@ -31,5 +31,4 @@ class CefProcessMessageCppToC
  CefProcessMessageCppToC();
 };

-#endif  // BUILDING_CEF_SHARED
 #endif  // CEF_LIBCEF_DLL_CPPTOC_PROCESS_MESSAGE_CPPTOC_H_
--- a/libcef_dll/cpptoc/read_handler_cpptoc.h
+++ b/libcef_dll/cpptoc/read_handler_cpptoc.h
@@ -14,9 +14,9 @@
 #define CEF_LIBCEF_DLL_CPPTOC_READ_HANDLER_CPPTOC_H_
 #pragma once

-#ifndef USING_CEF_SHARED
-#pragma message("Warning: "__FILE__" may be accessed wrapper-side only")
-#else  // USING_CEF_SHARED
+#if !defined(WRAPPING_CEF_SHARED)
+#error This file can be included wrapper-side only
+#endif

 #include "include/cef_stream.h"
 #include "include/capi/cef_stream_capi.h"
@@ -31,5 +31,4 @@ class CefReadHandlerCppToC
  CefReadHandlerCppToC();
 };

-#endif  // USING_CEF_SHARED
 #endif  // CEF_LIBCEF_DLL_CPPTOC_READ_HANDLER_CPPTOC_H_
--- a/libcef_dll/cpptoc/register_cdm_callback_cpptoc.h
+++ b/libcef_dll/cpptoc/register_cdm_callback_cpptoc.h
@@ -14,9 +14,9 @@
 #define CEF_LIBCEF_DLL_CPPTOC_REGISTER_CDM_CALLBACK_CPPTOC_H_
 #pragma once

-#ifndef USING_CEF_SHARED
-#pragma message("Warning: "__FILE__" may be accessed wrapper-side only")
-#else  // USING_CEF_SHARED
+#if !defined(WRAPPING_CEF_SHARED)
+#error This file can be included wrapper-side only
+#endif

 #include "include/cef_web_plugin.h"
 #include "include/capi/cef_web_plugin_capi.h"
@@ -33,5 +33,4 @@ class CefRegisterCdmCallbackCppToC
  CefRegisterCdmCallbackCppToC();
 };

-#endif  // USING_CEF_SHARED
 #endif  // CEF_LIBCEF_DLL_CPPTOC_REGISTER_CDM_CALLBACK_CPPTOC_H_
--- a/libcef_dll/cpptoc/render_handler_cpptoc.h
+++ b/libcef_dll/cpptoc/render_handler_cpptoc.h
@@ -14,9 +14,9 @@
 #define CEF_LIBCEF_DLL_CPPTOC_RENDER_HANDLER_CPPTOC_H_
 #pragma once

-#ifndef USING_CEF_SHARED
-#pragma message("Warning: "__FILE__" may be accessed wrapper-side only")
-#else  // USING_CEF_SHARED
+#if !defined(WRAPPING_CEF_SHARED)
+#error This file can be included wrapper-side only
+#endif

 #include "include/cef_render_handler.h"
 #include "include/capi/cef_render_handler_capi.h"
@@ -31,5 +31,4 @@ class CefRenderHandlerCppToC
  CefRenderHandlerCppToC();
 };

-#endif  // USING_CEF_SHARED
 #endif  // CEF_LIBCEF_DLL_CPPTOC_RENDER_HANDLER_CPPTOC_H_
--- a/libcef_dll/cpptoc/render_process_handler_cpptoc.h
+++ b/libcef_dll/cpptoc/render_process_handler_cpptoc.h
@@ -14,9 +14,9 @@
 #define CEF_LIBCEF_DLL_CPPTOC_RENDER_PROCESS_HANDLER_CPPTOC_H_
 #pragma once

-#ifndef USING_CEF_SHARED
-#pragma message("Warning: "__FILE__" may be accessed wrapper-side only")
-#else  // USING_CEF_SHARED
+#if !defined(WRAPPING_CEF_SHARED)
+#error This file can be included wrapper-side only
+#endif

 #include "include/cef_render_process_handler.h"
 #include "include/capi/cef_render_process_handler_capi.h"
@@ -31,5 +31,4 @@ class CefRenderProcessHandlerCppToC
  CefRenderProcessHandlerCppToC();
 };

-#endif  // USING_CEF_SHARED
 #endif  // CEF_LIBCEF_DLL_CPPTOC_RENDER_PROCESS_HANDLER_CPPTOC_H_
--- a/libcef_dll/cpptoc/request_callback_cpptoc.h
+++ b/libcef_dll/cpptoc/request_callback_cpptoc.h
@@ -14,9 +14,9 @@
 #define CEF_LIBCEF_DLL_CPPTOC_REQUEST_CALLBACK_CPPTOC_H_
 #pragma once

-#ifndef BUILDING_CEF_SHARED
-#pragma message("Warning: "__FILE__" may be accessed DLL-side only")
-#else  // BUILDING_CEF_SHARED
+#if !defined(BUILDING_CEF_SHARED)
+#error This file can be included DLL-side only
+#endif

 #include "include/cef_request_handler.h"
 #include "include/capi/cef_request_handler_capi.h"
@@ -31,5 +31,4 @@ class CefRequestCallbackCppToC
  CefRequestCallbackCppToC();
 };

-#endif  // BUILDING_CEF_SHARED
 #endif  // CEF_LIBCEF_DLL_CPPTOC_REQUEST_CALLBACK_CPPTOC_H_
--- a/libcef_dll/cpptoc/request_context_cpptoc.h
+++ b/libcef_dll/cpptoc/request_context_cpptoc.h
@@ -14,9 +14,9 @@
 #define CEF_LIBCEF_DLL_CPPTOC_REQUEST_CONTEXT_CPPTOC_H_
 #pragma once

-#ifndef BUILDING_CEF_SHARED
-#pragma message("Warning: "__FILE__" may be accessed DLL-side only")
-#else  // BUILDING_CEF_SHARED
+#if !defined(BUILDING_CEF_SHARED)
+#error This file can be included DLL-side only
+#endif

 #include "include/cef_request_context.h"
 #include "include/capi/cef_request_context_capi.h"
@@ -33,5 +33,4 @@ class CefRequestContextCppToC
  CefRequestContextCppToC();
 };

-#endif  // BUILDING_CEF_SHARED
 #endif  // CEF_LIBCEF_DLL_CPPTOC_REQUEST_CONTEXT_CPPTOC_H_
--- a/libcef_dll/cpptoc/request_context_handler_cpptoc.h
+++ b/libcef_dll/cpptoc/request_context_handler_cpptoc.h
@@ -14,9 +14,9 @@
 #define CEF_LIBCEF_DLL_CPPTOC_REQUEST_CONTEXT_HANDLER_CPPTOC_H_
 #pragma once

-#ifndef USING_CEF_SHARED
-#pragma message("Warning: "__FILE__" may be accessed wrapper-side only")
-#else  // USING_CEF_SHARED
+#if !defined(WRAPPING_CEF_SHARED)
+#error This file can be included wrapper-side only
+#endif

 #include "include/cef_request_context_handler.h"
 #include "include/capi/cef_request_context_handler_capi.h"
@@ -31,5 +31,4 @@ class CefRequestContextHandlerCppToC
  CefRequestContextHandlerCppToC();
 };

-#endif  // USING_CEF_SHARED
 #endif  // CEF_LIBCEF_DLL_CPPTOC_REQUEST_CONTEXT_HANDLER_CPPTOC_H_
--- a/libcef_dll/cpptoc/request_cpptoc.h
+++ b/libcef_dll/cpptoc/request_cpptoc.h
@@ -14,9 +14,9 @@
 #define CEF_LIBCEF_DLL_CPPTOC_REQUEST_CPPTOC_H_
 #pragma once

-#ifndef BUILDING_CEF_SHARED
-#pragma message("Warning: "__FILE__" may be accessed DLL-side only")
-#else  // BUILDING_CEF_SHARED
+#if !defined(BUILDING_CEF_SHARED)
+#error This file can be included DLL-side only
+#endif

 #include "include/cef_request.h"
 #include "include/capi/cef_request_capi.h"
@@ -30,5 +30,4 @@ class CefRequestCppToC
  CefRequestCppToC();
 };

-#endif  // BUILDING_CEF_SHARED
 #endif  // CEF_LIBCEF_DLL_CPPTOC_REQUEST_CPPTOC_H_
--- a/libcef_dll/cpptoc/request_handler_cpptoc.h
+++ b/libcef_dll/cpptoc/request_handler_cpptoc.h
@@ -14,9 +14,9 @@
 #define CEF_LIBCEF_DLL_CPPTOC_REQUEST_HANDLER_CPPTOC_H_
 #pragma once

-#ifndef USING_CEF_SHARED
-#pragma message("Warning: "__FILE__" may be accessed wrapper-side only")
-#else  // USING_CEF_SHARED
+#if !defined(WRAPPING_CEF_SHARED)
+#error This file can be included wrapper-side only
+#endif

 #include "include/cef_request_handler.h"
 #include "include/capi/cef_request_handler_capi.h"
@@ -31,5 +31,4 @@ class CefRequestHandlerCppToC
  CefRequestHandlerCppToC();
 };

-#endif  // USING_CEF_SHARED
 #endif  // CEF_LIBCEF_DLL_CPPTOC_REQUEST_HANDLER_CPPTOC_H_
--- a/libcef_dll/cpptoc/resolve_callback_cpptoc.h
+++ b/libcef_dll/cpptoc/resolve_callback_cpptoc.h
@@ -14,9 +14,9 @@
 #define CEF_LIBCEF_DLL_CPPTOC_RESOLVE_CALLBACK_CPPTOC_H_
 #pragma once

-#ifndef USING_CEF_SHARED
-#pragma message("Warning: "__FILE__" may be accessed wrapper-side only")
-#else  // USING_CEF_SHARED
+#if !defined(WRAPPING_CEF_SHARED)
+#error This file can be included wrapper-side only
+#endif

 #include "include/cef_request_context.h"
 #include "include/capi/cef_request_context_capi.h"
@@ -33,5 +33,4 @@ class CefResolveCallbackCppToC
  CefResolveCallbackCppToC();
 };

-#endif  // USING_CEF_SHARED
 #endif  // CEF_LIBCEF_DLL_CPPTOC_RESOLVE_CALLBACK_CPPTOC_H_
--- a/libcef_dll/cpptoc/resource_bundle_cpptoc.h
+++ b/libcef_dll/cpptoc/resource_bundle_cpptoc.h
@@ -14,9 +14,9 @@
 #define CEF_LIBCEF_DLL_CPPTOC_RESOURCE_BUNDLE_CPPTOC_H_
 #pragma once

-#ifndef BUILDING_CEF_SHARED
-#pragma message("Warning: "__FILE__" may be accessed DLL-side only")
-#else  // BUILDING_CEF_SHARED
+#if !defined(BUILDING_CEF_SHARED)
+#error This file can be included DLL-side only
+#endif

 #include "include/cef_resource_bundle.h"
 #include "include/capi/cef_resource_bundle_capi.h"
@@ -31,5 +31,4 @@ class CefResourceBundleCppToC
  CefResourceBundleCppToC();
 };

-#endif  // BUILDING_CEF_SHARED
 #endif  // CEF_LIBCEF_DLL_CPPTOC_RESOURCE_BUNDLE_CPPTOC_H_
--- a/libcef_dll/cpptoc/resource_bundle_handler_cpptoc.h
+++ b/libcef_dll/cpptoc/resource_bundle_handler_cpptoc.h
@@ -14,9 +14,9 @@
 #define CEF_LIBCEF_DLL_CPPTOC_RESOURCE_BUNDLE_HANDLER_CPPTOC_H_
 #pragma once

-#ifndef USING_CEF_SHARED
-#pragma message("Warning: "__FILE__" may be accessed wrapper-side only")
-#else  // USING_CEF_SHARED
+#if !defined(WRAPPING_CEF_SHARED)
+#error This file can be included wrapper-side only
+#endif

 #include "include/cef_resource_bundle_handler.h"
 #include "include/capi/cef_resource_bundle_handler_capi.h"
@@ -31,5 +31,4 @@ class CefResourceBundleHandlerCppToC
  CefResourceBundleHandlerCppToC();
 };

-#endif  // USING_CEF_SHARED
 #endif  // CEF_LIBCEF_DLL_CPPTOC_RESOURCE_BUNDLE_HANDLER_CPPTOC_H_
--- a/libcef_dll/cpptoc/resource_handler_cpptoc.h
+++ b/libcef_dll/cpptoc/resource_handler_cpptoc.h
@@ -14,9 +14,9 @@
 #define CEF_LIBCEF_DLL_CPPTOC_RESOURCE_HANDLER_CPPTOC_H_
 #pragma once

-#ifndef USING_CEF_SHARED
-#pragma message("Warning: "__FILE__" may be accessed wrapper-side only")
-#else  // USING_CEF_SHARED
+#if !defined(WRAPPING_CEF_SHARED)
+#error This file can be included wrapper-side only
+#endif

 #include "include/cef_resource_handler.h"
 #include "include/capi/cef_resource_handler_capi.h"
@@ -31,5 +31,4 @@ class CefResourceHandlerCppToC
  CefResourceHandlerCppToC();
 };

-#endif  // USING_CEF_SHARED
 #endif  // CEF_LIBCEF_DLL_CPPTOC_RESOURCE_HANDLER_CPPTOC_H_
--- a/libcef_dll/cpptoc/response_cpptoc.h
+++ b/libcef_dll/cpptoc/response_cpptoc.h
@@ -14,9 +14,9 @@
 #define CEF_LIBCEF_DLL_CPPTOC_RESPONSE_CPPTOC_H_
 #pragma once

-#ifndef BUILDING_CEF_SHARED
-#pragma message("Warning: "__FILE__" may be accessed DLL-side only")
-#else  // BUILDING_CEF_SHARED
+#if !defined(BUILDING_CEF_SHARED)
+#error This file can be included DLL-side only
+#endif

 #include "include/cef_response.h"
 #include "include/capi/cef_response_capi.h"
@@ -30,5 +30,4 @@ class CefResponseCppToC
  CefResponseCppToC();
 };

-#endif  // BUILDING_CEF_SHARED
 #endif  // CEF_LIBCEF_DLL_CPPTOC_RESPONSE_CPPTOC_H_
--- a/libcef_dll/cpptoc/response_filter_cpptoc.h
+++ b/libcef_dll/cpptoc/response_filter_cpptoc.h
@@ -14,9 +14,9 @@
 #define CEF_LIBCEF_DLL_CPPTOC_RESPONSE_FILTER_CPPTOC_H_
 #pragma once

-#ifndef USING_CEF_SHARED
-#pragma message("Warning: "__FILE__" may be accessed wrapper-side only")
-#else  // USING_CEF_SHARED
+#if !defined(WRAPPING_CEF_SHARED)
+#error This file can be included wrapper-side only
+#endif

 #include "include/cef_response_filter.h"
 #include "include/capi/cef_response_filter_capi.h"
@@ -31,5 +31,4 @@ class CefResponseFilterCppToC
  CefResponseFilterCppToC();
 };

-#endif  // USING_CEF_SHARED
 #endif  // CEF_LIBCEF_DLL_CPPTOC_RESPONSE_FILTER_CPPTOC_H_
--- a/libcef_dll/cpptoc/run_context_menu_callback_cpptoc.h
+++ b/libcef_dll/cpptoc/run_context_menu_callback_cpptoc.h
@@ -14,9 +14,9 @@
 #define CEF_LIBCEF_DLL_CPPTOC_RUN_CONTEXT_MENU_CALLBACK_CPPTOC_H_
 #pragma once

-#ifndef BUILDING_CEF_SHARED
-#pragma message("Warning: "__FILE__" may be accessed DLL-side only")
-#else  // BUILDING_CEF_SHARED
+#if !defined(BUILDING_CEF_SHARED)
+#error This file can be included DLL-side only
+#endif

 #include "include/cef_context_menu_handler.h"
 #include "include/capi/cef_context_menu_handler_capi.h"
@@ -31,5 +31,4 @@ class CefRunContextMenuCallbackCppToC
  CefRunContextMenuCallbackCppToC();
 };

-#endif  // BUILDING_CEF_SHARED
 #endif  // CEF_LIBCEF_DLL_CPPTOC_RUN_CONTEXT_MENU_CALLBACK_CPPTOC_H_
--- a/libcef_dll/cpptoc/run_file_dialog_callback_cpptoc.h
+++ b/libcef_dll/cpptoc/run_file_dialog_callback_cpptoc.h
@@ -14,9 +14,9 @@
 #define CEF_LIBCEF_DLL_CPPTOC_RUN_FILE_DIALOG_CALLBACK_CPPTOC_H_
 #pragma once

-#ifndef USING_CEF_SHARED
-#pragma message("Warning: "__FILE__" may be accessed wrapper-side only")
-#else  // USING_CEF_SHARED
+#if !defined(WRAPPING_CEF_SHARED)
+#error This file can be included wrapper-side only
+#endif

 #include "include/cef_browser.h"
 #include "include/capi/cef_browser_capi.h"
@@ -33,5 +33,4 @@ class CefRunFileDialogCallbackCppToC
  CefRunFileDialogCallbackCppToC();
 };

-#endif  // USING_CEF_SHARED
 #endif  // CEF_LIBCEF_DLL_CPPTOC_RUN_FILE_DIALOG_CALLBACK_CPPTOC_H_
--- a/libcef_dll/cpptoc/scheme_handler_factory_cpptoc.h
+++ b/libcef_dll/cpptoc/scheme_handler_factory_cpptoc.h
@@ -14,9 +14,9 @@
 #define CEF_LIBCEF_DLL_CPPTOC_SCHEME_HANDLER_FACTORY_CPPTOC_H_
 #pragma once

-#ifndef USING_CEF_SHARED
-#pragma message("Warning: "__FILE__" may be accessed wrapper-side only")
-#else  // USING_CEF_SHARED
+#if !defined(WRAPPING_CEF_SHARED)
+#error This file can be included wrapper-side only
+#endif

 #include "include/cef_scheme.h"
 #include "include/capi/cef_scheme_capi.h"
@@ -31,5 +31,4 @@ class CefSchemeHandlerFactoryCppToC
  CefSchemeHandlerFactoryCppToC();
 };

-#endif  // USING_CEF_SHARED
 #endif  // CEF_LIBCEF_DLL_CPPTOC_SCHEME_HANDLER_FACTORY_CPPTOC_H_
--- a/libcef_dll/cpptoc/scheme_registrar_cpptoc.h
+++ b/libcef_dll/cpptoc/scheme_registrar_cpptoc.h
@@ -14,9 +14,9 @@
 #define CEF_LIBCEF_DLL_CPPTOC_SCHEME_REGISTRAR_CPPTOC_H_
 #pragma once

-#ifndef BUILDING_CEF_SHARED
-#pragma message("Warning: "__FILE__" may be accessed DLL-side only")
-#else  // BUILDING_CEF_SHARED
+#if !defined(BUILDING_CEF_SHARED)
+#error This file can be included DLL-side only
+#endif

 #include "include/cef_scheme.h"
 #include "include/capi/cef_scheme_capi.h"
@@ -31,5 +31,4 @@ class CefSchemeRegistrarCppToC
  CefSchemeRegistrarCppToC();
 };

-#endif  // BUILDING_CEF_SHARED
 #endif  // CEF_LIBCEF_DLL_CPPTOC_SCHEME_REGISTRAR_CPPTOC_H_
--- a/libcef_dll/cpptoc/select_client_certificate_callback_cpptoc.h
+++ b/libcef_dll/cpptoc/select_client_certificate_callback_cpptoc.h
@@ -14,9 +14,9 @@
 #define CEF_LIBCEF_DLL_CPPTOC_SELECT_CLIENT_CERTIFICATE_CALLBACK_CPPTOC_H_
 #pragma once

-#ifndef BUILDING_CEF_SHARED
-#pragma message("Warning: "__FILE__" may be accessed DLL-side only")
-#else  // BUILDING_CEF_SHARED
+#if !defined(BUILDING_CEF_SHARED)
+#error This file can be included DLL-side only
+#endif

 #include "include/cef_request_handler.h"
 #include "include/capi/cef_request_handler_capi.h"
@@ -32,5 +32,4 @@ class CefSelectClientCertificateCallbackCppToC
  CefSelectClientCertificateCallbackCppToC();
 };

-#endif  // BUILDING_CEF_SHARED
 #endif  // CEF_LIBCEF_DLL_CPPTOC_SELECT_CLIENT_CERTIFICATE_CALLBACK_CPPTOC_H_
--- a/libcef_dll/cpptoc/set_cookie_callback_cpptoc.h
+++ b/libcef_dll/cpptoc/set_cookie_callback_cpptoc.h
@@ -14,9 +14,9 @@
 #define CEF_LIBCEF_DLL_CPPTOC_SET_COOKIE_CALLBACK_CPPTOC_H_
 #pragma once

-#ifndef USING_CEF_SHARED
-#pragma message("Warning: "__FILE__" may be accessed wrapper-side only")
-#else  // USING_CEF_SHARED
+#if !defined(WRAPPING_CEF_SHARED)
+#error This file can be included wrapper-side only
+#endif

 #include "include/cef_cookie.h"
 #include "include/capi/cef_cookie_capi.h"
@@ -31,5 +31,4 @@ class CefSetCookieCallbackCppToC
  CefSetCookieCallbackCppToC();
 };

-#endif  // USING_CEF_SHARED
 #endif  // CEF_LIBCEF_DLL_CPPTOC_SET_COOKIE_CALLBACK_CPPTOC_H_
--- a/libcef_dll/cpptoc/sslinfo_cpptoc.h
+++ b/libcef_dll/cpptoc/sslinfo_cpptoc.h
@@ -14,9 +14,9 @@
 #define CEF_LIBCEF_DLL_CPPTOC_SSLINFO_CPPTOC_H_
 #pragma once

-#ifndef BUILDING_CEF_SHARED
-#pragma message("Warning: "__FILE__" may be accessed DLL-side only")
-#else  // BUILDING_CEF_SHARED
+#if !defined(BUILDING_CEF_SHARED)
+#error This file can be included DLL-side only
+#endif

 #include "include/cef_ssl_info.h"
 #include "include/capi/cef_ssl_info_capi.h"
@@ -30,5 +30,4 @@ class CefSSLInfoCppToC
  CefSSLInfoCppToC();
 };

-#endif  // BUILDING_CEF_SHARED
 #endif  // CEF_LIBCEF_DLL_CPPTOC_SSLINFO_CPPTOC_H_
--- a/libcef_dll/cpptoc/sslstatus_cpptoc.h
+++ b/libcef_dll/cpptoc/sslstatus_cpptoc.h
@@ -14,9 +14,9 @@
 #define CEF_LIBCEF_DLL_CPPTOC_SSLSTATUS_CPPTOC_H_
 #pragma once

-#ifndef BUILDING_CEF_SHARED
-#pragma message("Warning: "__FILE__" may be accessed DLL-side only")
-#else  // BUILDING_CEF_SHARED
+#if !defined(BUILDING_CEF_SHARED)
+#error This file can be included DLL-side only
+#endif

 #include "include/cef_ssl_status.h"
 #include "include/capi/cef_ssl_status_capi.h"
@@ -30,5 +30,4 @@ class CefSSLStatusCppToC
  CefSSLStatusCppToC();
 };

-#endif  // BUILDING_CEF_SHARED
 #endif  // CEF_LIBCEF_DLL_CPPTOC_SSLSTATUS_CPPTOC_H_
--- a/libcef_dll/cpptoc/stream_reader_cpptoc.h
+++ b/libcef_dll/cpptoc/stream_reader_cpptoc.h
@@ -14,9 +14,9 @@
 #define CEF_LIBCEF_DLL_CPPTOC_STREAM_READER_CPPTOC_H_
 #pragma once

-#ifndef BUILDING_CEF_SHARED
-#pragma message("Warning: "__FILE__" may be accessed DLL-side only")
-#else  // BUILDING_CEF_SHARED
+#if !defined(BUILDING_CEF_SHARED)
+#error This file can be included DLL-side only
+#endif

 #include "include/cef_stream.h"
 #include "include/capi/cef_stream_capi.h"
@@ -31,5 +31,4 @@ class CefStreamReaderCppToC
  CefStreamReaderCppToC();
 };

-#endif  // BUILDING_CEF_SHARED
 #endif  // CEF_LIBCEF_DLL_CPPTOC_STREAM_READER_CPPTOC_H_
--- a/libcef_dll/cpptoc/stream_writer_cpptoc.h
+++ b/libcef_dll/cpptoc/stream_writer_cpptoc.h
@@ -14,9 +14,9 @@
 #define CEF_LIBCEF_DLL_CPPTOC_STREAM_WRITER_CPPTOC_H_
 #pragma once

-#ifndef BUILDING_CEF_SHARED
-#pragma message("Warning: "__FILE__" may be accessed DLL-side only")
-#else  // BUILDING_CEF_SHARED
+#if !defined(BUILDING_CEF_SHARED)
+#error This file can be included DLL-side only
+#endif

 #include "include/cef_stream.h"
 #include "include/capi/cef_stream_capi.h"
@@ -31,5 +31,4 @@ class CefStreamWriterCppToC
  CefStreamWriterCppToC();
 };

-#endif  // BUILDING_CEF_SHARED
 #endif  // CEF_LIBCEF_DLL_CPPTOC_STREAM_WRITER_CPPTOC_H_
--- a/libcef_dll/cpptoc/string_visitor_cpptoc.h
+++ b/libcef_dll/cpptoc/string_visitor_cpptoc.h
@@ -14,9 +14,9 @@
 #define CEF_LIBCEF_DLL_CPPTOC_STRING_VISITOR_CPPTOC_H_
 #pragma once

-#ifndef USING_CEF_SHARED
-#pragma message("Warning: "__FILE__" may be accessed wrapper-side only")
-#else  // USING_CEF_SHARED
+#if !defined(WRAPPING_CEF_SHARED)
+#error This file can be included wrapper-side only
+#endif

 #include "include/cef_string_visitor.h"
 #include "include/capi/cef_string_visitor_capi.h"
@@ -31,5 +31,4 @@ class CefStringVisitorCppToC
  CefStringVisitorCppToC();
 };

-#endif  // USING_CEF_SHARED
 #endif  // CEF_LIBCEF_DLL_CPPTOC_STRING_VISITOR_CPPTOC_H_
--- a/libcef_dll/cpptoc/task_cpptoc.h
+++ b/libcef_dll/cpptoc/task_cpptoc.h
@@ -14,9 +14,9 @@
 #define CEF_LIBCEF_DLL_CPPTOC_TASK_CPPTOC_H_
 #pragma once

-#ifndef USING_CEF_SHARED
-#pragma message("Warning: "__FILE__" may be accessed wrapper-side only")
-#else  // USING_CEF_SHARED
+#if !defined(WRAPPING_CEF_SHARED)
+#error This file can be included wrapper-side only
+#endif

 #include "include/cef_task.h"
 #include "include/capi/cef_task_capi.h"
@@ -30,5 +30,4 @@ class CefTaskCppToC
  CefTaskCppToC();
 };

-#endif  // USING_CEF_SHARED
 #endif  // CEF_LIBCEF_DLL_CPPTOC_TASK_CPPTOC_H_
--- a/libcef_dll/cpptoc/task_runner_cpptoc.h
+++ b/libcef_dll/cpptoc/task_runner_cpptoc.h
@@ -14,9 +14,9 @@
 #define CEF_LIBCEF_DLL_CPPTOC_TASK_RUNNER_CPPTOC_H_
 #pragma once

-#ifndef BUILDING_CEF_SHARED
-#pragma message("Warning: "__FILE__" may be accessed DLL-side only")
-#else  // BUILDING_CEF_SHARED
+#if !defined(BUILDING_CEF_SHARED)
+#error This file can be included DLL-side only
+#endif

 #include "include/cef_task.h"
 #include "include/capi/cef_task_capi.h"
@@ -30,5 +30,4 @@ class CefTaskRunnerCppToC
  CefTaskRunnerCppToC();
 };

-#endif  // BUILDING_CEF_SHARED
 #endif  // CEF_LIBCEF_DLL_CPPTOC_TASK_RUNNER_CPPTOC_H_
--- a/libcef_dll/cpptoc/test/translator_test_cpptoc.h
+++ b/libcef_dll/cpptoc/test/translator_test_cpptoc.h
@@ -14,9 +14,9 @@
 #define CEF_LIBCEF_DLL_CPPTOC_TEST_TRANSLATOR_TEST_CPPTOC_H_
 #pragma once

-#ifndef BUILDING_CEF_SHARED
-#pragma message("Warning: "__FILE__" may be accessed DLL-side only")
-#else  // BUILDING_CEF_SHARED
+#if !defined(BUILDING_CEF_SHARED)
+#error This file can be included DLL-side only
+#endif

 #include "include/test/cef_translator_test.h"
 #include "include/capi/test/cef_translator_test_capi.h"
@@ -31,5 +31,4 @@ class CefTranslatorTestCppToC
  CefTranslatorTestCppToC();
 };

-#endif  // BUILDING_CEF_SHARED
 #endif  // CEF_LIBCEF_DLL_CPPTOC_TEST_TRANSLATOR_TEST_CPPTOC_H_
--- a/libcef_dll/cpptoc/test/translator_test_handler_child_cpptoc.h
+++ b/libcef_dll/cpptoc/test/translator_test_handler_child_cpptoc.h
@@ -14,9 +14,9 @@
 #define CEF_LIBCEF_DLL_CPPTOC_TEST_TRANSLATOR_TEST_HANDLER_CHILD_CPPTOC_H_
 #pragma once

-#ifndef USING_CEF_SHARED
-#pragma message("Warning: "__FILE__" may be accessed wrapper-side only")
-#else  // USING_CEF_SHARED
+#if !defined(WRAPPING_CEF_SHARED)
+#error This file can be included wrapper-side only
+#endif

 #include "include/test/cef_translator_test.h"
 #include "include/capi/test/cef_translator_test_capi.h"
@@ -31,5 +31,4 @@ class CefTranslatorTestHandlerChildCppToC
  CefTranslatorTestHandlerChildCppToC();
 };

-#endif  // USING_CEF_SHARED
 #endif  // CEF_LIBCEF_DLL_CPPTOC_TEST_TRANSLATOR_TEST_HANDLER_CHILD_CPPTOC_H_
--- a/libcef_dll/cpptoc/test/translator_test_handler_cpptoc.h
+++ b/libcef_dll/cpptoc/test/translator_test_handler_cpptoc.h
@@ -14,9 +14,9 @@
 #define CEF_LIBCEF_DLL_CPPTOC_TEST_TRANSLATOR_TEST_HANDLER_CPPTOC_H_
 #pragma once

-#ifndef USING_CEF_SHARED
-#pragma message("Warning: "__FILE__" may be accessed wrapper-side only")
-#else  // USING_CEF_SHARED
+#if !defined(WRAPPING_CEF_SHARED)
+#error This file can be included wrapper-side only
+#endif

 #include "include/test/cef_translator_test.h"
 #include "include/capi/test/cef_translator_test_capi.h"
@@ -31,5 +31,4 @@ class CefTranslatorTestHandlerCppToC
  CefTranslatorTestHandlerCppToC();
 };

-#endif  // USING_CEF_SHARED
 #endif  // CEF_LIBCEF_DLL_CPPTOC_TEST_TRANSLATOR_TEST_HANDLER_CPPTOC_H_
--- a/libcef_dll/cpptoc/test/translator_test_object_child_child_cpptoc.h
+++ b/libcef_dll/cpptoc/test/translator_test_object_child_child_cpptoc.h
@@ -14,9 +14,9 @@
 #define CEF_LIBCEF_DLL_CPPTOC_TEST_TRANSLATOR_TEST_OBJECT_CHILD_CHILD_CPPTOC_H_
 #pragma once

-#ifndef BUILDING_CEF_SHARED
-#pragma message("Warning: "__FILE__" may be accessed DLL-side only")
-#else  // BUILDING_CEF_SHARED
+#if !defined(BUILDING_CEF_SHARED)
+#error This file can be included DLL-side only
+#endif

 #include "include/test/cef_translator_test.h"
 #include "include/capi/test/cef_translator_test_capi.h"
@@ -32,5 +32,4 @@ class CefTranslatorTestObjectChildChildCppToC
  CefTranslatorTestObjectChildChildCppToC();
 };

-#endif  // BUILDING_CEF_SHARED
 #endif  // CEF_LIBCEF_DLL_CPPTOC_TEST_TRANSLATOR_TEST_OBJECT_CHILD_CHILD_CPPTOC_H_
--- a/libcef_dll/cpptoc/test/translator_test_object_child_cpptoc.h
+++ b/libcef_dll/cpptoc/test/translator_test_object_child_cpptoc.h
@@ -14,9 +14,9 @@
 #define CEF_LIBCEF_DLL_CPPTOC_TEST_TRANSLATOR_TEST_OBJECT_CHILD_CPPTOC_H_
 #pragma once

-#ifndef BUILDING_CEF_SHARED
-#pragma message("Warning: "__FILE__" may be accessed DLL-side only")
-#else  // BUILDING_CEF_SHARED
+#if !defined(BUILDING_CEF_SHARED)
+#error This file can be included DLL-side only
+#endif

 #include "include/test/cef_translator_test.h"
 #include "include/capi/test/cef_translator_test_capi.h"
@@ -31,5 +31,4 @@ class CefTranslatorTestObjectChildCppToC
  CefTranslatorTestObjectChildCppToC();
 };

-#endif  // BUILDING_CEF_SHARED
 #endif  // CEF_LIBCEF_DLL_CPPTOC_TEST_TRANSLATOR_TEST_OBJECT_CHILD_CPPTOC_H_
--- a/libcef_dll/cpptoc/test/translator_test_object_cpptoc.h
+++ b/libcef_dll/cpptoc/test/translator_test_object_cpptoc.h
@@ -14,9 +14,9 @@
 #define CEF_LIBCEF_DLL_CPPTOC_TEST_TRANSLATOR_TEST_OBJECT_CPPTOC_H_
 #pragma once

-#ifndef BUILDING_CEF_SHARED
-#pragma message("Warning: "__FILE__" may be accessed DLL-side only")
-#else  // BUILDING_CEF_SHARED
+#if !defined(BUILDING_CEF_SHARED)
+#error This file can be included DLL-side only
+#endif

 #include "include/test/cef_translator_test.h"
 #include "include/capi/test/cef_translator_test_capi.h"
@@ -31,5 +31,4 @@ class CefTranslatorTestObjectCppToC
  CefTranslatorTestObjectCppToC();
 };

-#endif  // BUILDING_CEF_SHARED
 #endif  // CEF_LIBCEF_DLL_CPPTOC_TEST_TRANSLATOR_TEST_OBJECT_CPPTOC_H_
--- a/libcef_dll/cpptoc/thread_cpptoc.h
+++ b/libcef_dll/cpptoc/thread_cpptoc.h
@@ -14,9 +14,9 @@
 #define CEF_LIBCEF_DLL_CPPTOC_THREAD_CPPTOC_H_
 #pragma once

-#ifndef BUILDING_CEF_SHARED
-#pragma message("Warning: "__FILE__" may be accessed DLL-side only")
-#else  // BUILDING_CEF_SHARED
+#if !defined(BUILDING_CEF_SHARED)
+#error This file can be included DLL-side only
+#endif

 #include "include/cef_thread.h"
 #include "include/capi/cef_thread_capi.h"
@@ -30,5 +30,4 @@ class CefThreadCppToC
  CefThreadCppToC();
 };

-#endif  // BUILDING_CEF_SHARED
 #endif  // CEF_LIBCEF_DLL_CPPTOC_THREAD_CPPTOC_H_
--- a/libcef_dll/cpptoc/urlrequest_client_cpptoc.h
+++ b/libcef_dll/cpptoc/urlrequest_client_cpptoc.h
@@ -14,9 +14,9 @@
 #define CEF_LIBCEF_DLL_CPPTOC_URLREQUEST_CLIENT_CPPTOC_H_
 #pragma once

-#ifndef USING_CEF_SHARED
-#pragma message("Warning: "__FILE__" may be accessed wrapper-side only")
-#else  // USING_CEF_SHARED
+#if !defined(WRAPPING_CEF_SHARED)
+#error This file can be included wrapper-side only
+#endif

 #include "include/cef_urlrequest.h"
 #include "include/capi/cef_urlrequest_capi.h"
@@ -31,5 +31,4 @@ class CefURLRequestClientCppToC
  CefURLRequestClientCppToC();
 };

-#endif  // USING_CEF_SHARED
 #endif  // CEF_LIBCEF_DLL_CPPTOC_URLREQUEST_CLIENT_CPPTOC_H_
--- a/Show More
+++ b/Show More