diff --git a/Telegram/SourceFiles/boxes/edit_participant_box.h b/Telegram/SourceFiles/boxes/edit_participant_box.h
index 913140367..94481c855 100644
--- a/Telegram/SourceFiles/boxes/edit_participant_box.h
+++ b/Telegram/SourceFiles/boxes/edit_participant_box.h
@@ -23,6 +23,10 @@
 #pragma once
 
 #include "boxes/abstract_box.h"
+#include "core/basic_types.h"
+#include "data/data_types.h"
+
+#include "structs.h" // temporarily. (ChannelData
 
 namespace Ui {
 class FlatLabel;
diff --git a/Telegram/SourceFiles/boxes/passcode_box.h b/Telegram/SourceFiles/boxes/passcode_box.h
index 214717fba..91ebcd655 100644
--- a/Telegram/SourceFiles/boxes/passcode_box.h
+++ b/Telegram/SourceFiles/boxes/passcode_box.h
@@ -23,6 +23,7 @@
 #pragma once
 
 #include "boxes/abstract_box.h"
+#include "ui/text/text.h"
 
 namespace Ui {
 class InputField;
diff --git a/Telegram/SourceFiles/boxes/photo_crop_box.h b/Telegram/SourceFiles/boxes/photo_crop_box.h
index 6f9329ea1..cc6a6fef4 100644
--- a/Telegram/SourceFiles/boxes/photo_crop_box.h
+++ b/Telegram/SourceFiles/boxes/photo_crop_box.h
@@ -24,6 +24,8 @@
 
 #include "boxes/abstract_box.h"
 
+#include "structs.h" // temporarily, need PeerId.
+
 class PhotoCropBox : public BoxContent {
 	Q_OBJECT
 
diff --git a/Telegram/SourceFiles/boxes/share_box.h b/Telegram/SourceFiles/boxes/share_box.h
index d02948f85..2f294ff55 100644
--- a/Telegram/SourceFiles/boxes/share_box.h
+++ b/Telegram/SourceFiles/boxes/share_box.h
@@ -25,6 +25,9 @@
 #include "base/observer.h"
 #include "boxes/abstract_box.h"
 #include "ui/effects/round_checkbox.h"
+#include "ui/text/text.h"
+
+#include "structs.h" // temporarily: FullMsgId, CharData
 
 namespace Dialogs {
 class Row;
diff --git a/Telegram/SourceFiles/boxes/username_box.h b/Telegram/SourceFiles/boxes/username_box.h
index e50d735d2..c306c4ab7 100644
--- a/Telegram/SourceFiles/boxes/username_box.h
+++ b/Telegram/SourceFiles/boxes/username_box.h
@@ -23,6 +23,7 @@
 #pragma once
 
 #include "boxes/abstract_box.h"
+#include "ui/text/text.h"
 
 namespace Ui {
 class UsernameInput;
diff --git a/Telegram/SourceFiles/layerwidget.h b/Telegram/SourceFiles/layerwidget.h
index 868455b94..dee038308 100644
--- a/Telegram/SourceFiles/layerwidget.h
+++ b/Telegram/SourceFiles/layerwidget.h
@@ -24,10 +24,12 @@
 
 #include <QMouseEvent>
 
-#include "structs.h"
+// #include "structs.h"
 #include "ui/animation.h"
 #include "ui/twidget.h"
 
+class PhotoData;
+
 class BoxContent;
 
 namespace Window {
diff --git a/Telegram/SourceFiles/mainwindow.h b/Telegram/SourceFiles/mainwindow.h
index 61451911f..13a28b28a 100644
--- a/Telegram/SourceFiles/mainwindow.h
+++ b/Telegram/SourceFiles/mainwindow.h
@@ -23,6 +23,7 @@
 #pragma once
 
 #include "core/single_timer.h"
+#include "core/click_handler.h"
 #include "platform/platform_main_window.h"
 #include "platform/platform_specific.h"
 #include <QCheckBox>
@@ -32,9 +33,12 @@
 #include <QPaintEvent>
 #include <QPushButton>
 #include <QSystemTrayIcon>
+#include <QTextEdit>
 
 #include "layerwidget.h"
+
 #include "ui/twidget.h"
+#include "ui/text/text_entity.h"
 
 class PasscodeWidget;
 class MainWidget;