diff --git a/Telegram/SourceFiles/data/data_feed.h b/Telegram/SourceFiles/data/data_feed.h
index 5d7c136a6..8bf6b6870 100644
--- a/Telegram/SourceFiles/data/data_feed.h
+++ b/Telegram/SourceFiles/data/data_feed.h
@@ -70,7 +70,6 @@ private:
 	rpl::variable<MessagePosition> _unreadPosition;
 	int _unreadCount = 0;
 	int _unreadMutedCount = 0;
-	bool _complete = false;
 
 };
 
diff --git a/Telegram/SourceFiles/history/history_inner_widget.cpp b/Telegram/SourceFiles/history/history_inner_widget.cpp
index ac16c901c..00a33fde6 100644
--- a/Telegram/SourceFiles/history/history_inner_widget.cpp
+++ b/Telegram/SourceFiles/history/history_inner_widget.cpp
@@ -1166,8 +1166,8 @@ void HistoryInner::itemRemoved(not_null<const HistoryItem*> item) {
 		_dragStateItem = nullptr;
 	}
 
-	if (_dragSelFrom && _dragSelFrom->data() == item
-		|| _dragSelTo && _dragSelTo->data() == item) {
+	if ((_dragSelFrom && _dragSelFrom->data() == item)
+		|| (_dragSelTo && _dragSelTo->data() == item)) {
 		_dragSelFrom = nullptr;
 		_dragSelTo = nullptr;
 		update();
diff --git a/Telegram/SourceFiles/history/history_item_components.h b/Telegram/SourceFiles/history/history_item_components.h
index f781f90e3..695aaf61b 100644
--- a/Telegram/SourceFiles/history/history_item_components.h
+++ b/Telegram/SourceFiles/history/history_item_components.h
@@ -10,7 +10,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 #include "history/history_item.h"
 
 class HistoryDocument;
-class WebPageData;
+struct WebPageData;
 
 namespace HistoryView {
 class Element;
diff --git a/Telegram/SourceFiles/platform/linux/main_window_linux.cpp b/Telegram/SourceFiles/platform/linux/main_window_linux.cpp
index 2e93c5135..3555bed6f 100644
--- a/Telegram/SourceFiles/platform/linux/main_window_linux.cpp
+++ b/Telegram/SourceFiles/platform/linux/main_window_linux.cpp
@@ -11,6 +11,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 #include "platform/linux/linux_libs.h"
 #include "platform/linux/linux_desktop_environment.h"
 #include "platform/platform_notifications_manager.h"
+#include "history/history.h"
 #include "mainwindow.h"
 #include "messenger.h"
 #include "application.h"
diff --git a/Telegram/SourceFiles/platform/linux/notifications_manager_linux.cpp b/Telegram/SourceFiles/platform/linux/notifications_manager_linux.cpp
index c48184954..f756c6ed5 100644
--- a/Telegram/SourceFiles/platform/linux/notifications_manager_linux.cpp
+++ b/Telegram/SourceFiles/platform/linux/notifications_manager_linux.cpp
@@ -10,6 +10,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 #include "window/notifications_utilities.h"
 #include "platform/linux/linux_libnotify.h"
 #include "platform/linux/linux_libs.h"
+#include "history/history.h"
 #include "lang/lang_keys.h"
 
 namespace Platform {
diff --git a/Telegram/SourceFiles/platform/mac/main_window_mac.mm b/Telegram/SourceFiles/platform/mac/main_window_mac.mm
index c6ce860e1..52ffdae79 100644
--- a/Telegram/SourceFiles/platform/mac/main_window_mac.mm
+++ b/Telegram/SourceFiles/platform/mac/main_window_mac.mm
@@ -11,6 +11,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 #include "mainwindow.h"
 #include "mainwidget.h"
 #include "application.h"
+#include "history/history.h"
 #include "history/history_widget.h"
 #include "history/history_inner_widget.h"
 #include "storage/localstorage.h"
diff --git a/Telegram/SourceFiles/platform/mac/notifications_manager_mac.mm b/Telegram/SourceFiles/platform/mac/notifications_manager_mac.mm
index 1bd9e9e70..aa5d67f52 100644
--- a/Telegram/SourceFiles/platform/mac/notifications_manager_mac.mm
+++ b/Telegram/SourceFiles/platform/mac/notifications_manager_mac.mm
@@ -9,9 +9,9 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 
 #include "platform/platform_specific.h"
 #include "platform/mac/mac_utilities.h"
-#include "styles/style_window.h"
+#include "history/history.h"
 #include "mainwindow.h"
-#include "base/variant.h"
+#include "styles/style_window.h"
 
 #include <thread>
 #include <Cocoa/Cocoa.h>
diff --git a/Telegram/SourceFiles/stdafx.h b/Telegram/SourceFiles/stdafx.h
index 88854c720..542a08d07 100644
--- a/Telegram/SourceFiles/stdafx.h
+++ b/Telegram/SourceFiles/stdafx.h
@@ -48,6 +48,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 #include <vector>
 #include <set>
 #include <map>
+#include <unordered_map>
 #include <algorithm>
 #include <memory>