diff --git a/Telegram/SourceFiles/platform/mac/file_utilities_mac.mm b/Telegram/SourceFiles/platform/mac/file_utilities_mac.mm
index 000f3db4f..42b30fdef 100644
--- a/Telegram/SourceFiles/platform/mac/file_utilities_mac.mm
+++ b/Telegram/SourceFiles/platform/mac/file_utilities_mac.mm
@@ -7,7 +7,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 */
 #include "platform/mac/file_utilities_mac.h"
 
-#include "base/platform/mac/base_platform_utilities_mac.h"
+#include "base/platform/mac/base_utilities_mac.h"
 #include "lang/lang_keys.h"
 #include "styles/style_window.h"
 
diff --git a/Telegram/SourceFiles/platform/mac/launcher_mac.mm b/Telegram/SourceFiles/platform/mac/launcher_mac.mm
index 2182e97ca..28da1bf59 100644
--- a/Telegram/SourceFiles/platform/mac/launcher_mac.mm
+++ b/Telegram/SourceFiles/platform/mac/launcher_mac.mm
@@ -10,7 +10,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 #include "core/crash_reports.h"
 #include "core/update_checker.h"
 #include "base/platform/base_platform_info.h"
-#include "base/platform/mac/base_platform_utilities_mac.h"
+#include "base/platform/mac/base_utilities_mac.h"
 #include "platform/platform_specific.h"
 
 #include <Cocoa/Cocoa.h>
diff --git a/Telegram/SourceFiles/platform/mac/mac_touchbar.mm b/Telegram/SourceFiles/platform/mac/mac_touchbar.mm
index f8869f488..0c305126a 100644
--- a/Telegram/SourceFiles/platform/mac/mac_touchbar.mm
+++ b/Telegram/SourceFiles/platform/mac/mac_touchbar.mm
@@ -28,7 +28,7 @@
 #include "mainwidget.h"
 #include "mainwindow.h"
 #include "observer_peer.h"
-#include "base/platform/mac/base_platform_utilities_mac.h"
+#include "base/platform/mac/base_utilities_mac.h"
 #include "stickers.h"
 #include "styles/style_dialogs.h"
 #include "styles/style_media_player.h"
diff --git a/Telegram/SourceFiles/platform/mac/main_window_mac.mm b/Telegram/SourceFiles/platform/mac/main_window_mac.mm
index a67c278e4..482d12d76 100644
--- a/Telegram/SourceFiles/platform/mac/main_window_mac.mm
+++ b/Telegram/SourceFiles/platform/mac/main_window_mac.mm
@@ -30,7 +30,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 #include "boxes/peer_list_controllers.h"
 #include "boxes/about_box.h"
 #include "lang/lang_keys.h"
-#include "base/platform/mac/base_platform_utilities_mac.h"
+#include "base/platform/mac/base_utilities_mac.h"
 #include "ui/widgets/input_fields.h"
 #include "facades.h"
 #include "app.h"
diff --git a/Telegram/SourceFiles/platform/mac/notifications_manager_mac.mm b/Telegram/SourceFiles/platform/mac/notifications_manager_mac.mm
index 99c1c7669..3459086fe 100644
--- a/Telegram/SourceFiles/platform/mac/notifications_manager_mac.mm
+++ b/Telegram/SourceFiles/platform/mac/notifications_manager_mac.mm
@@ -9,7 +9,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 
 #include "base/platform/base_platform_info.h"
 #include "platform/platform_specific.h"
-#include "base/platform/mac/base_platform_utilities_mac.h"
+#include "base/platform/mac/base_utilities_mac.h"
 #include "history/history.h"
 #include "ui/empty_userpic.h"
 #include "mainwindow.h"
diff --git a/Telegram/SourceFiles/platform/mac/specific_mac.mm b/Telegram/SourceFiles/platform/mac/specific_mac.mm
index bcc0132dc..ec7631c78 100644
--- a/Telegram/SourceFiles/platform/mac/specific_mac.mm
+++ b/Telegram/SourceFiles/platform/mac/specific_mac.mm
@@ -15,7 +15,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 #include "storage/localstorage.h"
 #include "mainwindow.h"
 #include "history/history_location_manager.h"
-#include "base/platform/mac/base_platform_utilities_mac.h"
+#include "base/platform/mac/base_utilities_mac.h"
 #include "facades.h"
 
 #include <QtGui/QDesktopServices>
diff --git a/Telegram/SourceFiles/platform/mac/specific_mac_p.mm b/Telegram/SourceFiles/platform/mac/specific_mac_p.mm
index 3b4c3ee24..82805bf8e 100644
--- a/Telegram/SourceFiles/platform/mac/specific_mac_p.mm
+++ b/Telegram/SourceFiles/platform/mac/specific_mac_p.mm
@@ -16,7 +16,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 #include "media/audio/media_audio.h"
 #include "media/player/media_player_instance.h"
 #include "platform/mac/mac_touchbar.h"
-#include "base/platform/mac/base_platform_utilities_mac.h"
+#include "base/platform/mac/base_utilities_mac.h"
 #include "base/platform/base_platform_info.h"
 #include "lang/lang_keys.h"
 #include "base/timer.h"
diff --git a/Telegram/SourceFiles/platform/win/launcher_win.cpp b/Telegram/SourceFiles/platform/win/launcher_win.cpp
index 8dde12456..176dd041a 100644
--- a/Telegram/SourceFiles/platform/win/launcher_win.cpp
+++ b/Telegram/SourceFiles/platform/win/launcher_win.cpp
@@ -10,7 +10,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 #include "core/crash_reports.h"
 #include "core/update_checker.h"
 #include "base/platform/base_platform_info.h"
-#include "base/platform/win/base_platform_windows_h.h"
+#include "base/platform/win/base_windows_h.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 ef5efd377..6ec9648d1 100644
--- a/Telegram/SourceFiles/platform/win/main_window_win.h
+++ b/Telegram/SourceFiles/platform/win/main_window_win.h
@@ -8,7 +8,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 #pragma once
 
 #include "platform/platform_main_window.h"
-#include "base/platform/win/base_platform_windows_h.h"
+#include "base/platform/win/base_windows_h.h"
 #include "base/flags.h"
 
 #include <QtCore/QTimer>
diff --git a/Telegram/SourceFiles/platform/win/specific_win.h b/Telegram/SourceFiles/platform/win/specific_win.h
index 6be74a4e2..49a5836d6 100644
--- a/Telegram/SourceFiles/platform/win/specific_win.h
+++ b/Telegram/SourceFiles/platform/win/specific_win.h
@@ -8,7 +8,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 #pragma once
 
 #include "platform/platform_specific.h"
-#include "base/platform/win/base_platform_windows_h.h"
+#include "base/platform/win/base_windows_h.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 160693a8c..464e44041 100644
--- a/Telegram/SourceFiles/platform/win/windows_app_user_model_id.h
+++ b/Telegram/SourceFiles/platform/win/windows_app_user_model_id.h
@@ -7,7 +7,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 */
 #pragma once
 
-#include "base/platform/win/base_platform_windows_h.h"
+#include "base/platform/win/base_windows_h.h"
 
 namespace Platform {
 namespace AppUserModelId {
diff --git a/Telegram/SourceFiles/platform/win/windows_dlls.h b/Telegram/SourceFiles/platform/win/windows_dlls.h
index ee9b266a3..341da5073 100644
--- a/Telegram/SourceFiles/platform/win/windows_dlls.h
+++ b/Telegram/SourceFiles/platform/win/windows_dlls.h
@@ -7,7 +7,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 */
 #pragma once
 
-#include "base/platform/win/base_platform_windows_h.h"
+#include "base/platform/win/base_windows_h.h"
 
 #include <shlobj.h>
 #include <roapi.h>
diff --git a/Telegram/SourceFiles/platform/win/windows_event_filter.h b/Telegram/SourceFiles/platform/win/windows_event_filter.h
index 920d31caf..84ac63093 100644
--- a/Telegram/SourceFiles/platform/win/windows_event_filter.h
+++ b/Telegram/SourceFiles/platform/win/windows_event_filter.h
@@ -7,7 +7,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 */
 #pragma once
 
-#include "base/platform/win/base_platform_windows_h.h"
+#include "base/platform/win/base_windows_h.h"
 
 #include <QtCore/QAbstractNativeEventFilter>
 
diff --git a/Telegram/SourceFiles/storage/storage_clear_legacy_win.cpp b/Telegram/SourceFiles/storage/storage_clear_legacy_win.cpp
index 00a73f0a0..c93a93992 100644
--- a/Telegram/SourceFiles/storage/storage_clear_legacy_win.cpp
+++ b/Telegram/SourceFiles/storage/storage_clear_legacy_win.cpp
@@ -7,7 +7,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 */
 #include "storage/storage_clear_legacy.h"
 
-#include "base/platform/win/base_platform_windows_h.h"
+#include "base/platform/win/base_windows_h.h"
 
 namespace Storage {
 namespace details {
diff --git a/Telegram/SourceFiles/storage/storage_file_lock_win.cpp b/Telegram/SourceFiles/storage/storage_file_lock_win.cpp
index e06667c38..84ada9397 100644
--- a/Telegram/SourceFiles/storage/storage_file_lock_win.cpp
+++ b/Telegram/SourceFiles/storage/storage_file_lock_win.cpp
@@ -8,7 +8,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 #include "storage/storage_file_lock.h"
 
 #include "platform/win/windows_dlls.h"
-#include "base/platform/win/base_platform_windows_h.h"
+#include "base/platform/win/base_windows_h.h"
 
 #include <io.h>
 #include <fileapi.h>
diff --git a/Telegram/lib_base b/Telegram/lib_base
index d19c67201..cfc1a874e 160000
--- a/Telegram/lib_base
+++ b/Telegram/lib_base
@@ -1 +1 @@
-Subproject commit d19c6720195269e252038563e370253fea968f1c
+Subproject commit cfc1a874eb603c345f60be2ce98a885d9f336d14
diff --git a/Telegram/lib_ui b/Telegram/lib_ui
index c9990aee0..84d68e48c 160000
--- a/Telegram/lib_ui
+++ b/Telegram/lib_ui
@@ -1 +1 @@
-Subproject commit c9990aee058d0b321a01a3f564b6eaff886628d0
+Subproject commit 84d68e48c0808f6641b4ea7badc5a977052010a1