diff --git a/Telegram/SourceFiles/base/object_ptr.h b/Telegram/SourceFiles/base/object_ptr.h
index bb3b55e23..ad04c7ddc 100644
--- a/Telegram/SourceFiles/base/object_ptr.h
+++ b/Telegram/SourceFiles/base/object_ptr.h
@@ -22,6 +22,7 @@ Copyright (c) 2018 pro.cxx Community
 
 #include <QObject>
 #include <QPointer>
+#include "core/utils.h" // @todo used for base::take
 
 // Smart pointer for QObject*, has move semantics, destroys object if it doesn't have a parent.
 template <typename Object>
@@ -123,4 +124,4 @@ inline object_ptr<ResultType> static_object_cast(object_ptr<SourceType> source)
 	auto result = object_ptr<ResultType>(nullptr);
 	result._object = static_cast<ResultType*>(base::take(source._object).data());
 	return std::move(result);
-}
\ No newline at end of file
+}
diff --git a/Telegram/SourceFiles/core/utils.cpp b/Telegram/SourceFiles/core/utils.cpp
index 6386da5c9..dc1c6e3c9 100644
--- a/Telegram/SourceFiles/core/utils.cpp
+++ b/Telegram/SourceFiles/core/utils.cpp
@@ -30,6 +30,7 @@ Copyright (c) 2014-2017 John Preston, https://desktop.telegram.org
 #include <openssl/engine.h>
 #include <openssl/conf.h>
 #include <openssl/ssl.h>
+#include <QSslSocket>
 
 extern "C" {
 #include <libavcodec/avcodec.h>
@@ -50,6 +51,8 @@ quint64 _SharedMemoryLocation[4] = { 0x00, 0x01, 0x02, 0x03 };
 
 #include <openssl/rand.h>
 
+#include "mtproto/core_types.h"
+
 // Base types compile-time check
 static_assert(sizeof(char) == 1, "Basic types size check failed");
 static_assert(sizeof(uchar) == 1, "Basic types size check failed");
diff --git a/Telegram/SourceFiles/history/history_admin_log_inner.cpp b/Telegram/SourceFiles/history/history_admin_log_inner.cpp
index 36fbafb84..713f3d4a7 100644
--- a/Telegram/SourceFiles/history/history_admin_log_inner.cpp
+++ b/Telegram/SourceFiles/history/history_admin_log_inner.cpp
@@ -18,8 +18,6 @@ to link the code of portions of this program with the OpenSSL library.
 Full license: https://github.com/telegramdesktop/tdesktop/blob/master/LICENSE
 Copyright (c) 2014-2017 John Preston, https://desktop.telegram.org
 */
-#include <QAction>
-
 #include "history/history_admin_log_item.h"
 #include "history/history_admin_log_inner.h"
 #include "styles/style_history.h"
@@ -40,6 +38,9 @@ Copyright (c) 2014-2017 John Preston, https://desktop.telegram.org
 #include "lang/lang_keys.h"
 #include "boxes/edit_participant_box.h"
 
+#include <QAction>
+#include <QApplication>
+
 namespace AdminLog {
 namespace {
 
diff --git a/Telegram/SourceFiles/history/history_inner_widget.cpp b/Telegram/SourceFiles/history/history_inner_widget.cpp
index 14515cced..9cbaa86cb 100644
--- a/Telegram/SourceFiles/history/history_inner_widget.cpp
+++ b/Telegram/SourceFiles/history/history_inner_widget.cpp
@@ -19,6 +19,7 @@ Full license: https://github.com/telegramdesktop/tdesktop/blob/master/LICENSE
 Copyright (c) 2014-2017 John Preston, https://desktop.telegram.org
 */
 #include <QAction>
+#include <QApplication>
 #include "history/history_inner_widget.h"
 #include "styles/style_history.h"
 #include "core/file_utilities.h"
diff --git a/Telegram/SourceFiles/inline_bots/inline_results_widget.cpp b/Telegram/SourceFiles/inline_bots/inline_results_widget.cpp
index b1c6880e2..104f93654 100644
--- a/Telegram/SourceFiles/inline_bots/inline_results_widget.cpp
+++ b/Telegram/SourceFiles/inline_bots/inline_results_widget.cpp
@@ -18,7 +18,6 @@ to link the code of portions of this program with the OpenSSL library.
 Full license: https://github.com/telegramdesktop/tdesktop/blob/master/LICENSE
 Copyright (c) 2014-2017 John Preston, https://desktop.telegram.org
 */
-#include <QWindow>
 #include "inline_bots/inline_results_widget.h"
 #include "styles/style_chat_helpers.h"
 #include "ui/widgets/buttons.h"
@@ -38,6 +37,8 @@ Copyright (c) 2014-2017 John Preston, https://desktop.telegram.org
 #include "ui/widgets/scroll_area.h"
 #include "ui/widgets/labels.h"
 #include "observer_peer.h"
+#include <QWindow>
+#include <QApplication>
 
 namespace InlineBots {
 namespace Layout {
diff --git a/Telegram/SourceFiles/mediaview.cpp b/Telegram/SourceFiles/mediaview.cpp
index b424d8afa..fc40d490c 100644
--- a/Telegram/SourceFiles/mediaview.cpp
+++ b/Telegram/SourceFiles/mediaview.cpp
@@ -47,6 +47,7 @@ Copyright (c) 2014-2017 John Preston, https://desktop.telegram.org
 #include <QWindow>
 #include <QDesktopWidget>
 #include <QImageReader>
+#include <QClipboard>
 
 namespace {
 
diff --git a/Telegram/SourceFiles/platform/mac/file_utilities_mac.mm b/Telegram/SourceFiles/platform/mac/file_utilities_mac.mm
index 9925b8d6e..24b0fce4f 100644
--- a/Telegram/SourceFiles/platform/mac/file_utilities_mac.mm
+++ b/Telegram/SourceFiles/platform/mac/file_utilities_mac.mm
@@ -19,13 +19,15 @@ Full license: https://github.com/telegramdesktop/tdesktop/blob/master/LICENSE
 Copyright (c) 2014-2017 John Preston, https://desktop.telegram.org
 */
 #include "platform/mac/file_utilities_mac.h"
-
 #include "platform/mac/mac_utilities.h"
 #include "styles/style_window.h"
 
 #include <Cocoa/Cocoa.h>
 #include <CoreFoundation/CFURL.h>
 
+#include <QApplication>
+#include <QDesktopWidget>
+
 namespace {
 
 using namespace Platform;
diff --git a/Telegram/SourceFiles/platform/mac/main_window_mac.h b/Telegram/SourceFiles/platform/mac/main_window_mac.h
index 48fcadc8e..22d7daaa4 100644
--- a/Telegram/SourceFiles/platform/mac/main_window_mac.h
+++ b/Telegram/SourceFiles/platform/mac/main_window_mac.h
@@ -20,12 +20,14 @@ Copyright (c) 2014-2017 John Preston, https://desktop.telegram.org
 */
 #pragma once
 
-#include <QMenuBar>
-
 #include "platform/platform_main_window.h"
 #include "platform/mac/specific_mac_p.h"
 #include "base/timer.h"
 
+#include <QMenuBar>
+#include <QTimer>
+#include <QSystemTrayIcon>
+
 namespace Platform {
 
 class MainWindow : public Window::MainWindow {
diff --git a/Telegram/SourceFiles/platform/mac/notifications_manager_mac.mm b/Telegram/SourceFiles/platform/mac/notifications_manager_mac.mm
index ec7fab162..7293ed365 100644
--- a/Telegram/SourceFiles/platform/mac/notifications_manager_mac.mm
+++ b/Telegram/SourceFiles/platform/mac/notifications_manager_mac.mm
@@ -26,6 +26,8 @@ Copyright (c) 2014-2017 John Preston, https://desktop.telegram.org
 #include "mainwindow.h"
 #include "base/task_queue.h"
 #include "base/variant.h"
+#include "facades.h"
+#include "history/history.h"
 
 #include <thread>
 #include <Cocoa/Cocoa.h>
diff --git a/Telegram/SourceFiles/platform/mac/specific_mac.h b/Telegram/SourceFiles/platform/mac/specific_mac.h
index e05f1f4b8..433843dc7 100644
--- a/Telegram/SourceFiles/platform/mac/specific_mac.h
+++ b/Telegram/SourceFiles/platform/mac/specific_mac.h
@@ -18,6 +18,10 @@ Copyright (c) 2014-2017 John Preston, https://desktop.telegram.org
 #pragma once
 
 #include "platform/mac/specific_mac_p.h"
+#include "core/utils.h" // TimeMs
+#include "core/basic_types.h" // qsl()
+#include <QFile>
+
 class QAbstractNativeEventFilter;
 class LocationCoords;
 
diff --git a/Telegram/SourceFiles/platform/mac/specific_mac.mm b/Telegram/SourceFiles/platform/mac/specific_mac.mm
index e9dc2c3bb..e3d336b5b 100644
--- a/Telegram/SourceFiles/platform/mac/specific_mac.mm
+++ b/Telegram/SourceFiles/platform/mac/specific_mac.mm
@@ -39,6 +39,10 @@ Copyright (c) 2014-2017 John Preston, https://desktop.telegram.org
 #include <SPMediaKeyTap.h>
 #include <mach-o/dyld.h>
 
+#include <QAbstractNativeEventFilter>
+#include <QDesktopWidget>
+#include <QDesktopServices>
+
 namespace {
 
 QStringList _initLogs;
diff --git a/Telegram/SourceFiles/platform/mac/specific_mac_p.h b/Telegram/SourceFiles/platform/mac/specific_mac_p.h
index 24b1531b4..45e8a8ca4 100644
--- a/Telegram/SourceFiles/platform/mac/specific_mac_p.h
+++ b/Telegram/SourceFiles/platform/mac/specific_mac_p.h
@@ -17,6 +17,11 @@ Copyright (c) 2014-2017 John Preston, https://desktop.telegram.org
 */
 #pragma once
 
+#include "core/utils.h" // TimeMs
+#include <QString>
+#include <QByteArray>
+#include <QWindow> // WId
+
 // e is NSEvent*
 bool objc_handleMediaKeyEvent(void *e);
 
diff --git a/Telegram/SourceFiles/platform/mac/window_title_mac.mm b/Telegram/SourceFiles/platform/mac/window_title_mac.mm
index 316ce1640..d1b02eb36 100644
--- a/Telegram/SourceFiles/platform/mac/window_title_mac.mm
+++ b/Telegram/SourceFiles/platform/mac/window_title_mac.mm
@@ -25,6 +25,8 @@ Copyright (c) 2014-2017 John Preston, https://desktop.telegram.org
 #include "styles/style_window.h"
 #include "styles/style_mediaview.h"
 #include "platform/platform_main_window.h"
+#include "facades.h"
+#include "app.h"
 
 #include <Cocoa/Cocoa.h>
 #include <CoreFoundation/CFURL.h>
diff --git a/Telegram/SourceFiles/profile/profile_block_invite_link.cpp b/Telegram/SourceFiles/profile/profile_block_invite_link.cpp
index 12bc7a20b..3a103b271 100644
--- a/Telegram/SourceFiles/profile/profile_block_invite_link.cpp
+++ b/Telegram/SourceFiles/profile/profile_block_invite_link.cpp
@@ -28,6 +28,9 @@ Copyright (c) 2014-2017 John Preston, https://desktop.telegram.org
 #include "mainwindow.h"
 #include "lang/lang_keys.h"
 
+#include <QApplication>
+#include <QClipboard>
+
 namespace Profile {
 
 using UpdateFlag = Notify::PeerUpdate::Flag;
diff --git a/Telegram/SourceFiles/ui/widgets/input_fields.cpp b/Telegram/SourceFiles/ui/widgets/input_fields.cpp
index b4d7de600..375f37bbf 100644
--- a/Telegram/SourceFiles/ui/widgets/input_fields.cpp
+++ b/Telegram/SourceFiles/ui/widgets/input_fields.cpp
@@ -33,6 +33,9 @@ Copyright (c) 2014-2017 John Preston, https://desktop.telegram.org
 #include <QStyle>
 #include <QStack>
 #include <QCommonStyle>
+#include <QGuiApplication>
+#include <QApplication>
+#include <QClipboard>
 
 namespace Ui {
 namespace {
diff --git a/Telegram/SourceFiles/ui/widgets/labels.cpp b/Telegram/SourceFiles/ui/widgets/labels.cpp
index 3370654ab..8cce3cea9 100644
--- a/Telegram/SourceFiles/ui/widgets/labels.cpp
+++ b/Telegram/SourceFiles/ui/widgets/labels.cpp
@@ -27,6 +27,8 @@ Copyright (c) 2014-2017 John Preston, https://desktop.telegram.org
 #include "facades.h"
 
 #include <QDrag>
+#include <QApplication>
+#include <QClipboard>
 
 namespace Ui {
 namespace {
diff --git a/Telegram/SourceFiles/window/main_window.cpp b/Telegram/SourceFiles/window/main_window.cpp
index d6e4f32d0..37337c920 100644
--- a/Telegram/SourceFiles/window/main_window.cpp
+++ b/Telegram/SourceFiles/window/main_window.cpp
@@ -35,6 +35,8 @@ Copyright (c) 2014-2017 John Preston, https://desktop.telegram.org
 #include <QWindow>
 #include <QScreen>
 #include <QDesktopWidget>
+#include <QGuiApplication>
+#include <QApplication>
 
 namespace Window {