diff --git a/src/base/update_checker.cc b/src/base/update_checker.cc
index 5289dc6..df10df5 100644
--- a/src/base/update_checker.cc
+++ b/src/base/update_checker.cc
@@ -33,8 +33,7 @@
 #include <Windows.h>
 #include <tchar.h>
 #include <strsafe.h>
-// Workaround against KB813540
-#include <atlbase_mozc.h>
+#include <atlbase.h>
 #include <atlcom.h>
 
 #include <string>
diff --git a/src/base/win_util.cc b/src/base/win_util.cc
index 18304a8..40f1228 100644
--- a/src/base/win_util.cc
+++ b/src/base/win_util.cc
@@ -36,10 +36,9 @@
 #include <Psapi.h>
 #include <Winternl.h>
 
-// Workaround against KB813540
 #define _ATL_NO_AUTOMATIC_NAMESPACE
 #define _WTL_NO_AUTOMATIC_NAMESPACE
-#include <atlbase_mozc.h>
+#include <atlbase.h>
 
 #include <clocale>
 #include <memory>
diff --git a/src/config/stats_config_util.cc b/src/config/stats_config_util.cc
index f4313e3..a6aa2fc 100644
--- a/src/config/stats_config_util.cc
+++ b/src/config/stats_config_util.cc
@@ -35,8 +35,7 @@
 #include <shlobj.h>
 #include <time.h>
 #include <sddl.h>
-// Workaround against KB813540
-#include <atlbase_mozc.h>
+#include <atlbase.h>
 #else
 #include <pwd.h>
 #include <sys/stat.h>
diff --git a/src/gui/base/win_util.cc b/src/gui/base/win_util.cc
index 4dd07d4..829ea43 100644
--- a/src/gui/base/win_util.cc
+++ b/src/gui/base/win_util.cc
@@ -36,8 +36,7 @@
 #include <vssym32.h>
 #include <windows.h>
 #include <winuser.h>
-// Workaround against KB813540
-#include <atlbase_mozc.h>
+#include <atlbase.h>
 #include <atlcom.h>
 #include <atlstr.h>
 #include <atlwin.h>
diff --git a/src/gyp/common.gypi b/src/gyp/common.gypi
index 1ade5c9..c3bca8a 100644
--- a/src/gyp/common.gypi
+++ b/src/gyp/common.gypi
@@ -684,11 +684,6 @@
         'include_dirs': [
           '<@(msvs_includes)',
           '<(additional_third_party_dir)/wtl/files/include',
-          # Add atl_wrapper dir into the 'include_dirs' so that we can
-          # include the header file as <atlbase_mozc.h>, which
-          # is more lintian-friendly than "atlbase_mozc.h".
-          # See b/5101916 for the background information.
-          '<(DEPTH)/win32/atl_wrapper',
         ],
         'msvs_cygwin_shell': 0,
         'msvs_disabled_warnings': ['<@(msvc_disabled_warnings)'],  # /wdXXXX
diff --git a/src/mozc_version_template.txt b/src/mozc_version_template.txt
index 9d93f99..2b1ea14 100644
--- a/src/mozc_version_template.txt
+++ b/src/mozc_version_template.txt
@@ -1,6 +1,6 @@
 MAJOR=2
 MINOR=16
-BUILD=2036
+BUILD=2037
 REVISION=102
 # NACL_DICTIONARY_VERSION is the target version of the system dictionary to be
 # downloaded by NaCl Mozc.
diff --git a/src/renderer/renderer_style_handler.cc b/src/renderer/renderer_style_handler.cc
index 8ac49da..5a7dc7e 100644
--- a/src/renderer/renderer_style_handler.cc
+++ b/src/renderer/renderer_style_handler.cc
@@ -33,8 +33,7 @@
 #include <windows.h>
 #define _ATL_NO_AUTOMATIC_NAMESPACE
 #define _WTL_NO_AUTOMATIC_NAMESPACE
-// Workaround against KB813540
-#include <atlbase_mozc.h>
+#include <atlbase.h>
 #include <atlapp.h>
 #include <atlgdi.h>
 #endif  // OS_WIN
diff --git a/src/renderer/win32/candidate_window.h b/src/renderer/win32/candidate_window.h
index f940d9e..aa6ed38 100644
--- a/src/renderer/win32/candidate_window.h
+++ b/src/renderer/win32/candidate_window.h
@@ -33,8 +33,7 @@
 #include <windows.h>
 #define _ATL_NO_AUTOMATIC_NAMESPACE
 #define _WTL_NO_AUTOMATIC_NAMESPACE
-// Workaround against KB813540
-#include <atlbase_mozc.h>
+#include <atlbase.h>
 #include <atlwin.h>
 #include <atlapp.h>
 #include <atlcrack.h>
diff --git a/src/renderer/win32/composition_window.cc b/src/renderer/win32/composition_window.cc
index 2df12ba..7a2f658 100644
--- a/src/renderer/win32/composition_window.cc
+++ b/src/renderer/win32/composition_window.cc
@@ -32,8 +32,7 @@
 #include <windows.h>
 #define _ATL_NO_AUTOMATIC_NAMESPACE
 #define _WTL_NO_AUTOMATIC_NAMESPACE
-// Workaround against KB813540
-#include <atlbase_mozc.h>
+#include <atlbase.h>
 #include <atlapp.h>
 #include <atlcrack.h>
 #include <atlgdi.h>
diff --git a/src/renderer/win32/indicator_window.cc b/src/renderer/win32/indicator_window.cc
index ad56489..bf9871d 100644
--- a/src/renderer/win32/indicator_window.cc
+++ b/src/renderer/win32/indicator_window.cc
@@ -32,8 +32,7 @@
 #include <windows.h>
 #define _ATL_NO_AUTOMATIC_NAMESPACE
 #define _WTL_NO_AUTOMATIC_NAMESPACE
-// Workaround against KB813540
-#include <atlbase_mozc.h>
+#include <atlbase.h>
 #include <atlwin.h>
 #include <atlapp.h>
 #include <atlcrack.h>
diff --git a/src/renderer/win32/infolist_window.h b/src/renderer/win32/infolist_window.h
index f2bfab5..fee527f 100644
--- a/src/renderer/win32/infolist_window.h
+++ b/src/renderer/win32/infolist_window.h
@@ -33,8 +33,7 @@
 #include <windows.h>
 #define _ATL_NO_AUTOMATIC_NAMESPACE
 #define _WTL_NO_AUTOMATIC_NAMESPACE
-// Workaround against KB813540
-#include <atlbase_mozc.h>
+#include <atlbase.h>
 #include <atlwin.h>
 #include <atlapp.h>
 #include <atlcrack.h>
diff --git a/src/renderer/win32/text_renderer.cc b/src/renderer/win32/text_renderer.cc
index 90023b8..cb1a58b 100644
--- a/src/renderer/win32/text_renderer.cc
+++ b/src/renderer/win32/text_renderer.cc
@@ -31,8 +31,7 @@
 
 #define _ATL_NO_AUTOMATIC_NAMESPACE
 #define _WTL_NO_AUTOMATIC_NAMESPACE
-// Workaround against KB813540
-#include <atlbase_mozc.h>
+#include <atlbase.h>
 #include <atlcom.h>
 #include <objbase.h>
 #include <d2d1.h>
diff --git a/src/renderer/win32/text_renderer.h b/src/renderer/win32/text_renderer.h
index 4dbc46b..0f01e6f 100644
--- a/src/renderer/win32/text_renderer.h
+++ b/src/renderer/win32/text_renderer.h
@@ -33,8 +33,7 @@
 #include <windows.h>
 #define _ATL_NO_AUTOMATIC_NAMESPACE
 #define _WTL_NO_AUTOMATIC_NAMESPACE
-// Workaround against KB813540
-#include <atlbase_mozc.h>
+#include <atlbase.h>
 #include <atlapp.h>
 #include <atlmisc.h>
 
diff --git a/src/renderer/win32/win32_image_util.cc b/src/renderer/win32/win32_image_util.cc
index 079f3df..7bcc4dc 100644
--- a/src/renderer/win32/win32_image_util.cc
+++ b/src/renderer/win32/win32_image_util.cc
@@ -33,8 +33,7 @@
 
 #define _ATL_NO_AUTOMATIC_NAMESPACE
 #define _WTL_NO_AUTOMATIC_NAMESPACE
-// Workaround against KB813540
-#include <atlbase_mozc.h>
+#include <atlbase.h>
 #include <atlapp.h>
 #include <atlmisc.h>
 #include <atlgdi.h>
diff --git a/src/renderer/win32/win32_image_util_test.cc b/src/renderer/win32/win32_image_util_test.cc
index eb1bdda..2a6bdff 100644
--- a/src/renderer/win32/win32_image_util_test.cc
+++ b/src/renderer/win32/win32_image_util_test.cc
@@ -31,8 +31,7 @@
 
 #define _ATL_NO_AUTOMATIC_NAMESPACE
 #define _WTL_NO_AUTOMATIC_NAMESPACE
-// Workaround against KB813540
-#include <atlbase_mozc.h>
+#include <atlbase.h>
 #include <atlapp.h>
 #include <atlgdi.h>
 #include <atlmisc.h>
diff --git a/src/renderer/win32/win32_renderer_util.cc b/src/renderer/win32/win32_renderer_util.cc
index dd8ff2b..0411504 100644
--- a/src/renderer/win32/win32_renderer_util.cc
+++ b/src/renderer/win32/win32_renderer_util.cc
@@ -31,8 +31,7 @@
 
 #define _ATL_NO_AUTOMATIC_NAMESPACE
 #define _WTL_NO_AUTOMATIC_NAMESPACE
-// Workaround against KB813540
-#include <atlbase_mozc.h>
+#include <atlbase.h>
 #include <atlapp.h>
 #include <atlgdi.h>
 #include <atlmisc.h>
diff --git a/src/renderer/win32/win32_renderer_util_test.cc b/src/renderer/win32/win32_renderer_util_test.cc
index d87855f..be951c4 100644
--- a/src/renderer/win32/win32_renderer_util_test.cc
+++ b/src/renderer/win32/win32_renderer_util_test.cc
@@ -31,8 +31,7 @@
 
 #define _ATL_NO_AUTOMATIC_NAMESPACE
 #define _WTL_NO_AUTOMATIC_NAMESPACE
-// Workaround against KB813540
-#include <atlbase_mozc.h>
+#include <atlbase.h>
 #include <atlapp.h>
 #include <atlgdi.h>
 #include <atlmisc.h>
diff --git a/src/server/mozc_cache_service.cc b/src/server/mozc_cache_service.cc
index 6d9ac47..1c68e91 100644
--- a/src/server/mozc_cache_service.cc
+++ b/src/server/mozc_cache_service.cc
@@ -31,8 +31,7 @@
 #define PSAPI_VERSION 1  // for <psapi.h>
 #include <windows.h>
 #if !defined(NO_LOGGING)
-// Workaround against KB813540
-#include <atlbase_mozc.h>
+#include <atlbase.h>
 #include <atlstr.h>  // for CString
 #endif  // !NO_LOGGING
 #include <psapi.h>
diff --git a/src/win32/atl_wrapper/atlbase_mozc.h b/src/win32/atl_wrapper/atlbase_mozc.h
deleted file mode 100644
index 335f6ec..0000000
--- a/src/win32/atl_wrapper/atlbase_mozc.h
+++ /dev/null
@@ -1,51 +0,0 @@
-// Copyright 2010-2015, Google Inc.
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are
-// met:
-//
-//     * Redistributions of source code must retain the above copyright
-// notice, this list of conditions and the following disclaimer.
-//     * Redistributions in binary form must reproduce the above
-// copyright notice, this list of conditions and the following disclaimer
-// in the documentation and/or other materials provided with the
-// distribution.
-//     * Neither the name of Google Inc. nor the names of its
-// contributors may be used to endorse or promote products derived from
-// this software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-// This header file is made as a workaround againt
-// http://support.microsoft.com/kb/813540.
-// See the following thread for details.
-// http://connect.microsoft.com/VisualStudio/feedback/details/535704/atlcomcli-h-cvartypeinfo-char-cannot-be-compiled-with-j-or-char-unsigned-flage-enabled
-//
-// TODO(yukawa): Remove this hack once we have switched to Visual C++ 2012 or
-// later.
-
-#ifndef MOZC_WIN32_ATL_WRAPPER_ATL_BASE_MOZC_H_
-#define MOZC_WIN32_ATL_WRAPPER_ATL_BASE_MOZC_H_
-
-#if _MSC_VER == 1600
-#include <atldef.h>
-#pragma push_macro("ATLSTATIC_ASSERT")
-#undef ATLSTATIC_ASSERT
-#define ATLSTATIC_ASSERT(a, b)
-#include <atlcomcli.h>
-#pragma pop_macro("ATLSTATIC_ASSERT")
-#endif  // _MSC_VER == 1600
-#include <atlbase.h>
-
-#endif  // MOZC_WIN32_ATL_WRAPPER_ATL_BASE_MOZC_H_
diff --git a/src/win32/base/accessible_object.cc b/src/win32/base/accessible_object.cc
index b745306..9f85d8a 100644
--- a/src/win32/base/accessible_object.cc
+++ b/src/win32/base/accessible_object.cc
@@ -31,8 +31,7 @@
 
 #define _ATL_NO_AUTOMATIC_NAMESPACE
 #define _WTL_NO_AUTOMATIC_NAMESPACE
-// Workaround against KB813540
-#include <atlbase_mozc.h>
+#include <atlbase.h>
 #include <atlcom.h>
 
 #include <string>
diff --git a/src/win32/base/accessible_object.h b/src/win32/base/accessible_object.h
index e8a3ff9..e29e9c2 100644
--- a/src/win32/base/accessible_object.h
+++ b/src/win32/base/accessible_object.h
@@ -34,8 +34,7 @@
 
 #define _ATL_NO_AUTOMATIC_NAMESPACE
 #define _WTL_NO_AUTOMATIC_NAMESPACE
-// Workaround against KB813540
-#include <atlbase_mozc.h>
+#include <atlbase.h>
 #include <atlcom.h>
 
 #include <vector>
diff --git a/src/win32/base/browser_info.cc b/src/win32/base/browser_info.cc
index 47b0169..4737111 100644
--- a/src/win32/base/browser_info.cc
+++ b/src/win32/base/browser_info.cc
@@ -31,8 +31,7 @@
 
 #define _ATL_NO_AUTOMATIC_NAMESPACE
 #define _WTL_NO_AUTOMATIC_NAMESPACE
-// Workaround against KB813540
-#include <atlbase_mozc.h>
+#include <atlbase.h>
 #include <atlcom.h>
 
 #include <string>
diff --git a/src/win32/base/focus_hierarchy_observer.cc b/src/win32/base/focus_hierarchy_observer.cc
index 740eb1f..9533f38 100644
--- a/src/win32/base/focus_hierarchy_observer.cc
+++ b/src/win32/base/focus_hierarchy_observer.cc
@@ -31,8 +31,7 @@
 
 #define _ATL_NO_AUTOMATIC_NAMESPACE
 #define _WTL_NO_AUTOMATIC_NAMESPACE
-// Workaround against KB813540
-#include <atlbase_mozc.h>
+#include <atlbase.h>
 #include <atlcom.h>
 
 #include <memory>
diff --git a/src/win32/base/imm_registrar.cc b/src/win32/base/imm_registrar.cc
index cc58874..284b46f 100644
--- a/src/win32/base/imm_registrar.cc
+++ b/src/win32/base/imm_registrar.cc
@@ -32,8 +32,7 @@
 
 #include <windows.h>
 #include <WinNls32.h>
-// Workaround against KB813540
-#include <atlbase_mozc.h>
+#include <atlbase.h>
 #include <strsafe.h>
 
 #include <iomanip>
diff --git a/src/win32/base/imm_util.cc b/src/win32/base/imm_util.cc
index 4535d8e..293ea5f 100644
--- a/src/win32/base/imm_util.cc
+++ b/src/win32/base/imm_util.cc
@@ -30,8 +30,7 @@
 #include "win32/base/imm_util.h"
 
 #include <windows.h>
-// Workaround against KB813540
-#include <atlbase_mozc.h>
+#include <atlbase.h>
 #include <atlstr.h>
 #include <imm.h>
 #include <msctf.h>
diff --git a/src/win32/base/migration_util.cc b/src/win32/base/migration_util.cc
index db9e6e8..c21baf6 100644
--- a/src/win32/base/migration_util.cc
+++ b/src/win32/base/migration_util.cc
@@ -33,8 +33,7 @@
 
 #define _ATL_NO_AUTOMATIC_NAMESPACE
 #define _WTL_NO_AUTOMATIC_NAMESPACE
-// Workaround against KB813540
-#include <atlbase_mozc.h>
+#include <atlbase.h>
 #include <atlstr.h>
 
 #include <strsafe.h>
diff --git a/src/win32/base/omaha_util.cc b/src/win32/base/omaha_util.cc
index 0ea89c1..b6f3232 100644
--- a/src/win32/base/omaha_util.cc
+++ b/src/win32/base/omaha_util.cc
@@ -40,8 +40,7 @@
 #define _ATL_NO_AUTOMATIC_NAMESPACE
 #define _WTL_NO_AUTOMATIC_NAMESPACE
 #define _ATL_NO_HOSTING
-// Workaround against KB813540
-#include <atlbase_mozc.h>
+#include <atlbase.h>
 
 #include <string>
 
diff --git a/src/win32/base/text_icon.cc b/src/win32/base/text_icon.cc
index 3ac6337..b894490 100644
--- a/src/win32/base/text_icon.cc
+++ b/src/win32/base/text_icon.cc
@@ -31,8 +31,7 @@
 
 #define _ATL_NO_AUTOMATIC_NAMESPACE
 #define _WTL_NO_AUTOMATIC_NAMESPACE
-// Workaround against KB813540
-#include <atlbase_mozc.h>
+#include <atlbase.h>
 #include <atlapp.h>
 #include <atlmisc.h>
 #include <atlgdi.h>
diff --git a/src/win32/base/text_icon_test.cc b/src/win32/base/text_icon_test.cc
index 86b0dbf..7985475 100644
--- a/src/win32/base/text_icon_test.cc
+++ b/src/win32/base/text_icon_test.cc
@@ -31,8 +31,7 @@
 
 #define _ATL_NO_AUTOMATIC_NAMESPACE
 #define _WTL_NO_AUTOMATIC_NAMESPACE
-// Workaround against KB813540
-#include <atlbase_mozc.h>
+#include <atlbase.h>
 #include <atlapp.h>
 #include <atlmisc.h>
 #include <atlgdi.h>
diff --git a/src/win32/base/tsf_registrar.cc b/src/win32/base/tsf_registrar.cc
index d99efa2..673f3ec 100644
--- a/src/win32/base/tsf_registrar.cc
+++ b/src/win32/base/tsf_registrar.cc
@@ -32,8 +32,7 @@
 #include <windows.h>
 #define _ATL_NO_AUTOMATIC_NAMESPACE
 #define _WTL_NO_AUTOMATIC_NAMESPACE
-// Workaround against KB813540
-#include <atlbase_mozc.h>
+#include <atlbase.h>
 #include <msctf.h>
 #include <objbase.h>
 
diff --git a/src/win32/base/uninstall_helper.cc b/src/win32/base/uninstall_helper.cc
index 6535502..a49ab81 100644
--- a/src/win32/base/uninstall_helper.cc
+++ b/src/win32/base/uninstall_helper.cc
@@ -31,8 +31,7 @@
 
 #define _ATL_NO_AUTOMATIC_NAMESPACE
 #define _WTL_NO_AUTOMATIC_NAMESPACE
-// Workaround against KB813540
-#include <atlbase_mozc.h>
+#include <atlbase.h>
 #include <atlcom.h>
 #include <msctf.h>
 #include <strsafe.h>
diff --git a/src/win32/base/win32_window_util.cc b/src/win32/base/win32_window_util.cc
index 87c77ac..6a25568 100644
--- a/src/win32/base/win32_window_util.cc
+++ b/src/win32/base/win32_window_util.cc
@@ -32,8 +32,7 @@
 #define _ATL_NO_AUTOMATIC_NAMESPACE
 #define _WTL_NO_AUTOMATIC_NAMESPACE
 #define _ATL_NO_HOSTING
-// Workaround against KB813540
-#include <atlbase_mozc.h>
+#include <atlbase.h>
 #include <atlapp.h>
 #include <atlwin.h>
 #include <atlstr.h>
diff --git a/src/win32/custom_action/custom_action.cc b/src/win32/custom_action/custom_action.cc
index a001e4d..761f3b4 100644
--- a/src/win32/custom_action/custom_action.cc
+++ b/src/win32/custom_action/custom_action.cc
@@ -30,8 +30,7 @@
 #include "win32/custom_action/custom_action.h"
 
 #include <windows.h>
-// Workaround against KB813540
-#include <atlbase_mozc.h>
+#include <atlbase.h>
 #if !defined(NO_LOGGING)
 #include <atlstr.h>
 #endif  // !NO_LOGGING
diff --git a/src/win32/ime/ime_input_context.cc b/src/win32/ime/ime_input_context.cc
index 1a116bd..6068c14 100644
--- a/src/win32/ime/ime_input_context.cc
+++ b/src/win32/ime/ime_input_context.cc
@@ -30,8 +30,7 @@
 #include "win32/ime/ime_input_context.h"
 
 #define _ATL_NO_HOSTING  // prevents including <dimm.h>
-// Workaround against KB813540
-#include <atlbase_mozc.h>
+#include <atlbase.h>
 #include <atlwin.h>
 
 #include "base/logging.h"
diff --git a/src/win32/ime/ime_language_bar.h b/src/win32/ime/ime_language_bar.h
index e54b24b..831ea9e 100644
--- a/src/win32/ime/ime_language_bar.h
+++ b/src/win32/ime/ime_language_bar.h
@@ -34,8 +34,7 @@
 #include <rpcsal.h>
 #include <msctf.h>
 #include <ctffunc.h>
-// Workaround against KB813540
-#include <atlbase_mozc.h>
+#include <atlbase.h>
 
 #include "base/port.h"
 #include "session/commands.pb.h"
diff --git a/src/win32/ime/ime_language_bar_menu.cc b/src/win32/ime/ime_language_bar_menu.cc
index 7cbea70..8f0d132 100644
--- a/src/win32/ime/ime_language_bar_menu.cc
+++ b/src/win32/ime/ime_language_bar_menu.cc
@@ -31,8 +31,7 @@
 
 #define _ATL_NO_AUTOMATIC_NAMESPACE
 #define _WTL_NO_AUTOMATIC_NAMESPACE
-// Workaround against KB813540
-#include <atlbase_mozc.h>
+#include <atlbase.h>
 #include <atlapp.h>
 #include <atlmisc.h>
 #include <atlgdi.h>
diff --git a/src/win32/ime/ime_types.cc b/src/win32/ime/ime_types.cc
index 24fcb4b..5f9b496 100644
--- a/src/win32/ime/ime_types.cc
+++ b/src/win32/ime/ime_types.cc
@@ -32,8 +32,7 @@
 #define _ATL_NO_AUTOMATIC_NAMESPACE
 #define _WTL_NO_AUTOMATIC_NAMESPACE
 #define _ATL_NO_HOSTING
-// Workaround against KB813540
-#include <atlbase_mozc.h>
+#include <atlbase.h>
 #include <atlapp.h>
 #include <atlwin.h>
 #include <atlmisc.h>
diff --git a/src/win32/ime/ime_ui_context.cc b/src/win32/ime/ime_ui_context.cc
index 115e24d..f5194d5 100644
--- a/src/win32/ime/ime_ui_context.cc
+++ b/src/win32/ime/ime_ui_context.cc
@@ -32,8 +32,7 @@
 #define _ATL_NO_AUTOMATIC_NAMESPACE
 #define _WTL_NO_AUTOMATIC_NAMESPACE
 #define _ATL_NO_HOSTING
-// Workaround against KB813540
-#include <atlbase_mozc.h>
+#include <atlbase.h>
 #include <atlapp.h>
 #include <atlstr.h>
 #include <atlmisc.h>
diff --git a/src/win32/ime/ime_ui_window.cc b/src/win32/ime/ime_ui_window.cc
index 2d0d954..92327e0 100644
--- a/src/win32/ime/ime_ui_window.cc
+++ b/src/win32/ime/ime_ui_window.cc
@@ -32,8 +32,7 @@
 #define _ATL_NO_AUTOMATIC_NAMESPACE
 #define _WTL_NO_AUTOMATIC_NAMESPACE
 #define _ATL_NO_HOSTING
-// Workaround against KB813540
-#include <atlbase_mozc.h>
+#include <atlbase.h>
 #include <atlapp.h>
 #include <atlstr.h>
 #include <atlwin.h>
diff --git a/src/win32/tip/tip_candidate_list.cc b/src/win32/tip/tip_candidate_list.cc
index 2b0b520..0f894d0 100644
--- a/src/win32/tip/tip_candidate_list.cc
+++ b/src/win32/tip/tip_candidate_list.cc
@@ -32,8 +32,7 @@
 #include <Windows.h>
 #define _ATL_NO_AUTOMATIC_NAMESPACE
 #define _WTL_NO_AUTOMATIC_NAMESPACE
-// Workaround against KB813540
-#include <atlbase_mozc.h>
+#include <atlbase.h>
 #include <atlcom.h>
 #include <ctffunc.h>
 
diff --git a/src/win32/tip/tip_candidate_list_test.cc b/src/win32/tip/tip_candidate_list_test.cc
index 814a2a1..bee5fb3 100644
--- a/src/win32/tip/tip_candidate_list_test.cc
+++ b/src/win32/tip/tip_candidate_list_test.cc
@@ -31,8 +31,7 @@
 
 #define _ATL_NO_AUTOMATIC_NAMESPACE
 #define _WTL_NO_AUTOMATIC_NAMESPACE
-// Workaround against KB813540
-#include <atlbase_mozc.h>
+#include <atlbase.h>
 #include <atlcom.h>
 #include <ctffunc.h>
 
diff --git a/src/win32/tip/tip_class_factory.cc b/src/win32/tip/tip_class_factory.cc
index 45df52d..8790139 100644
--- a/src/win32/tip/tip_class_factory.cc
+++ b/src/win32/tip/tip_class_factory.cc
@@ -31,8 +31,7 @@
 
 #define _ATL_NO_AUTOMATIC_NAMESPACE
 #define _WTL_NO_AUTOMATIC_NAMESPACE
-// Workaround against KB813540
-#include <atlbase_mozc.h>
+#include <atlbase.h>
 #include <atlcom.h>
 
 #include "win32/tip/tip_dll_module.h"
diff --git a/src/win32/tip/tip_compartment_util.h b/src/win32/tip/tip_compartment_util.h
index a360b43..0c71d14 100644
--- a/src/win32/tip/tip_compartment_util.h
+++ b/src/win32/tip/tip_compartment_util.h
@@ -33,8 +33,7 @@
 #include <Windows.h>
 #define _ATL_NO_AUTOMATIC_NAMESPACE
 #define _WTL_NO_AUTOMATIC_NAMESPACE
-// Workaround against KB813540
-#include <atlbase_mozc.h>
+#include <atlbase.h>
 #include <atlcom.h>
 #include <msctf.h>
 
diff --git a/src/win32/tip/tip_composition_util.h b/src/win32/tip/tip_composition_util.h
index 2db5be5..59e775f 100644
--- a/src/win32/tip/tip_composition_util.h
+++ b/src/win32/tip/tip_composition_util.h
@@ -33,8 +33,7 @@
 #include <Windows.h>
 #define _ATL_NO_AUTOMATIC_NAMESPACE
 #define _WTL_NO_AUTOMATIC_NAMESPACE
-// Workaround against KB813540
-#include <atlbase_mozc.h>
+#include <atlbase.h>
 #include <atlcom.h>
 #include <msctf.h>
 
diff --git a/src/win32/tip/tip_display_attributes_test.cc b/src/win32/tip/tip_display_attributes_test.cc
index 8fbb7a8..5f66396 100644
--- a/src/win32/tip/tip_display_attributes_test.cc
+++ b/src/win32/tip/tip_display_attributes_test.cc
@@ -29,8 +29,7 @@
 
 #define _ATL_NO_AUTOMATIC_NAMESPACE
 #define _WTL_NO_AUTOMATIC_NAMESPACE
-// Workaround against KB813540
-#include <atlbase_mozc.h>
+#include <atlbase.h>
 #include <atlcom.h>
 
 #include "testing/base/public/googletest.h"
diff --git a/src/win32/tip/tip_edit_session.cc b/src/win32/tip/tip_edit_session.cc
index c245607..eaa34f6 100644
--- a/src/win32/tip/tip_edit_session.cc
+++ b/src/win32/tip/tip_edit_session.cc
@@ -33,8 +33,7 @@
 
 #define _ATL_NO_AUTOMATIC_NAMESPACE
 #define _WTL_NO_AUTOMATIC_NAMESPACE
-// Workaround against KB813540
-#include <atlbase_mozc.h>
+#include <atlbase.h>
 #include <atlcom.h>
 
 #include <string>
diff --git a/src/win32/tip/tip_edit_session_impl.cc b/src/win32/tip/tip_edit_session_impl.cc
index 69db5f5..c5d8ef6 100644
--- a/src/win32/tip/tip_edit_session_impl.cc
+++ b/src/win32/tip/tip_edit_session_impl.cc
@@ -32,8 +32,7 @@
 #include <Windows.h>
 #define _ATL_NO_AUTOMATIC_NAMESPACE
 #define _WTL_NO_AUTOMATIC_NAMESPACE
-// Workaround against KB813540
-#include <atlbase_mozc.h>
+#include <atlbase.h>
 #include <atlcom.h>
 #include <msctf.h>
 
diff --git a/src/win32/tip/tip_enum_display_attributes_test.cc b/src/win32/tip/tip_enum_display_attributes_test.cc
index 965d685..414d62c 100644
--- a/src/win32/tip/tip_enum_display_attributes_test.cc
+++ b/src/win32/tip/tip_enum_display_attributes_test.cc
@@ -29,8 +29,7 @@
 
 #define _ATL_NO_AUTOMATIC_NAMESPACE
 #define _WTL_NO_AUTOMATIC_NAMESPACE
-// Workaround against KB813540
-#include <atlbase_mozc.h>
+#include <atlbase.h>
 #include <atlcom.h>
 
 #include "testing/base/public/googletest.h"
diff --git a/src/win32/tip/tip_keyevent_handler.cc b/src/win32/tip/tip_keyevent_handler.cc
index c55340d..991afc1 100644
--- a/src/win32/tip/tip_keyevent_handler.cc
+++ b/src/win32/tip/tip_keyevent_handler.cc
@@ -32,8 +32,7 @@
 #include <Windows.h>
 #define _ATL_NO_AUTOMATIC_NAMESPACE
 #define _WTL_NO_AUTOMATIC_NAMESPACE
-// Workaround against KB813540
-#include <atlbase_mozc.h>
+#include <atlbase.h>
 #include <atlcom.h>
 #include <msctf.h>
 
diff --git a/src/win32/tip/tip_lang_bar.h b/src/win32/tip/tip_lang_bar.h
index 54baa5a..dfb47ff 100644
--- a/src/win32/tip/tip_lang_bar.h
+++ b/src/win32/tip/tip_lang_bar.h
@@ -36,8 +36,7 @@
 #define _ATL_NO_AUTOMATIC_NAMESPACE
 #define _WTL_NO_AUTOMATIC_NAMESPACE
 #define _ATL_NO_HOSTING
-// Workaround against KB813540
-#include <atlbase_mozc.h>
+#include <atlbase.h>
 #include <atlcom.h>
 #include <ctffunc.h>
 #include <msctf.h>
diff --git a/src/win32/tip/tip_lang_bar_menu.cc b/src/win32/tip/tip_lang_bar_menu.cc
index 75e7ee8..bdaee64 100644
--- a/src/win32/tip/tip_lang_bar_menu.cc
+++ b/src/win32/tip/tip_lang_bar_menu.cc
@@ -31,8 +31,7 @@
 
 #define _ATL_NO_AUTOMATIC_NAMESPACE
 #define _WTL_NO_AUTOMATIC_NAMESPACE
-// Workaround against KB813540
-#include <atlbase_mozc.h>
+#include <atlbase.h>
 #include <atlapp.h>
 #include <atlmisc.h>
 #include <atlgdi.h>
diff --git a/src/win32/tip/tip_linguistic_alternates.cc b/src/win32/tip/tip_linguistic_alternates.cc
index 8a15e52..b71f49c 100644
--- a/src/win32/tip/tip_linguistic_alternates.cc
+++ b/src/win32/tip/tip_linguistic_alternates.cc
@@ -32,8 +32,7 @@
 #include <Windows.h>
 #define _ATL_NO_AUTOMATIC_NAMESPACE
 #define _WTL_NO_AUTOMATIC_NAMESPACE
-// Workaround against KB813540
-#include <atlbase_mozc.h>
+#include <atlbase.h>
 #include <atlcom.h>
 #include <Ctffunc.h>
 
diff --git a/src/win32/tip/tip_preferred_touch_keyboard.cc b/src/win32/tip/tip_preferred_touch_keyboard.cc
index c8b25e6..229d0b0 100644
--- a/src/win32/tip/tip_preferred_touch_keyboard.cc
+++ b/src/win32/tip/tip_preferred_touch_keyboard.cc
@@ -32,8 +32,7 @@
 #include <Windows.h>
 #define _ATL_NO_AUTOMATIC_NAMESPACE
 #define _WTL_NO_AUTOMATIC_NAMESPACE
-// Workaround against KB813540
-#include <atlbase_mozc.h>
+#include <atlbase.h>
 #include <atlcom.h>
 #include <Ctffunc.h>
 
diff --git a/src/win32/tip/tip_range_util.cc b/src/win32/tip/tip_range_util.cc
index b1c697c..51b0532 100644
--- a/src/win32/tip/tip_range_util.cc
+++ b/src/win32/tip/tip_range_util.cc
@@ -31,8 +31,7 @@
 
 #define _ATL_NO_AUTOMATIC_NAMESPACE
 #define _WTL_NO_AUTOMATIC_NAMESPACE
-// Workaround against KB813540
-#include <atlbase_mozc.h>
+#include <atlbase.h>
 #include <atlcom.h>
 
 #include <limits>
diff --git a/src/win32/tip/tip_reconvert_function.cc b/src/win32/tip/tip_reconvert_function.cc
index 2cdf261..f88e7bb 100644
--- a/src/win32/tip/tip_reconvert_function.cc
+++ b/src/win32/tip/tip_reconvert_function.cc
@@ -32,8 +32,7 @@
 #include <Windows.h>
 #define _ATL_NO_AUTOMATIC_NAMESPACE
 #define _WTL_NO_AUTOMATIC_NAMESPACE
-// Workaround against KB813540
-#include <atlbase_mozc.h>
+#include <atlbase.h>
 #include <atlcom.h>
 #include <Ctffunc.h>
 
diff --git a/src/win32/tip/tip_search_candidate_provider.cc b/src/win32/tip/tip_search_candidate_provider.cc
index 2a21ffa..f300060 100644
--- a/src/win32/tip/tip_search_candidate_provider.cc
+++ b/src/win32/tip/tip_search_candidate_provider.cc
@@ -32,8 +32,7 @@
 #include <Windows.h>
 #define _ATL_NO_AUTOMATIC_NAMESPACE
 #define _WTL_NO_AUTOMATIC_NAMESPACE
-// Workaround against KB813540
-#include <atlbase_mozc.h>
+#include <atlbase.h>
 #include <atlcom.h>
 #include <Ctffunc.h>
 
diff --git a/src/win32/tip/tip_status.cc b/src/win32/tip/tip_status.cc
index 115caa2..1a35180 100644
--- a/src/win32/tip/tip_status.cc
+++ b/src/win32/tip/tip_status.cc
@@ -31,8 +31,7 @@
 
 #define _ATL_NO_AUTOMATIC_NAMESPACE
 #define _WTL_NO_AUTOMATIC_NAMESPACE
-// Workaround against KB813540
-#include <atlbase_mozc.h>
+#include <atlbase.h>
 #include <atlcom.h>
 
 #include <string>
diff --git a/src/win32/tip/tip_surrounding_text.cc b/src/win32/tip/tip_surrounding_text.cc
index cc504fa..e03c781 100644
--- a/src/win32/tip/tip_surrounding_text.cc
+++ b/src/win32/tip/tip_surrounding_text.cc
@@ -32,8 +32,7 @@
 #include <Windows.h>
 #define _ATL_NO_AUTOMATIC_NAMESPACE
 #define _WTL_NO_AUTOMATIC_NAMESPACE
-// Workaround against KB813540
-#include <atlbase_mozc.h>
+#include <atlbase.h>
 #include <atlcom.h>
 #include <msctf.h>
 
diff --git a/src/win32/tip/tip_text_service.cc b/src/win32/tip/tip_text_service.cc
index 3ee6b43..bfa7959 100644
--- a/src/win32/tip/tip_text_service.cc
+++ b/src/win32/tip/tip_text_service.cc
@@ -32,8 +32,7 @@
 #include <Ime.h>
 #define _ATL_NO_AUTOMATIC_NAMESPACE
 #define _WTL_NO_AUTOMATIC_NAMESPACE
-// Workaround against KB813540
-#include <atlbase_mozc.h>
+#include <atlbase.h>
 #include <atlcom.h>
 #include <objbase.h>
 
diff --git a/src/win32/tip/tip_transitory_extension.cc b/src/win32/tip/tip_transitory_extension.cc
index 55ce091..74aae8e 100644
--- a/src/win32/tip/tip_transitory_extension.cc
+++ b/src/win32/tip/tip_transitory_extension.cc
@@ -32,8 +32,7 @@
 #include <Windows.h>
 #define _ATL_NO_AUTOMATIC_NAMESPACE
 #define _WTL_NO_AUTOMATIC_NAMESPACE
-// Workaround against KB813540
-#include <atlbase_mozc.h>
+#include <atlbase.h>
 #include <atlcom.h>
 #include <msctf.h>
 
diff --git a/src/win32/tip/tip_transitory_extension.h b/src/win32/tip/tip_transitory_extension.h
index 4bc41ae..80e4447 100644
--- a/src/win32/tip/tip_transitory_extension.h
+++ b/src/win32/tip/tip_transitory_extension.h
@@ -33,8 +33,7 @@
 #include <Windows.h>
 #define _ATL_NO_AUTOMATIC_NAMESPACE
 #define _WTL_NO_AUTOMATIC_NAMESPACE
-// Workaround against KB813540
-#include <atlbase_mozc.h>
+#include <atlbase.h>
 #include <atlcom.h>
 #include <msctf.h>
 
diff --git a/src/win32/tip/tip_ui_element_conventional.cc b/src/win32/tip/tip_ui_element_conventional.cc
index d97ba70..03dc8ef 100644
--- a/src/win32/tip/tip_ui_element_conventional.cc
+++ b/src/win32/tip/tip_ui_element_conventional.cc
@@ -31,8 +31,7 @@
 
 #define _ATL_NO_AUTOMATIC_NAMESPACE
 #define _WTL_NO_AUTOMATIC_NAMESPACE
-// Workaround against KB813540
-#include <atlbase_mozc.h>
+#include <atlbase.h>
 #include <atlcom.h>
 #include <atlstr.h>
 #include <msctf.h>
diff --git a/src/win32/tip/tip_ui_element_delegate.cc b/src/win32/tip/tip_ui_element_delegate.cc
index ae9a3fb..a2e19b7 100644
--- a/src/win32/tip/tip_ui_element_delegate.cc
+++ b/src/win32/tip/tip_ui_element_delegate.cc
@@ -31,8 +31,7 @@
 
 #define _ATL_NO_AUTOMATIC_NAMESPACE
 #define _WTL_NO_AUTOMATIC_NAMESPACE
-// Workaround against KB813540
-#include <atlbase_mozc.h>
+#include <atlbase.h>
 #include <atlcom.h>
 #include <atlstr.h>
 #include <msctf.h>
diff --git a/src/win32/tip/tip_ui_element_immersive.cc b/src/win32/tip/tip_ui_element_immersive.cc
index 0ed462a..3dfce55 100644
--- a/src/win32/tip/tip_ui_element_immersive.cc
+++ b/src/win32/tip/tip_ui_element_immersive.cc
@@ -31,8 +31,7 @@
 
 #define _ATL_NO_AUTOMATIC_NAMESPACE
 #define _WTL_NO_AUTOMATIC_NAMESPACE
-// Workaround against KB813540
-#include <atlbase_mozc.h>
+#include <atlbase.h>
 #include <atlcom.h>
 #include <atlapp.h>
 #include <atlmisc.h>
diff --git a/src/win32/tip/tip_ui_element_manager.cc b/src/win32/tip/tip_ui_element_manager.cc
index 500d922..fda21ea 100644
--- a/src/win32/tip/tip_ui_element_manager.cc
+++ b/src/win32/tip/tip_ui_element_manager.cc
@@ -31,8 +31,7 @@
 
 #define _ATL_NO_AUTOMATIC_NAMESPACE
 #define _WTL_NO_AUTOMATIC_NAMESPACE
-// Workaround against KB813540
-#include <atlbase_mozc.h>
+#include <atlbase.h>
 #include <atlcom.h>
 #include <atlstr.h>
 #include <msctf.h>
diff --git a/src/win32/tip/tip_ui_handler_conventional.cc b/src/win32/tip/tip_ui_handler_conventional.cc
index 9981fca..faaa93b 100644
--- a/src/win32/tip/tip_ui_handler_conventional.cc
+++ b/src/win32/tip/tip_ui_handler_conventional.cc
@@ -31,8 +31,7 @@
 
 #define _ATL_NO_AUTOMATIC_NAMESPACE
 #define _WTL_NO_AUTOMATIC_NAMESPACE
-// Workaround against KB813540
-#include <atlbase_mozc.h>
+#include <atlbase.h>
 #include <atlcom.h>
 #include <msctf.h>
 #include <CommCtrl.h>  // for CCSIZEOF_STRUCT
diff --git a/src/win32/tip/tip_ui_handler_immersive.cc b/src/win32/tip/tip_ui_handler_immersive.cc
index 30cda8f..594923d 100644
--- a/src/win32/tip/tip_ui_handler_immersive.cc
+++ b/src/win32/tip/tip_ui_handler_immersive.cc
@@ -31,8 +31,7 @@
 
 #define _ATL_NO_AUTOMATIC_NAMESPACE
 #define _WTL_NO_AUTOMATIC_NAMESPACE
-// Workaround against KB813540
-#include <atlbase_mozc.h>
+#include <atlbase.h>
 #include <atlcom.h>
 #include <atlapp.h>
 #include <atlmisc.h>
diff --git a/src/win32/tip/tip_ui_renderer_immersive.cc b/src/win32/tip/tip_ui_renderer_immersive.cc
index 594b5f5..c0d6927 100644
--- a/src/win32/tip/tip_ui_renderer_immersive.cc
+++ b/src/win32/tip/tip_ui_renderer_immersive.cc
@@ -31,8 +31,7 @@
 
 #define _ATL_NO_AUTOMATIC_NAMESPACE
 #define _WTL_NO_AUTOMATIC_NAMESPACE
-// Workaround against KB813540
-#include <atlbase_mozc.h>
+#include <atlbase.h>
 #include <atlapp.h>
 #include <atlmisc.h>