diff --git a/3party/zlib/gzguts.h b/3party/zlib/gzguts.h
index d87659d031..f6823ed896 100644
--- a/3party/zlib/gzguts.h
+++ b/3party/zlib/gzguts.h
@@ -26,6 +26,7 @@
 #  include <limits.h>
 #endif
 #include <fcntl.h>
+#include <unistd.h>
 
 #ifdef _WIN32
 #  include <stddef.h>
diff --git a/drape/gpu_program.cpp b/drape/gpu_program.cpp
index b0e13f2bda..fcd0691936 100644
--- a/drape/gpu_program.cpp
+++ b/drape/gpu_program.cpp
@@ -2,7 +2,7 @@
 #include "glfunctions.hpp"
 
 #include "../base/assert.hpp"
-#include "../../base/logging.hpp"
+#include "../base/logging.hpp"
 
 #ifdef DEBUG
   #include "../std/map.hpp"
diff --git a/map/country_tree.cpp b/map/country_tree.cpp
index c394940550..7ee6ffa724 100644
--- a/map/country_tree.cpp
+++ b/map/country_tree.cpp
@@ -2,7 +2,7 @@
 
 #include "framework.hpp"
 
-#include "../../storage/storage.hpp"
+#include "../storage/storage.hpp"
 
 namespace storage
 {
diff --git a/map/framework.cpp b/map/framework.cpp
index c6352b6f0c..a918137cc7 100644
--- a/map/framework.cpp
+++ b/map/framework.cpp
@@ -56,8 +56,8 @@
 #include "../std/target_os.hpp"
 #include "../std/vector.hpp"
 
-#include "../../api/internal/c/api-client-internals.h"
-#include "../../api/src/c/api-client.h"
+#include "../api/internal/c/api-client-internals.h"
+#include "../api/src/c/api-client.h"
 
 
 #define KMZ_EXTENSION ".kmz"
diff --git a/qt/about.hpp b/qt/about.hpp
index 819982d636..792521877f 100644
--- a/qt/about.hpp
+++ b/qt/about.hpp
@@ -1,6 +1,6 @@
 #pragma once
 
-#include <Qt>
+#include <QtWidgets/QApplication>
 #if QT_VERSION < QT_VERSION_CHECK(5, 0, 0)
   #include <QtGui/QDialog>
 #else
diff --git a/qt/draw_widget.cpp b/qt/draw_widget.cpp
index 013f317d0e..e1e9b6e344 100644
--- a/qt/draw_widget.cpp
+++ b/qt/draw_widget.cpp
@@ -17,7 +17,7 @@
 #include <QtCore/QLocale>
 
 #include <QtGui/QMouseEvent>
-#include <QDateTime>
+#include <QtCore/QDateTime>
 
 #if QT_VERSION < QT_VERSION_CHECK(5, 0, 0)
   #include <QtGui/QMenu>
diff --git a/qt/info_dialog.hpp b/qt/info_dialog.hpp
index 3618bccd97..859f7c6076 100644
--- a/qt/info_dialog.hpp
+++ b/qt/info_dialog.hpp
@@ -1,6 +1,6 @@
 #pragma once
 
-#include <Qt>
+#include <QtWidgets/QApplication>
 #if QT_VERSION < QT_VERSION_CHECK(5, 0, 0)
   #include <QtGui/QDialog>
 #else
diff --git a/qt/mainwindow.hpp b/qt/mainwindow.hpp
index e450f8720d..5983224c9c 100644
--- a/qt/mainwindow.hpp
+++ b/qt/mainwindow.hpp
@@ -5,7 +5,7 @@
 
 #include "../std/unique_ptr.hpp"
 
-#include <Qt>
+#include <QtWidgets/QApplication>
 #if QT_VERSION < QT_VERSION_CHECK(5, 0, 0)
   #include <QtGui/QMainWindow>
 #else
diff --git a/qt/preferences_dialog.hpp b/qt/preferences_dialog.hpp
index 0cc277a3ee..7347e9fd8a 100644
--- a/qt/preferences_dialog.hpp
+++ b/qt/preferences_dialog.hpp
@@ -1,6 +1,6 @@
 #pragma once
 
-#include <Qt>
+#include <QtWidgets/QApplication>
 #if QT_VERSION < QT_VERSION_CHECK(5, 0, 0)
   #include <QtGui/QDialog>
 #else
diff --git a/qt/proxystyle.hpp b/qt/proxystyle.hpp
index 2f4c0e0e72..b6a49e36fc 100644
--- a/qt/proxystyle.hpp
+++ b/qt/proxystyle.hpp
@@ -1,6 +1,6 @@
 #pragma once
 
-#include <QtGui>
+#include <QtWidgets/QApplication>
 #if QT_VERSION < QT_VERSION_CHECK(5, 0, 0)
   #include <QtGui/QStyle>
 #else
diff --git a/qt/qtoglcontextfactory.hpp b/qt/qtoglcontextfactory.hpp
index 4b65f12fe3..cb0d4fc32b 100644
--- a/qt/qtoglcontextfactory.hpp
+++ b/qt/qtoglcontextfactory.hpp
@@ -1,6 +1,6 @@
 #pragma once
 
-#include "../../drape/oglcontextfactory.hpp"
+#include "../drape/oglcontextfactory.hpp"
 #include "qtoglcontext.hpp"
 
 #include <QtGui/QWindow>
diff --git a/qt/slider_ctrl.hpp b/qt/slider_ctrl.hpp
index babbeafb45..dba3654fc4 100644
--- a/qt/slider_ctrl.hpp
+++ b/qt/slider_ctrl.hpp
@@ -1,6 +1,6 @@
 #pragma once
 
-#include <Qt>
+#include <QtWidgets/QApplication>
 #if QT_VERSION < QT_VERSION_CHECK(5, 0, 0)
   #include <QtGui/QSlider>
 #else
diff --git a/qt/update_dialog.hpp b/qt/update_dialog.hpp
index 1a92d2b49d..6d6f67dcb0 100644
--- a/qt/update_dialog.hpp
+++ b/qt/update_dialog.hpp
@@ -1,7 +1,7 @@
 #pragma once
 #include "../map/framework.hpp"
 
-#include <Qt>
+#include <QtWidgets/QApplication>
 #if QT_VERSION < QT_VERSION_CHECK(5, 0, 0)
   #include <QtGui/QDialog>
 #else