diff --git a/Telegram/SourceFiles/info/downloads/info_downloads_provider.cpp b/Telegram/SourceFiles/info/downloads/info_downloads_provider.cpp
index 36059ac33..5dbea6fdf 100644
--- a/Telegram/SourceFiles/info/downloads/info_downloads_provider.cpp
+++ b/Telegram/SourceFiles/info/downloads/info_downloads_provider.cpp
@@ -23,6 +23,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 #include "core/application.h"
 #include "storage/storage_shared_media.h"
 #include "layout/layout_selection.h"
+#include "styles/style_overview.h"
 
 namespace Info::Downloads {
 namespace {
diff --git a/Telegram/SourceFiles/info/media/info_media_list_section.cpp b/Telegram/SourceFiles/info/media/info_media_list_section.cpp
index 2bf957192..ba207ff28 100644
--- a/Telegram/SourceFiles/info/media/info_media_list_section.cpp
+++ b/Telegram/SourceFiles/info/media/info_media_list_section.cpp
@@ -10,6 +10,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 #include "storage/storage_shared_media.h"
 #include "layout/layout_selection.h"
 #include "ui/painter.h"
+#include "styles/style_chat_helpers.h"
 #include "styles/style_info.h"
 
 namespace Info::Media {
diff --git a/Telegram/SourceFiles/info/media/info_media_provider.cpp b/Telegram/SourceFiles/info/media/info_media_provider.cpp
index 3e75975fa..2fc69733e 100644
--- a/Telegram/SourceFiles/info/media/info_media_provider.cpp
+++ b/Telegram/SourceFiles/info/media/info_media_provider.cpp
@@ -24,6 +24,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 #include "data/data_peer_values.h"
 #include "data/data_document.h"
 #include "styles/style_info.h"
+#include "styles/style_overview.h"
 
 namespace Info::Media {
 namespace {
diff --git a/Telegram/SourceFiles/layout/layout_mosaic.h b/Telegram/SourceFiles/layout/layout_mosaic.h
index b8730f84c..8695d9dc1 100644
--- a/Telegram/SourceFiles/layout/layout_mosaic.h
+++ b/Telegram/SourceFiles/layout/layout_mosaic.h
@@ -10,8 +10,6 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 #include "layout/abstract_layout_item.h"
 #include "layout/layout_position.h"
 
-#include "styles/style_chat_helpers.h"
-
 namespace Mosaic::Layout {
 
 struct FoundItem {
diff --git a/Telegram/SourceFiles/media/view/media_view_playback_controls.h b/Telegram/SourceFiles/media/view/media_view_playback_controls.h
index 5f79cba52..ac5e15baa 100644
--- a/Telegram/SourceFiles/media/view/media_view_playback_controls.h
+++ b/Telegram/SourceFiles/media/view/media_view_playback_controls.h
@@ -9,8 +9,6 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 
 #include "ui/rp_widget.h"
 #include "base/object_ptr.h"
-#include "base/unique_qptr.h"
-#include "styles/style_widgets.h"
 
 namespace Ui {
 class LabelSimple;
diff --git a/Telegram/SourceFiles/overview/overview_layout.cpp b/Telegram/SourceFiles/overview/overview_layout.cpp
index 9ac811f19..ea4ebd6ec 100644
--- a/Telegram/SourceFiles/overview/overview_layout.cpp
+++ b/Telegram/SourceFiles/overview/overview_layout.cpp
@@ -14,14 +14,9 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 #include "data/data_web_page.h"
 #include "data/data_media_types.h"
 #include "data/data_peer.h"
-#include "data/data_file_origin.h"
 #include "data/data_photo_media.h"
 #include "data/data_document_media.h"
 #include "data/data_file_click_handler.h"
-#include "styles/style_overview.h"
-#include "styles/style_chat.h"
-#include "core/file_utilities.h"
-#include "boxes/add_contact_box.h"
 #include "ui/boxes/confirm_box.h"
 #include "lang/lang_keys.h"
 #include "layout/layout_selection.h"
@@ -50,6 +45,8 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 #include "ui/painter.h"
 #include "ui/power_saving.h"
 #include "ui/ui_utility.h"
+#include "styles/style_overview.h"
+#include "styles/style_chat.h"
 
 namespace Overview {
 namespace Layout {
diff --git a/Telegram/SourceFiles/overview/overview_layout.h b/Telegram/SourceFiles/overview/overview_layout.h
index e566de4a5..d17ae7f6c 100644
--- a/Telegram/SourceFiles/overview/overview_layout.h
+++ b/Telegram/SourceFiles/overview/overview_layout.h
@@ -13,12 +13,12 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 #include "core/click_handler_types.h"
 #include "ui/effects/animations.h"
 #include "ui/effects/radial_animation.h"
-#include "styles/style_overview.h"
 
 class Image;
 
 namespace style {
 struct RoundCheckbox;
+struct OverviewFileLayout;
 } // namespace style
 
 namespace Data {
@@ -367,6 +367,7 @@ struct DocumentFields {
 	TimeId dateOverride = 0;
 	bool forceFileLayout = false;
 };
+
 class Document final : public RadialProgressItem {
 public:
 	Document(
diff --git a/Telegram/SourceFiles/ui/boxes/country_select_box.h b/Telegram/SourceFiles/ui/boxes/country_select_box.h
index 507e478e9..553fd39e2 100644
--- a/Telegram/SourceFiles/ui/boxes/country_select_box.h
+++ b/Telegram/SourceFiles/ui/boxes/country_select_box.h
@@ -8,7 +8,6 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 #pragma once
 
 #include "ui/layers/box_content.h"
-#include "styles/style_widgets.h"
 
 namespace Countries {
 struct Info;
diff --git a/Telegram/SourceFiles/ui/effects/round_checkbox.cpp b/Telegram/SourceFiles/ui/effects/round_checkbox.cpp
index 78996a89c..fbd67b220 100644
--- a/Telegram/SourceFiles/ui/effects/round_checkbox.cpp
+++ b/Telegram/SourceFiles/ui/effects/round_checkbox.cpp
@@ -11,7 +11,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 #include "ui/ui_utility.h"
 #include "ui/painter.h"
 #include "ui/effects/outline_segments.h"
-#include "ui/image/image_prepare.h"
+#include "styles/style_widgets.h"
 
 #include <QtCore/QCoreApplication>
 
@@ -21,6 +21,10 @@ namespace {
 constexpr auto kAnimationTimerDelta = crl::time(7);
 constexpr auto kWideScale = 3;
 
+[[nodiscard]] int CountFramesCount(const style::RoundCheckbox *st) {
+	return (st->duration / kAnimationTimerDelta) + 1;
+}
+
 class CheckCaches : public QObject {
 public:
 	CheckCaches(QObject *parent) : QObject(parent) {
@@ -46,7 +50,6 @@ private:
 		QPixmap check;
 	};
 
-	int countFramesCount(const style::RoundCheckbox *st);
 	Frames &framesForStyle(
 		const style::RoundCheckbox *st,
 		bool displayInactive);
@@ -141,10 +144,6 @@ QRect WideDestRect(
 	return QRect(iconLeft, iconTop, iconSize, iconSize);
 }
 
-int CheckCaches::countFramesCount(const style::RoundCheckbox *st) {
-	return (st->duration / kAnimationTimerDelta) + 1;
-}
-
 CheckCaches::Frames &CheckCaches::framesForStyle(
 		const style::RoundCheckbox *st,
 		bool displayInactive) {
@@ -163,7 +162,7 @@ void CheckCaches::prepareFramesData(
 		const style::RoundCheckbox *st,
 		bool displayInactive,
 		Frames &frames) {
-	frames.list.resize(countFramesCount(st));
+	frames.list.resize(CountFramesCount(st));
 	frames.displayInactive = displayInactive;
 
 	if (!frames.displayInactive) {
diff --git a/Telegram/SourceFiles/ui/effects/round_checkbox.h b/Telegram/SourceFiles/ui/effects/round_checkbox.h
index ff24ac597..49377c0ec 100644
--- a/Telegram/SourceFiles/ui/effects/round_checkbox.h
+++ b/Telegram/SourceFiles/ui/effects/round_checkbox.h
@@ -8,7 +8,11 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 #pragma once
 
 #include "ui/effects/animations.h"
-#include "styles/style_widgets.h"
+
+namespace style {
+struct RoundCheckbox;
+struct RoundImageCheckbox;
+} // namespace style
 
 class Painter;
 enum class ImageRoundRadius;
diff --git a/Telegram/SourceFiles/ui/widgets/continuous_sliders.cpp b/Telegram/SourceFiles/ui/widgets/continuous_sliders.cpp
index ea4e252ff..d400c1240 100644
--- a/Telegram/SourceFiles/ui/widgets/continuous_sliders.cpp
+++ b/Telegram/SourceFiles/ui/widgets/continuous_sliders.cpp
@@ -10,6 +10,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 #include "ui/painter.h"
 #include "base/timer.h"
 #include "base/platform/base_platform_info.h"
+#include "styles/style_widgets.h"
 
 namespace Ui {
 namespace {
diff --git a/Telegram/SourceFiles/ui/widgets/continuous_sliders.h b/Telegram/SourceFiles/ui/widgets/continuous_sliders.h
index 51c82883d..e5900bcbf 100644
--- a/Telegram/SourceFiles/ui/widgets/continuous_sliders.h
+++ b/Telegram/SourceFiles/ui/widgets/continuous_sliders.h
@@ -7,7 +7,6 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 */
 #pragma once
 
-#include "styles/style_widgets.h"
 #include "ui/effects/animations.h"
 #include "ui/rp_widget.h"
 
@@ -15,6 +14,11 @@ namespace base {
 class Timer;
 } // namespace base
 
+namespace style {
+struct FilledSlider;
+struct MediaSlider;
+} // namespace style
+
 namespace Ui {
 
 class ContinuousSlider : public RpWidget {
diff --git a/Telegram/SourceFiles/ui/widgets/discrete_sliders.cpp b/Telegram/SourceFiles/ui/widgets/discrete_sliders.cpp
index 174d84d29..3dda10b06 100644
--- a/Telegram/SourceFiles/ui/widgets/discrete_sliders.cpp
+++ b/Telegram/SourceFiles/ui/widgets/discrete_sliders.cpp
@@ -9,7 +9,6 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 
 #include "ui/effects/ripple_animation.h"
 #include "ui/painter.h"
-#include "styles/style_widgets.h"
 
 namespace Ui {
 
diff --git a/Telegram/SourceFiles/ui/widgets/level_meter.cpp b/Telegram/SourceFiles/ui/widgets/level_meter.cpp
index fe0511d4c..15acd28ab 100644
--- a/Telegram/SourceFiles/ui/widgets/level_meter.cpp
+++ b/Telegram/SourceFiles/ui/widgets/level_meter.cpp
@@ -8,6 +8,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 #include "ui/widgets/level_meter.h"
 
 #include "ui/painter.h"
+#include "styles/style_widgets.h"
 
 namespace Ui {
 
diff --git a/Telegram/SourceFiles/ui/widgets/level_meter.h b/Telegram/SourceFiles/ui/widgets/level_meter.h
index 4fe15b7f4..70ffa8c1a 100644
--- a/Telegram/SourceFiles/ui/widgets/level_meter.h
+++ b/Telegram/SourceFiles/ui/widgets/level_meter.h
@@ -7,9 +7,12 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 */
 #pragma once
 
-#include "styles/style_widgets.h"
 #include "ui/rp_widget.h"
 
+namespace style {
+struct LevelMeter;
+} // namespace style
+
 namespace Ui {
 
 class LevelMeter : public RpWidget {