diff --git a/Telegram/SourceFiles/data/data_game.h b/Telegram/SourceFiles/data/data_game.h
index 2a8fe94db..83835aac9 100644
--- a/Telegram/SourceFiles/data/data_game.h
+++ b/Telegram/SourceFiles/data/data_game.h
@@ -25,6 +25,9 @@
 
 #include "data/data_types.h"
 
+class PhotoData;
+class DocumentData;
+
 struct GameData {
 	GameData(const GameId &id)
 	    : id(id) {}
diff --git a/Telegram/SourceFiles/data/data_types.h b/Telegram/SourceFiles/data/data_types.h
index b5da05663..cbe614cf6 100644
--- a/Telegram/SourceFiles/data/data_types.h
+++ b/Telegram/SourceFiles/data/data_types.h
@@ -24,6 +24,7 @@
 
 #include <qglobal.h>
 #include <QPair>
+#include "core/utils.h" // TimeMs and stuff
 
 using VideoId = quint64;
 using AudioId = quint64;
diff --git a/Telegram/SourceFiles/history/history.h b/Telegram/SourceFiles/history/history.h
index 6bbf6a8cb..ab9c1764d 100644
--- a/Telegram/SourceFiles/history/history.h
+++ b/Telegram/SourceFiles/history/history.h
@@ -28,6 +28,10 @@
 #include "dialogs/dialogs_common.h" // For Dialogs::Mode
 #include "ui/animation.h" // For BasicAnimation
 #include "ui/effects/send_action_animations.h" // For SendActionAnimation
+#include "ui/text/text.h"
+#include "data/data_photo.h"
+#include "data/data_game.h"
+#include "structs.h"
 
 void HistoryInit();
 
diff --git a/Telegram/SourceFiles/history/history_item.h b/Telegram/SourceFiles/history/history_item.h
index 4faff6427..31d2e4206 100644
--- a/Telegram/SourceFiles/history/history_item.h
+++ b/Telegram/SourceFiles/history/history_item.h
@@ -24,9 +24,9 @@
 
 #include "base/flags.h"
 #include "base/runtime_composer.h"
+#include "core/basic_types.h"
 #include "core/click_handler.h"
 #include "history/history.h"
-#include "structs.h"
 #include "ui/animation.h"
 #include "ui/text/text.h"
 
@@ -40,6 +40,7 @@ struct RippleAnimation;
 } // namespace style
 
 class HistoryItem;
+class History;
 
 class HistoryElement {
 public:
diff --git a/Telegram/SourceFiles/inline_bots/inline_bot_result.cpp b/Telegram/SourceFiles/inline_bots/inline_bot_result.cpp
index 9d8f894c8..5c9054d61 100644
--- a/Telegram/SourceFiles/inline_bots/inline_bot_result.cpp
+++ b/Telegram/SourceFiles/inline_bots/inline_bot_result.cpp
@@ -22,7 +22,9 @@
 //
 #include "inline_bots/inline_bot_result.h"
 
+#include "app.h"
 #include "core/file_utilities.h"
+#include "data/data_game.h"
 #include "inline_bots/inline_bot_layout_item.h"
 #include "inline_bots/inline_bot_send_data.h"
 #include "mainwidget.h"
@@ -188,7 +190,7 @@ std::unique_ptr<Result> Result::create(quint64 queryId, const MTPBotInlineResult
 		}
 	} break;
 
-	default: { badAttachment = true; } break;
+	default: badAttachment = true; break;
 	}
 
 	if (badAttachment || !result->sendData || !result->sendData->isValid()) {
diff --git a/Telegram/SourceFiles/inline_bots/inline_bot_result.h b/Telegram/SourceFiles/inline_bots/inline_bot_result.h
index 31eee198b..73855d475 100644
--- a/Telegram/SourceFiles/inline_bots/inline_bot_result.h
+++ b/Telegram/SourceFiles/inline_bots/inline_bot_result.h
@@ -23,11 +23,17 @@
 #pragma once
 
 #include "core/basic_types.h"
-#include "structs.h"
+#include "data/data_types.h"
+#include "ui/images.h"
+#include "scheme.h"
 
 class FileLoader;
 class History;
 class LocationCoords;
+class DocumentData;
+class PhotoData;
+
+struct GameData;
 
 namespace InlineBots {
 
diff --git a/Telegram/SourceFiles/inline_bots/inline_bot_send_data.cpp b/Telegram/SourceFiles/inline_bots/inline_bot_send_data.cpp
index 13e8366d6..c704b895b 100644
--- a/Telegram/SourceFiles/inline_bots/inline_bot_send_data.cpp
+++ b/Telegram/SourceFiles/inline_bots/inline_bot_send_data.cpp
@@ -20,8 +20,9 @@
 // Copyright (c) 2014-2017 John Preston, https://desktop.telegram.org
 // Copyright (c) 2017- Kepka Contributors, https://github.com/procxx
 //
-#include "inline_bots/inline_bot_send_data.h"
 #include "app.h"
+#include "data/data_game.h"
+#include "inline_bots/inline_bot_send_data.h"
 #include "inline_bots/inline_bot_result.h"
 #include "lang/lang_keys.h"
 #include "storage/localstorage.h"
diff --git a/Telegram/SourceFiles/inline_bots/inline_bot_send_data.h b/Telegram/SourceFiles/inline_bots/inline_bot_send_data.h
index 51b7d8058..7f7a11078 100644
--- a/Telegram/SourceFiles/inline_bots/inline_bot_send_data.h
+++ b/Telegram/SourceFiles/inline_bots/inline_bot_send_data.h
@@ -23,10 +23,11 @@
 #pragma once
 
 #include "core/basic_types.h"
+#include "data/data_types.h"
 #include "history/history_location_manager.h"
 #include "mtproto/type_utils.h"
-#include "structs.h"
 
+struct GameData;
 class History;
 namespace InlineBots {
 
diff --git a/Telegram/SourceFiles/ui/effects/send_action_animations.h b/Telegram/SourceFiles/ui/effects/send_action_animations.h
index a4c41f685..a00211ded 100644
--- a/Telegram/SourceFiles/ui/effects/send_action_animations.h
+++ b/Telegram/SourceFiles/ui/effects/send_action_animations.h
@@ -22,7 +22,8 @@
 //
 #pragma once
 
-#include "structs.h"
+#include "data/data_types.h"
+#include "ui/twidget.h"
 
 namespace Ui {