diff --git a/Telegram/SourceFiles/platform/win/integration_win.h b/Telegram/SourceFiles/platform/win/integration_win.h
index 5e559b69a6..dae9784119 100644
--- a/Telegram/SourceFiles/platform/win/integration_win.h
+++ b/Telegram/SourceFiles/platform/win/integration_win.h
@@ -7,13 +7,12 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 */
 #pragma once
 
+#include "base/platform/win/base_windows_shlobj_h.h"
 #include "base/platform/win/base_windows_winrt.h"
 #include "platform/platform_integration.h"
 
 #include <QAbstractNativeEventFilter>
 
-#include <ShlObj.h>
-
 namespace Platform {
 
 class WindowsIntegration final
diff --git a/Telegram/SourceFiles/platform/win/launcher_win.cpp b/Telegram/SourceFiles/platform/win/launcher_win.cpp
index 5b19892bfe..d6bf912ba5 100644
--- a/Telegram/SourceFiles/platform/win/launcher_win.cpp
+++ b/Telegram/SourceFiles/platform/win/launcher_win.cpp
@@ -9,8 +9,8 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 
 #include "core/crash_reports.h"
 #include "core/update_checker.h"
-#include "base/platform/win/base_windows_h.h"
 
+#include <windows.h>
 #include <shellapi.h>
 #include <VersionHelpers.h>
 
diff --git a/Telegram/SourceFiles/platform/win/main_window_win.h b/Telegram/SourceFiles/platform/win/main_window_win.h
index 9459fe50f4..856bee773e 100644
--- a/Telegram/SourceFiles/platform/win/main_window_win.h
+++ b/Telegram/SourceFiles/platform/win/main_window_win.h
@@ -8,9 +8,10 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 #pragma once
 
 #include "platform/platform_main_window.h"
-#include "base/platform/win/base_windows_h.h"
 #include "base/flags.h"
 
+#include <windows.h>
+
 namespace Ui {
 class PopupMenu;
 } // namespace Ui
diff --git a/Telegram/SourceFiles/platform/win/notifications_manager_win.cpp b/Telegram/SourceFiles/platform/win/notifications_manager_win.cpp
index 41bf5f786a..be08406364 100644
--- a/Telegram/SourceFiles/platform/win/notifications_manager_win.cpp
+++ b/Telegram/SourceFiles/platform/win/notifications_manager_win.cpp
@@ -10,6 +10,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 #include "window/notifications_utilities.h"
 #include "window/window_session_controller.h"
 #include "base/platform/win/base_windows_co_task_mem.h"
+#include "base/platform/win/base_windows_rpcndr_h.h"
 #include "base/platform/win/base_windows_winrt.h"
 #include "base/platform/base_platform_info.h"
 #include "base/platform/win/wrl/wrl_module_h.h"
diff --git a/Telegram/SourceFiles/platform/win/specific_win.cpp b/Telegram/SourceFiles/platform/win/specific_win.cpp
index 3f504357d6..77cc18de50 100644
--- a/Telegram/SourceFiles/platform/win/specific_win.cpp
+++ b/Telegram/SourceFiles/platform/win/specific_win.cpp
@@ -14,6 +14,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 #include "platform/win/windows_autostart_task.h"
 #include "base/platform/base_platform_info.h"
 #include "base/platform/win/base_windows_co_task_mem.h"
+#include "base/platform/win/base_windows_shlobj_h.h"
 #include "base/platform/win/base_windows_winrt.h"
 #include "base/call_delayed.h"
 #include "ui/boxes/confirm_box.h"
@@ -41,7 +42,6 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 #include <openssl/err.h>
 
 #include <dbghelp.h>
-#include <shlobj.h>
 #include <Shlwapi.h>
 #include <Strsafe.h>
 #include <Windowsx.h>
diff --git a/Telegram/SourceFiles/platform/win/specific_win.h b/Telegram/SourceFiles/platform/win/specific_win.h
index acb2eda927..56f73a1b41 100644
--- a/Telegram/SourceFiles/platform/win/specific_win.h
+++ b/Telegram/SourceFiles/platform/win/specific_win.h
@@ -8,7 +8,8 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 #pragma once
 
 #include "platform/platform_specific.h"
-#include "base/platform/win/base_windows_h.h"
+
+#include <windows.h>
 
 namespace Data {
 class LocationPoint;
diff --git a/Telegram/SourceFiles/platform/win/windows_app_user_model_id.h b/Telegram/SourceFiles/platform/win/windows_app_user_model_id.h
index 4f69019ebd..76a7a33129 100644
--- a/Telegram/SourceFiles/platform/win/windows_app_user_model_id.h
+++ b/Telegram/SourceFiles/platform/win/windows_app_user_model_id.h
@@ -7,8 +7,6 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 */
 #pragma once
 
-#include "base/platform/win/base_windows_h.h"
-
 #include <wtypes.h>
 
 namespace Platform {
diff --git a/Telegram/SourceFiles/platform/win/windows_dlls.h b/Telegram/SourceFiles/platform/win/windows_dlls.h
index d97eeab92d..26f4783761 100644
--- a/Telegram/SourceFiles/platform/win/windows_dlls.h
+++ b/Telegram/SourceFiles/platform/win/windows_dlls.h
@@ -7,10 +7,10 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 */
 #pragma once
 
-#include "base/platform/win/base_windows_h.h"
+#include "base/platform/win/base_windows_shlobj_h.h"
 
+#include <windows.h>
 #include <shellapi.h>
-#include <shlobj.h>
 #include <dwmapi.h>
 #include <RestartManager.h>
 #include <psapi.h>
diff --git a/Telegram/SourceFiles/platform/win/windows_toast_activator.h b/Telegram/SourceFiles/platform/win/windows_toast_activator.h
index ba6c2b32cd..0c859421f6 100644
--- a/Telegram/SourceFiles/platform/win/windows_toast_activator.h
+++ b/Telegram/SourceFiles/platform/win/windows_toast_activator.h
@@ -7,7 +7,9 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 */
 #pragma once
 
+#include "base/platform/win/base_windows_rpcndr_h.h"
 #include "windows_toastactivator_h.h"
+
 #include "base/platform/win/wrl/wrl_implements_h.h"
 
 // {F11932D3-6110-4BBC-9B02-B2EC07A1BD19}
diff --git a/Telegram/lib_base b/Telegram/lib_base
index fe4f0a72d2..5432626ef2 160000
--- a/Telegram/lib_base
+++ b/Telegram/lib_base
@@ -1 +1 @@
-Subproject commit fe4f0a72d2041a860c67a81a70f2e4b6f845d9fb
+Subproject commit 5432626ef2af59f55110c3bf17556d16c48a4ac3
diff --git a/Telegram/lib_storage b/Telegram/lib_storage
index 1dfd1c186d..de73188516 160000
--- a/Telegram/lib_storage
+++ b/Telegram/lib_storage
@@ -1 +1 @@
-Subproject commit 1dfd1c186dd67e8de5f0721e6fae487a05f3ea94
+Subproject commit de731885163bc1b3fe3095413453777ee89a8561
diff --git a/Telegram/lib_ui b/Telegram/lib_ui
index f9b24c7551..fee301f941 160000
--- a/Telegram/lib_ui
+++ b/Telegram/lib_ui
@@ -1 +1 @@
-Subproject commit f9b24c75512bc5f73b9ec5e6612858394582a328
+Subproject commit fee301f94197d3351f2f20671c329b81540e63e2
diff --git a/Telegram/lib_webview b/Telegram/lib_webview
index aab27269ff..3495eb8dd8 160000
--- a/Telegram/lib_webview
+++ b/Telegram/lib_webview
@@ -1 +1 @@
-Subproject commit aab27269ff8aad5dfaf7372db10bff700fdb5fe9
+Subproject commit 3495eb8dd8f4e2dab9493b4a698e5006fadbca47