diff --git a/base/timer.hpp b/base/timer.hpp
index 6cb5fa0f65..e74f2d81e0 100644
--- a/base/timer.hpp
+++ b/base/timer.hpp
@@ -1,5 +1,7 @@
 #pragma once
 #include "base.hpp"
+
+#define BOOST_DATE_TIME_NO_LIB
 #include <boost/date_time/posix_time/posix_time.hpp>
 
 namespace my
diff --git a/generator/generator_tests/generator_tests.pro b/generator/generator_tests/generator_tests.pro
index 5c80cabae1..4f0ae4d352 100644
--- a/generator/generator_tests/generator_tests.pro
+++ b/generator/generator_tests/generator_tests.pro
@@ -10,8 +10,11 @@ include($$ROOT_DIR/common.pri)
 
 QT *= core
 
-win32-g++ {
-  LIBS += -lpthread
+win32 {
+  LIBS += -lShell32
+  win32-g++ {
+    LIBS += -lpthread
+  }
 }
 
 HEADERS += \
diff --git a/map/map_tests/map_tests.pro b/map/map_tests/map_tests.pro
index f8b92a9fe0..92fb587c6b 100644
--- a/map/map_tests/map_tests.pro
+++ b/map/map_tests/map_tests.pro
@@ -13,7 +13,10 @@ include($$ROOT_DIR/common.pri)
 QT *= core network
 
 win32 {
-  LIBS += -lShell32 -lpthread
+  LIBS += -lShell32
+  win32-g++ {
+    LIBS += -lpthread
+  }
 }
 
 SOURCES += \
diff --git a/platform/platform.pro b/platform/platform.pro
index 2de36cac37..3cf86b0f08 100644
--- a/platform/platform.pro
+++ b/platform/platform.pro
@@ -35,8 +35,6 @@ HEADERS += \
 mac|iphone* {
     OBJECTIVE_SOURCES += apple_location_service.mm
     LIBS += -framework CoreLocation -framework Foundation
-}
-
-win {
-    SOURCES += windows_location_service.cpp
+} else {
+    SOURCES += qt_location_service.cpp
 }
diff --git a/platform/windows_location_service.cpp b/platform/qt_location_service.cpp
similarity index 60%
rename from platform/windows_location_service.cpp
rename to platform/qt_location_service.cpp
index 4799567a5a..35b29875af 100644
--- a/platform/windows_location_service.cpp
+++ b/platform/qt_location_service.cpp
@@ -2,10 +2,10 @@
 
 using namespace location;
 
-class WindowsLocationService : public LocationService
+class QtLocationService : public LocationService
 {
 public:
-  virtual void StartUpdate(bool useAccurateMode)
+  virtual void StartUpdate(bool /*useAccurateMode*/)
   {
     // @TODO
   }
@@ -18,6 +18,6 @@ public:
 
 extern "C" location::LocationService & GetLocationService()
 {
-  static WindowsLocationService ls;
+  static QtLocationService ls;
   return ls;
 }
diff --git a/qt/mainwindow.cpp b/qt/mainwindow.cpp
index fcef224df8..3f1c1b7f8d 100644
--- a/qt/mainwindow.cpp
+++ b/qt/mainwindow.cpp
@@ -29,6 +29,22 @@
 
 #define IDM_ABOUT_DIALOG        1001
 
+#ifdef DEBUG // code removed for desktop releases
+#include "update_dialog.hpp"
+#include "searchwindow.hpp"
+#include "classificator_tree.hpp"
+#include "preferences_dialog.hpp"
+#include "info_dialog.hpp"
+#include "guide_page.hpp"
+
+#include "../indexer/classificator.hpp"
+
+#include <QtCore/QFile>
+
+#define IDM_PREFERENCES_DIALOG  1002
+
+#endif // DEBUG
+
 namespace qt
 {
 
@@ -71,7 +87,7 @@ MainWindow::MainWindow()
     item.dwTypeData = const_cast<char *>(prefsStr.data());
     item.cch = prefsStr.size();
     ::InsertMenuItemA(menu, ::GetMenuItemCount(menu) - 1, TRUE, &item);
- #endif DEBUG
+ #endif // DEBUG
     item.wID = IDM_ABOUT_DIALOG;
     QByteArray const aboutStr = tr("About MapsWithMe...").toLocal8Bit();
     item.dwTypeData = const_cast<char *>(aboutStr.data());