[ios] Fixed includes.

15 files changed, 33 insertions, 40 deletions

diff --git a/iphone/Maps/Classes/CustomAlert/BaseAlert/MWMAlert.mm b/iphone/Maps/Classes/CustomAlert/BaseAlert/MWMAlert.mm
index ba2dc68379..d4b71efea3 100644
--- a/iphone/Maps/Classes/CustomAlert/BaseAlert/MWMAlert.mm
+++ b/iphone/Maps/Classes/CustomAlert/BaseAlert/MWMAlert.mm
@@ -16,7 +16,6 @@
 #import "MWMPedestrianShareAlert.h"
 #import "MWMRateAlert.h"
 #import "MWMRoutingDisclaimerAlert.h"
-#import "Statistics.h"
 
 @implementation MWMAlert
 
diff --git a/iphone/Maps/Classes/EAGLView.h b/iphone/Maps/Classes/EAGLView.h
index f82517196e..04c7e16a6f 100644
--- a/iphone/Maps/Classes/EAGLView.h
+++ b/iphone/Maps/Classes/EAGLView.h
@@ -1,8 +1,8 @@
 #import <UIKit/UIKit.h>
 
 
-#include "../../std/shared_ptr.hpp"
-#include "../../indexer/map_style.hpp"
+#include "std/shared_ptr.hpp"
+#include "indexer/map_style.hpp"
 
 #ifndef USE_DRAPE
 
@@ -25,7 +25,7 @@ namespace graphics
 
 #else
 
-#include "../../drape/pointers.hpp"
+#include "drape/pointers.hpp"
 namespace dp
 {
   class OGLContextFactory;
diff --git a/iphone/Maps/Classes/EAGLView.mm b/iphone/Maps/Classes/EAGLView.mm
index 732a50edb0..bff4d58fb4 100644
--- a/iphone/Maps/Classes/EAGLView.mm
+++ b/iphone/Maps/Classes/EAGLView.mm
@@ -10,20 +10,20 @@
 #ifndef USE_DRAPE
   #include "RenderBuffer.hpp"
   #include "RenderContext.hpp"
-  #include "../../graphics/resource_manager.hpp"
-  #include "../../graphics/opengl/opengl.hpp"
-  #include "../../graphics/data_formats.hpp"
-  #include "../../indexer/classificator_loader.hpp"
+  #include "graphics/resource_manager.hpp"
+  #include "graphics/opengl/opengl.hpp"
+  #include "graphics/data_formats.hpp"
+  #include "indexer/classificator_loader.hpp"
 #else
   #import "../Platform/opengl/iosOGLContextFactory.h"
 #endif
 
-#include "../../render/render_policy.hpp"
+#include "render/render_policy.hpp"
 
-#include "../../platform/platform.hpp"
-#include "../../platform/video_timer.hpp"
+#include "platform/platform.hpp"
+#include "platform/video_timer.hpp"
 
-#include "../../std/bind.hpp"
+#include "std/bind.hpp"
 
 
 @implementation EAGLView
diff --git a/iphone/Maps/Classes/Framework.cpp b/iphone/Maps/Classes/Framework.cpp
index 758b15d66a..fbf11720ec 100644
--- a/iphone/Maps/Classes/Framework.cpp
+++ b/iphone/Maps/Classes/Framework.cpp
@@ -1,7 +1,5 @@
 #include "Framework.h"
 
-#include "../../../map/framework.hpp"
-
 static Framework * g_framework = 0;
 
 Framework & GetFramework()
diff --git a/iphone/Maps/Classes/Framework.h b/iphone/Maps/Classes/Framework.h
index 491b7a2fdb..caa51d915d 100644
--- a/iphone/Maps/Classes/Framework.h
+++ b/iphone/Maps/Classes/Framework.h
@@ -1,8 +1,7 @@
 // Wraps framework access
 #pragma once
 
-#include "../../../map/framework.hpp"
-
+#include "map/framework.hpp"
 
 /// Creates framework at first access
 Framework & GetFramework();
diff --git a/iphone/Maps/Classes/LocationPredictor.mm b/iphone/Maps/Classes/LocationPredictor.mm
index 2c2e32999e..25c2b5e799 100644
--- a/iphone/Maps/Classes/LocationPredictor.mm
+++ b/iphone/Maps/Classes/LocationPredictor.mm
@@ -1,9 +1,9 @@
 #import "LocationPredictor.h"
 #import "Framework.h"
 
-#include "../../../base/timer.hpp"
+#include "base/timer.hpp"
 
-#include "../../../map/location_state.hpp"
+#include "map/location_state.hpp"
 
 
 namespace
diff --git a/iphone/Maps/Classes/MWMPlacePageEntity.mm b/iphone/Maps/Classes/MWMPlacePageEntity.mm
index f95f2817aa..d467182f9c 100644
--- a/iphone/Maps/Classes/MWMPlacePageEntity.mm
+++ b/iphone/Maps/Classes/MWMPlacePageEntity.mm
@@ -11,7 +11,7 @@
 #import "MWMPlacePageViewManager.h"
 #import "MapViewController.h"
 #import "UIKitCategories.h"
-#include "../../../platform/measurement_utils.hpp"
+#include "platform/measurement_utils.hpp"
 
 extern NSArray * const kBookmarkColorsVariant = @[@"placemark-red", @"placemark-yellow", @"placemark-blue", @"placemark-green", @"placemark-purple", @"placemark-orange", @"placemark-brown", @"placemark-pink"];
 extern NSString * const kUserDefaultsLatLonAsDMSKey = @"UserDefaultsLatLonAsDMS";
diff --git a/iphone/Maps/Classes/MapCell.h b/iphone/Maps/Classes/MapCell.h
index 74cf6443f5..1935cf17a6 100644
--- a/iphone/Maps/Classes/MapCell.h
+++ b/iphone/Maps/Classes/MapCell.h
@@ -3,8 +3,8 @@
 #import "ProgressView.h"
 #import "BadgeView.h"
 
-#include "../../storage/storage_defines.hpp"
-#include "../../platform/country_defines.hpp"
+#include "storage/storage_defines.hpp"
+#include "platform/country_defines.hpp"
 
 using namespace storage;
 
diff --git a/iphone/Maps/Classes/MapViewController.mm b/iphone/Maps/Classes/MapViewController.mm
index 398dadfd3c..a581f84d63 100644
--- a/iphone/Maps/Classes/MapViewController.mm
+++ b/iphone/Maps/Classes/MapViewController.mm
@@ -13,21 +13,20 @@
 #import "UIKitCategories.h"
 #import "UIViewController+Navigation.h"
 
-#import "../../../3party/Alohalytics/src/alohalytics_objc.h"
+#import "3party/Alohalytics/src/alohalytics_objc.h"
 
 #include "Framework.h"
 #include "RenderContext.hpp"
 
-#include "../../../anim/controller.hpp"
-#include "../../../gui/controller.hpp"
-#include "../Statistics/Statistics.h"
+#include "anim/controller.hpp"
+#include "gui/controller.hpp"
 
-#include "../../../map/country_status_display.hpp"
-#include "../../../map/user_mark.hpp"
+#include "map/country_status_display.hpp"
+#include "map/user_mark.hpp"
 
-#include "../../../platform/file_logging.hpp"
-#include "../../../platform/platform.hpp"
-#include "../../../platform/settings.hpp"
+#include "platform/file_logging.hpp"
+#include "platform/platform.hpp"
+#include "platform/settings.hpp"
 
 extern NSString * const kAlohalyticsTapEventKey = @"$onClick";
 
diff --git a/iphone/Maps/Classes/MapsAppDelegate.h b/iphone/Maps/Classes/MapsAppDelegate.h
index 5f3183dc3d..1f500bc246 100644
--- a/iphone/Maps/Classes/MapsAppDelegate.h
+++ b/iphone/Maps/Classes/MapsAppDelegate.h
@@ -4,7 +4,7 @@
 #import "NavigationController.h"
 #import "MapsObservers.h"
 
-#include "../../indexer/map_style.hpp"
+#include "indexer/map_style.hpp"
 
 @class MapViewController;
 @class LocationManager;
diff --git a/iphone/Maps/Classes/MapsAppDelegate.mm b/iphone/Maps/Classes/MapsAppDelegate.mm
index e923ce04d7..c61daa03dc 100644
--- a/iphone/Maps/Classes/MapsAppDelegate.mm
+++ b/iphone/Maps/Classes/MapsAppDelegate.mm
@@ -24,7 +24,6 @@
 #include "storage/storage_defines.hpp"
 
 #import "platform/http_thread_apple.h"
-
 #include "platform/settings.hpp"
 #include "platform/platform_ios.hpp"
 #include "platform/preferred_languages.hpp"
diff --git a/iphone/Maps/Classes/MapsObservers.h b/iphone/Maps/Classes/MapsObservers.h
index 6b16be5478..63d6947179 100644
--- a/iphone/Maps/Classes/MapsObservers.h
+++ b/iphone/Maps/Classes/MapsObservers.h
@@ -1,6 +1,6 @@
 
 #include "Framework.h"
-#include "../../storage/storage_defines.hpp"
+#include "storage/storage_defines.hpp"
 
 using namespace storage;
 
diff --git a/iphone/Maps/Classes/RenderBuffer.hpp b/iphone/Maps/Classes/RenderBuffer.hpp
index 3226e98a89..8c43178752 100644
--- a/iphone/Maps/Classes/RenderBuffer.hpp
+++ b/iphone/Maps/Classes/RenderBuffer.hpp
@@ -1,8 +1,8 @@
 #pragma once
 
 #include "RenderContext.hpp"
-#include "../../../std/shared_ptr.hpp"
-#include "../../../graphics/render_target.hpp"
+#include "std/shared_ptr.hpp"
+#include "graphics/render_target.hpp"
 
 @class CAEAGLLayer;
 
diff --git a/iphone/Maps/Classes/RenderBuffer.mm b/iphone/Maps/Classes/RenderBuffer.mm
index 77ec34c1f0..8b02d36849 100644
--- a/iphone/Maps/Classes/RenderBuffer.mm
+++ b/iphone/Maps/Classes/RenderBuffer.mm
@@ -1,9 +1,8 @@
 #import <QuartzCore/CAEAGLLayer.h>
 
 #include "RenderBuffer.hpp"
-
-#include "../../../graphics/opengl/opengl.hpp"
-#include "../../../graphics/coordinates.hpp"
+#include "graphics/opengl/opengl.hpp"
+#include "graphics/coordinates.hpp"
 
 namespace iphone
 {
diff --git a/iphone/Maps/Classes/RenderContext.hpp b/iphone/Maps/Classes/RenderContext.hpp
index 1ace05950d..70125e7fac 100644
--- a/iphone/Maps/Classes/RenderContext.hpp
+++ b/iphone/Maps/Classes/RenderContext.hpp
@@ -4,8 +4,8 @@
 #include <OpenGLES/ES1/gl.h>
 #include <OpenGLES/ES1/glext.h>
 
-#include "../../../graphics/opengl/gl_render_context.hpp"
-#include "../../../std/shared_ptr.hpp"
+#include "graphics/opengl/gl_render_context.hpp"
+#include "std/shared_ptr.hpp"
 
 
 namespace iphone