Fix include path for geometry

57 files changed, 236 insertions, 236 deletions

diff --git a/geometry/angles.cpp b/geometry/angles.cpp
index 2d48c3cf24..b1a34ae508 100644
--- a/geometry/angles.cpp
+++ b/geometry/angles.cpp
@@ -1,4 +1,4 @@
-#include "angles.hpp"
+#include "geometry/angles.hpp"
 
 
 namespace ang
diff --git a/geometry/angles.hpp b/geometry/angles.hpp
index 0d218ea6d7..0b988cf835 100644
--- a/geometry/angles.hpp
+++ b/geometry/angles.hpp
@@ -1,10 +1,10 @@
 #pragma once
 
-#include "point2d.hpp"
+#include "geometry/point2d.hpp"
 
-#include "../base/matrix.hpp"
+#include "base/matrix.hpp"
 
-#include "../std/cmath.hpp"
+#include "std/cmath.hpp"
 
 
 namespace ang
diff --git a/geometry/any_rect2d.hpp b/geometry/any_rect2d.hpp
index 6068572122..30d8448158 100644
--- a/geometry/any_rect2d.hpp
+++ b/geometry/any_rect2d.hpp
@@ -1,11 +1,11 @@
 #pragma once
 
-#include "point2d.hpp"
-#include "rect2d.hpp"
-#include "rect_intersect.hpp"
-#include "angles.hpp"
+#include "geometry/point2d.hpp"
+#include "geometry/rect2d.hpp"
+#include "geometry/rect_intersect.hpp"
+#include "geometry/angles.hpp"
 
-#include "../base/math.hpp"
+#include "base/math.hpp"
 
 
 namespace m2
diff --git a/geometry/avg_vector.hpp b/geometry/avg_vector.hpp
index 2a8a02966e..b5b871cf6c 100644
--- a/geometry/avg_vector.hpp
+++ b/geometry/avg_vector.hpp
@@ -1,11 +1,11 @@
 #pragma once
 
-#include "../base/math.hpp"
-#include "../base/assert.hpp"
+#include "base/math.hpp"
+#include "base/assert.hpp"
 
-#include "../std/deque.hpp"
-#include "../std/array.hpp"
-#include "../std/cstring.hpp"
+#include "std/deque.hpp"
+#include "std/array.hpp"
+#include "std/cstring.hpp"
 
 
 namespace math
diff --git a/geometry/cellid.hpp b/geometry/cellid.hpp
index 01060bf8b6..1fef4c8059 100644
--- a/geometry/cellid.hpp
+++ b/geometry/cellid.hpp
@@ -1,9 +1,9 @@
 #pragma once
-#include "../base/assert.hpp"
-#include "../base/base.hpp"
-#include "../std/string.hpp"
-#include "../std/sstream.hpp"
-#include "../std/utility.hpp"
+#include "base/assert.hpp"
+#include "base/base.hpp"
+#include "std/string.hpp"
+#include "std/sstream.hpp"
+#include "std/utility.hpp"
 
 
 namespace m2
diff --git a/geometry/covering.hpp b/geometry/covering.hpp
index 2a50ccc3f3..6e9597c3b9 100644
--- a/geometry/covering.hpp
+++ b/geometry/covering.hpp
@@ -1,19 +1,19 @@
 #pragma once
-#include "covering_utils.hpp"
-#include "../geometry/point2d.hpp"
-#include "../base/assert.hpp"
-#include "../base/base.hpp"
-#include "../base/logging.hpp"
-#include "../base/set_operations.hpp"
-#include "../base/stl_add.hpp"
-#include "../std/algorithm.hpp"
-#include "../std/array.hpp"
-#include "../std/functional.hpp"
-#include "../std/iterator.hpp"
-#include "../std/map.hpp"
-#include "../std/queue.hpp"
-#include "../std/utility.hpp"
-#include "../std/vector.hpp"
+#include "geometry/covering_utils.hpp"
+#include "geometry/point2d.hpp"
+#include "base/assert.hpp"
+#include "base/base.hpp"
+#include "base/logging.hpp"
+#include "base/set_operations.hpp"
+#include "base/stl_add.hpp"
+#include "std/algorithm.hpp"
+#include "std/array.hpp"
+#include "std/functional.hpp"
+#include "std/iterator.hpp"
+#include "std/map.hpp"
+#include "std/queue.hpp"
+#include "std/utility.hpp"
+#include "std/vector.hpp"
 
 namespace covering
 {
diff --git a/geometry/covering_utils.hpp b/geometry/covering_utils.hpp
index 0038b6d54b..83d9c06cb4 100644
--- a/geometry/covering_utils.hpp
+++ b/geometry/covering_utils.hpp
@@ -1,11 +1,11 @@
 #pragma once
-#include "../geometry/point2d.hpp"
-#include "../base/assert.hpp"
-#include "../base/base.hpp"
-#include "../base/buffer_vector.hpp"
-#include "../base/logging.hpp"
-#include "../base/math.hpp"
-#include "../std/algorithm.hpp"
+#include "geometry/point2d.hpp"
+#include "base/assert.hpp"
+#include "base/base.hpp"
+#include "base/buffer_vector.hpp"
+#include "base/logging.hpp"
+#include "base/math.hpp"
+#include "std/algorithm.hpp"
 
 namespace covering
 {
diff --git a/geometry/distance.hpp b/geometry/distance.hpp
index 3f1219f6ff..47b7225285 100644
--- a/geometry/distance.hpp
+++ b/geometry/distance.hpp
@@ -1,10 +1,10 @@
 #pragma once
-#include "point2d.hpp"
+#include "geometry/point2d.hpp"
 
-#include "../base/math.hpp"
+#include "base/math.hpp"
 
-#include "../std/limits.hpp"
-#include "../std/static_assert.hpp"
+#include "std/limits.hpp"
+#include "std/static_assert.hpp"
 
 
 namespace m2
diff --git a/geometry/distance_on_sphere.cpp b/geometry/distance_on_sphere.cpp
index cf7267845c..3093dadf0a 100644
--- a/geometry/distance_on_sphere.cpp
+++ b/geometry/distance_on_sphere.cpp
@@ -1,6 +1,6 @@
-#include "distance_on_sphere.hpp"
-#include "../base/math.hpp"
-#include "../std/algorithm.hpp"
+#include "geometry/distance_on_sphere.hpp"
+#include "base/math.hpp"
+#include "std/algorithm.hpp"
 
 double ms::DistanceOnSphere(double lat1Deg, double lon1Deg, double lat2Deg, double lon2Deg)
 {
diff --git a/geometry/distance_on_sphere.hpp b/geometry/distance_on_sphere.hpp
index 1d81e1e817..3f8473cfb3 100644
--- a/geometry/distance_on_sphere.hpp
+++ b/geometry/distance_on_sphere.hpp
@@ -1,5 +1,5 @@
 #pragma once
-#include "../base/base.hpp"
+#include "base/base.hpp"
 
 // namespace ms - "math on sphere", similar to the namespaces m2 and mn.
 namespace ms
diff --git a/geometry/geometry_tests/angle_test.cpp b/geometry/geometry_tests/angle_test.cpp
index 4e5e0f912c..54fd651a0d 100644
--- a/geometry/geometry_tests/angle_test.cpp
+++ b/geometry/geometry_tests/angle_test.cpp
@@ -1,12 +1,12 @@
-#include "../../base/SRC_FIRST.hpp"
+#include "base/SRC_FIRST.hpp"
 
-#include "equality.hpp"
+#include "geometry/geometry_tests/equality.hpp"
 
-#include "../../base/macros.hpp"
+#include "base/macros.hpp"
 
-#include "../../testing/testing.hpp"
+#include "testing/testing.hpp"
 
-#include "../angles.hpp"
+#include "geometry/angles.hpp"
 
 
 using namespace test;
diff --git a/geometry/geometry_tests/anyrect_test.cpp b/geometry/geometry_tests/anyrect_test.cpp
index 9ae89d06b5..33f4323ca1 100644
--- a/geometry/geometry_tests/anyrect_test.cpp
+++ b/geometry/geometry_tests/anyrect_test.cpp
@@ -1,8 +1,8 @@
-#include "../../testing/testing.hpp"
+#include "testing/testing.hpp"
 
-#include "../any_rect2d.hpp"
+#include "geometry/any_rect2d.hpp"
 
-#include "../../std/cmath.hpp"
+#include "std/cmath.hpp"
 
 UNIT_TEST(AnyRect_TestConvertTo)
 {
diff --git a/geometry/geometry_tests/cellid_test.cpp b/geometry/geometry_tests/cellid_test.cpp
index a664f33e9e..9910020b96 100644
--- a/geometry/geometry_tests/cellid_test.cpp
+++ b/geometry/geometry_tests/cellid_test.cpp
@@ -1,7 +1,7 @@
-#include "../../testing/testing.hpp"
-#include "../cellid.hpp"
-#include "../../std/algorithm.hpp"
-#include "../../std/string.hpp"
+#include "testing/testing.hpp"
+#include "geometry/cellid.hpp"
+#include "std/algorithm.hpp"
+#include "std/string.hpp"
 
 UNIT_TEST(CellID_Parent)
 {
diff --git a/geometry/geometry_tests/common_test.cpp b/geometry/geometry_tests/common_test.cpp
index d6dc8cb4db..7ffbbb2af0 100644
--- a/geometry/geometry_tests/common_test.cpp
+++ b/geometry/geometry_tests/common_test.cpp
@@ -1,11 +1,11 @@
-#include "../../base/SRC_FIRST.hpp"
-#include "../../base/macros.hpp"
+#include "base/SRC_FIRST.hpp"
+#include "base/macros.hpp"
 
-#include "equality.hpp"
+#include "geometry/geometry_tests/equality.hpp"
 
-#include "../../testing/testing.hpp"
+#include "testing/testing.hpp"
 
-#include "../rect2d.hpp"
+#include "geometry/rect2d.hpp"
 
 using namespace test;
 
diff --git a/geometry/geometry_tests/covering_test.cpp b/geometry/geometry_tests/covering_test.cpp
index 4165134919..3872e6acda 100644
--- a/geometry/geometry_tests/covering_test.cpp
+++ b/geometry/geometry_tests/covering_test.cpp
@@ -1,9 +1,9 @@
-#include "../../testing/testing.hpp"
-#include "../cellid.hpp"
-#include "../covering.hpp"
-#include "../covering_utils.hpp"
-#include "../point2d.hpp"
-#include "../../base/stl_add.hpp"
+#include "testing/testing.hpp"
+#include "geometry/cellid.hpp"
+#include "geometry/covering.hpp"
+#include "geometry/covering_utils.hpp"
+#include "geometry/point2d.hpp"
+#include "base/stl_add.hpp"
 
 
 // TODO: Add covering unit tests here.
diff --git a/geometry/geometry_tests/distance_on_sphere_test.cpp b/geometry/geometry_tests/distance_on_sphere_test.cpp
index f985fa53a1..ddb8739078 100644
--- a/geometry/geometry_tests/distance_on_sphere_test.cpp
+++ b/geometry/geometry_tests/distance_on_sphere_test.cpp
@@ -1,6 +1,6 @@
-#include "../../testing/testing.hpp"
-#include "../distance_on_sphere.hpp"
-#include "../../base/math.hpp"
+#include "testing/testing.hpp"
+#include "geometry/distance_on_sphere.hpp"
+#include "base/math.hpp"
 
 UNIT_TEST(DistanceOnSphere)
 {
diff --git a/geometry/geometry_tests/distance_test.cpp b/geometry/geometry_tests/distance_test.cpp
index 26d1a79f20..e3f23252a8 100644
--- a/geometry/geometry_tests/distance_test.cpp
+++ b/geometry/geometry_tests/distance_test.cpp
@@ -1,6 +1,6 @@
-#include "../../testing/testing.hpp"
-#include "../distance.hpp"
-#include "../point2d.hpp"
+#include "testing/testing.hpp"
+#include "geometry/distance.hpp"
+#include "geometry/point2d.hpp"
 
 template <class PointT>
 void FloatingPointsTest()
diff --git a/geometry/geometry_tests/equality.hpp b/geometry/geometry_tests/equality.hpp
index 90ed2fdd8b..02fee741e4 100644
--- a/geometry/geometry_tests/equality.hpp
+++ b/geometry/geometry_tests/equality.hpp
@@ -1,8 +1,8 @@
 #pragma once
-#include "../../base/math.hpp"
+#include "base/math.hpp"
 
-#include "../angles.hpp"
-#include "../rect2d.hpp"
+#include "geometry/angles.hpp"
+#include "geometry/rect2d.hpp"
 
 namespace test
 {
diff --git a/geometry/geometry_tests/intersect_test.cpp b/geometry/geometry_tests/intersect_test.cpp
index 45981cf544..154e46009e 100644
--- a/geometry/geometry_tests/intersect_test.cpp
+++ b/geometry/geometry_tests/intersect_test.cpp
@@ -1,11 +1,11 @@
-#include "../../base/SRC_FIRST.hpp"
+#include "base/SRC_FIRST.hpp"
 
-#include "equality.hpp"
+#include "geometry/geometry_tests/equality.hpp"
 
-#include "../../testing/testing.hpp"
+#include "testing/testing.hpp"
 
-#include "../../geometry/rect_intersect.hpp"
-#include "../../geometry/angles.hpp"
+#include "geometry/rect_intersect.hpp"
+#include "geometry/angles.hpp"
 
 
 using namespace test;
diff --git a/geometry/geometry_tests/large_polygon.hpp b/geometry/geometry_tests/large_polygon.hpp
index 5909852eed..223914af16 100644
--- a/geometry/geometry_tests/large_polygon.hpp
+++ b/geometry/geometry_tests/large_polygon.hpp
@@ -1,4 +1,4 @@
-#include "../point2d.hpp"
+#include "geometry/point2d.hpp"
 
 namespace LargePolygon
 {
diff --git a/geometry/geometry_tests/packer_test.cpp b/geometry/geometry_tests/packer_test.cpp
index bc26a9df9a..49c1c3daa0 100644
--- a/geometry/geometry_tests/packer_test.cpp
+++ b/geometry/geometry_tests/packer_test.cpp
@@ -1,7 +1,7 @@
-#include "../../base/SRC_FIRST.hpp"
-#include "../../testing/testing.hpp"
+#include "base/SRC_FIRST.hpp"
+#include "testing/testing.hpp"
 
-#include "../packer.hpp"
+#include "geometry/packer.hpp"
 
 static int i = 1;
 
diff --git a/geometry/geometry_tests/point_test.cpp b/geometry/geometry_tests/point_test.cpp
index 6c24dad228..8024b4281a 100644
--- a/geometry/geometry_tests/point_test.cpp
+++ b/geometry/geometry_tests/point_test.cpp
@@ -1,7 +1,7 @@
-#include "../../base/SRC_FIRST.hpp"
-#include "../../testing/testing.hpp"
-#include "equality.hpp"
-#include "../point2d.hpp"
+#include "base/SRC_FIRST.hpp"
+#include "testing/testing.hpp"
+#include "geometry/geometry_tests/equality.hpp"
+#include "geometry/point2d.hpp"
 
 UNIT_TEST(Point_Rotate)
 {
diff --git a/geometry/geometry_tests/pointu_to_uint64_test.cpp b/geometry/geometry_tests/pointu_to_uint64_test.cpp
index 7fc690ce90..c890a17476 100644
--- a/geometry/geometry_tests/pointu_to_uint64_test.cpp
+++ b/geometry/geometry_tests/pointu_to_uint64_test.cpp
@@ -1,5 +1,5 @@
-#include "../../testing/testing.hpp"
-#include "../pointu_to_uint64.hpp"
+#include "testing/testing.hpp"
+#include "geometry/pointu_to_uint64.hpp"
 
 UNIT_TEST(PointUToUint64_0)
 {
diff --git a/geometry/geometry_tests/polygon_test.cpp b/geometry/geometry_tests/polygon_test.cpp
index 4647e295ba..3e677afdbc 100644
--- a/geometry/geometry_tests/polygon_test.cpp
+++ b/geometry/geometry_tests/polygon_test.cpp
@@ -1,11 +1,11 @@
-#include "../../testing/testing.hpp"
+#include "testing/testing.hpp"
 
-#include "../polygon.hpp"
-#include "../point2d.hpp"
+#include "geometry/polygon.hpp"
+#include "geometry/point2d.hpp"
 
-#include "../../base/macros.hpp"
+#include "base/macros.hpp"
 
-#include "../../std/algorithm.hpp"
+#include "std/algorithm.hpp"
 
 
 namespace
diff --git a/geometry/geometry_tests/rect_test.cpp b/geometry/geometry_tests/rect_test.cpp
index c56533e382..7676fbb880 100644
--- a/geometry/geometry_tests/rect_test.cpp
+++ b/geometry/geometry_tests/rect_test.cpp
@@ -1,6 +1,6 @@
-#include "../../base/SRC_FIRST.hpp"
-#include "../../testing/testing.hpp"
-#include "../rect2d.hpp"
+#include "base/SRC_FIRST.hpp"
+#include "testing/testing.hpp"
+#include "geometry/rect2d.hpp"
 
 UNIT_TEST(Rect_Intersect)
 {
diff --git a/geometry/geometry_tests/region2d_binary_op_test.cpp b/geometry/geometry_tests/region2d_binary_op_test.cpp
index b5c0232001..bf856ef908 100644
--- a/geometry/geometry_tests/region2d_binary_op_test.cpp
+++ b/geometry/geometry_tests/region2d_binary_op_test.cpp
@@ -1,12 +1,12 @@
-#include "../../base/SRC_FIRST.hpp"
+#include "base/SRC_FIRST.hpp"
 
-#include "test_regions.hpp"
+#include "geometry/geometry_tests/test_regions.hpp"
 
-#include "../../testing/testing.hpp"
+#include "testing/testing.hpp"
 
-#include "../region2d/binary_operators.hpp"
+#include "geometry/region2d/binary_operators.hpp"
 
-#include "../../base/logging.hpp"
+#include "base/logging.hpp"
 
 
 namespace
diff --git a/geometry/geometry_tests/region_test.cpp b/geometry/geometry_tests/region_test.cpp
index 386a8f4926..714ad56806 100644
--- a/geometry/geometry_tests/region_test.cpp
+++ b/geometry/geometry_tests/region_test.cpp
@@ -1,8 +1,8 @@
-#include "../../testing/testing.hpp"
+#include "testing/testing.hpp"
 
-#include "../../base/macros.hpp"
+#include "base/macros.hpp"
 
-#include "../region2d.hpp"
+#include "geometry/region2d.hpp"
 
 
 namespace {
diff --git a/geometry/geometry_tests/robust_test.cpp b/geometry/geometry_tests/robust_test.cpp
index cc3e2cd29c..04e5f356c2 100644
--- a/geometry/geometry_tests/robust_test.cpp
+++ b/geometry/geometry_tests/robust_test.cpp
@@ -1,6 +1,6 @@
-#include "../../testing/testing.hpp"
+#include "testing/testing.hpp"
 
-#include "../robust_orientation.hpp"
+#include "geometry/robust_orientation.hpp"
 
 
 typedef m2::PointD P;
diff --git a/geometry/geometry_tests/screen_test.cpp b/geometry/geometry_tests/screen_test.cpp
index b754b4807b..529a30e909 100644
--- a/geometry/geometry_tests/screen_test.cpp
+++ b/geometry/geometry_tests/screen_test.cpp
@@ -1,9 +1,9 @@
-#include "equality.hpp"
+#include "geometry/geometry_tests/equality.hpp"
 
-#include "../screenbase.hpp"
-#include "../transformations.hpp"
+#include "geometry/screenbase.hpp"
+#include "geometry/transformations.hpp"
 
-#include "../../testing/testing.hpp"
+#include "testing/testing.hpp"
 
 
 using namespace test;
diff --git a/geometry/geometry_tests/segments_intersect_test.cpp b/geometry/geometry_tests/segments_intersect_test.cpp
index f9c903e00c..a92c62c163 100644
--- a/geometry/geometry_tests/segments_intersect_test.cpp
+++ b/geometry/geometry_tests/segments_intersect_test.cpp
@@ -1,5 +1,5 @@
-#include "../../testing/testing.hpp"
-#include "../point2d.hpp"
+#include "testing/testing.hpp"
+#include "geometry/point2d.hpp"
 
 typedef m2::PointD P;
 
diff --git a/geometry/geometry_tests/simplification_test.cpp b/geometry/geometry_tests/simplification_test.cpp
index fe7a8b74f3..f6024d1b05 100644
--- a/geometry/geometry_tests/simplification_test.cpp
+++ b/geometry/geometry_tests/simplification_test.cpp
@@ -1,18 +1,18 @@
-#include "../../testing/testing.hpp"
+#include "testing/testing.hpp"
 
-#include "../simplification.hpp"
+#include "geometry/simplification.hpp"
 
-#include "../../indexer/scales.hpp"
+#include "indexer/scales.hpp"
 
-#include "../../geometry/distance.hpp"
-#include "../../geometry/point2d.hpp"
+#include "geometry/distance.hpp"
+#include "geometry/point2d.hpp"
 
-#include "../../base/logging.hpp"
-#include "../../base/macros.hpp"
-#include "../../base/stl_add.hpp"
+#include "base/logging.hpp"
+#include "base/macros.hpp"
+#include "base/stl_add.hpp"
 
-#include "../../std/limits.hpp"
-#include "../../std/vector.hpp"
+#include "std/limits.hpp"
+#include "std/vector.hpp"
 
 namespace
 {
@@ -166,7 +166,7 @@ UNIT_TEST(Simpfication_DP_DegenerateTrg)
   CheckDPStrict(arr2, ARRAY_SIZE(arr2), 1.0, 4);
 }
 
-#include "large_polygon.hpp"
+#include "geometry/geometry_tests/large_polygon.hpp"
 
 m2::PointD const * LargePolylineTestData::m_Data = LargePolygon::kLargePolygon;
 size_t LargePolylineTestData::m_Size = ARRAY_SIZE(LargePolygon::kLargePolygon);
diff --git a/geometry/geometry_tests/spline_test.cpp b/geometry/geometry_tests/spline_test.cpp
index d901340583..4b0ccc69cb 100644
--- a/geometry/geometry_tests/spline_test.cpp
+++ b/geometry/geometry_tests/spline_test.cpp
@@ -1,7 +1,7 @@
-#include "../../base/SRC_FIRST.hpp"
-#include "../../testing/testing.hpp"
-#include "equality.hpp"
-#include "../spline.hpp"
+#include "base/SRC_FIRST.hpp"
+#include "testing/testing.hpp"
+#include "geometry/geometry_tests/equality.hpp"
+#include "geometry/spline.hpp"
 
 using m2::Spline;
 using m2::PointD;
diff --git a/geometry/geometry_tests/test_regions.hpp b/geometry/geometry_tests/test_regions.hpp
index 339e4568a6..ffc3f42f72 100644
--- a/geometry/geometry_tests/test_regions.hpp
+++ b/geometry/geometry_tests/test_regions.hpp
@@ -1,5 +1,5 @@
 #pragma once
-#include "../point2d.hpp"
+#include "geometry/point2d.hpp"
 
 namespace geom_test
 {
diff --git a/geometry/geometry_tests/transformations_test.cpp b/geometry/geometry_tests/transformations_test.cpp
index e6c1a0fd89..a6d911e618 100644
--- a/geometry/geometry_tests/transformations_test.cpp
+++ b/geometry/geometry_tests/transformations_test.cpp
@@ -1,9 +1,9 @@
-#include "../../base/SRC_FIRST.hpp"
+#include "base/SRC_FIRST.hpp"
 
-#include "../../testing/testing.hpp"
-#include "../../base/matrix.hpp"
-#include "../../geometry/point2d.hpp"
-#include "../transformations.hpp"
+#include "testing/testing.hpp"
+#include "base/matrix.hpp"
+#include "geometry/point2d.hpp"
+#include "geometry/transformations.hpp"
 
 UNIT_TEST(Transformations_Shift)
 {
diff --git a/geometry/geometry_tests/tree_test.cpp b/geometry/geometry_tests/tree_test.cpp
index 65897687d6..fab4144e0c 100644
--- a/geometry/geometry_tests/tree_test.cpp
+++ b/geometry/geometry_tests/tree_test.cpp
@@ -1,6 +1,6 @@
-#include "../../testing/testing.hpp"
+#include "testing/testing.hpp"
 
-#include "../tree4d.hpp"
+#include "geometry/tree4d.hpp"
 
 
 namespace
diff --git a/geometry/geometry_tests/vector_test.cpp b/geometry/geometry_tests/vector_test.cpp
index c7cc0e162f..1709833ec1 100644
--- a/geometry/geometry_tests/vector_test.cpp
+++ b/geometry/geometry_tests/vector_test.cpp
@@ -1,6 +1,6 @@
-#include "../../testing/testing.hpp"
+#include "testing/testing.hpp"
 
-#include "../avg_vector.hpp"
+#include "geometry/avg_vector.hpp"
 
 
 namespace
diff --git a/geometry/packer.cpp b/geometry/packer.cpp
index 2dedd6ad62..183af8d4e8 100644
--- a/geometry/packer.cpp
+++ b/geometry/packer.cpp
@@ -1,7 +1,7 @@
-#include "packer.hpp"
+#include "geometry/packer.hpp"
 
-#include "../base/assert.hpp"
-#include "../base/logging.hpp"
+#include "base/assert.hpp"
+#include "base/logging.hpp"
 
 namespace m2
 {
diff --git a/geometry/packer.hpp b/geometry/packer.hpp
index 85526e142e..cfeb6d2f5f 100644
--- a/geometry/packer.hpp
+++ b/geometry/packer.hpp
@@ -1,11 +1,11 @@
 #pragma once
 
-#include "rect2d.hpp"
+#include "geometry/rect2d.hpp"
 
-#include "../std/list.hpp"
-#include "../std/map.hpp"
-#include "../std/function.hpp"
-#include "../std/queue.hpp"
+#include "std/list.hpp"
+#include "std/map.hpp"
+#include "std/function.hpp"
+#include "std/queue.hpp"
 
 
 namespace m2
diff --git a/geometry/point2d.hpp b/geometry/point2d.hpp
index b60514016a..4211efab4f 100644
--- a/geometry/point2d.hpp
+++ b/geometry/point2d.hpp
@@ -1,13 +1,13 @@
 #pragma once
 
-#include "../base/assert.hpp"
-#include "../base/base.hpp"
-#include "../base/math.hpp"
-#include "../base/matrix.hpp"
-#include "../std/cmath.hpp"
-#include "../std/sstream.hpp"
-#include "../std/typeinfo.hpp"
-#include "../std/array.hpp"
+#include "base/assert.hpp"
+#include "base/base.hpp"
+#include "base/math.hpp"
+#include "base/matrix.hpp"
+#include "std/cmath.hpp"
+#include "std/sstream.hpp"
+#include "std/typeinfo.hpp"
+#include "std/array.hpp"
 
 
 namespace m2
diff --git a/geometry/pointu_to_uint64.hpp b/geometry/pointu_to_uint64.hpp
index 9c074cde0e..3ea17330cf 100644
--- a/geometry/pointu_to_uint64.hpp
+++ b/geometry/pointu_to_uint64.hpp
@@ -1,8 +1,8 @@
 #pragma once
-#include "../base/assert.hpp"
-#include "../base/base.hpp"
-#include "../base/bits.hpp"
-#include "point2d.hpp"
+#include "base/assert.hpp"
+#include "base/base.hpp"
+#include "base/bits.hpp"
+#include "geometry/point2d.hpp"
 
 namespace m2
 {
diff --git a/geometry/polygon.hpp b/geometry/polygon.hpp
index d79c41a0c9..28c4ec0b6c 100644
--- a/geometry/polygon.hpp
+++ b/geometry/polygon.hpp
@@ -1,13 +1,13 @@
 #pragma once
 
-#include "robust_orientation.hpp"
+#include "geometry/robust_orientation.hpp"
 
-#include "../base/assert.hpp"
-#include "../base/base.hpp"
-#include "../base/math.hpp"
-#include "../base/stl_add.hpp"
+#include "base/assert.hpp"
+#include "base/base.hpp"
+#include "base/math.hpp"
+#include "base/stl_add.hpp"
 
-#include "../std/iterator.hpp"
+#include "std/iterator.hpp"
 
 
 template <typename IsVisibleF>
diff --git a/geometry/polyline2d.hpp b/geometry/polyline2d.hpp
index e896ae919a..ef2dd677cc 100644
--- a/geometry/polyline2d.hpp
+++ b/geometry/polyline2d.hpp
@@ -1,12 +1,12 @@
 #pragma once
 
-#include "point2d.hpp"
-#include "rect2d.hpp"
-#include "distance.hpp"
+#include "geometry/point2d.hpp"
+#include "geometry/rect2d.hpp"
+#include "geometry/distance.hpp"
 
-#include "../base/internal/message.hpp"
+#include "base/internal/message.hpp"
 
-#include "../std/vector.hpp"
+#include "std/vector.hpp"
 
 
 namespace m2
diff --git a/geometry/rect2d.hpp b/geometry/rect2d.hpp
index 685b47db8d..39c8a207f9 100644
--- a/geometry/rect2d.hpp
+++ b/geometry/rect2d.hpp
@@ -1,12 +1,12 @@
 #pragma once
 
-#include "point2d.hpp"
+#include "geometry/point2d.hpp"
 
-#include "../base/assert.hpp"
-#include "../base/internal/message.hpp"
+#include "base/assert.hpp"
+#include "base/internal/message.hpp"
 
-#include "../std/algorithm.hpp"
-#include "../std/limits.hpp"
+#include "std/algorithm.hpp"
+#include "std/limits.hpp"
 
 
 namespace m2
diff --git a/geometry/rect_intersect.hpp b/geometry/rect_intersect.hpp
index 86cb903335..8378ac7fc6 100644
--- a/geometry/rect_intersect.hpp
+++ b/geometry/rect_intersect.hpp
@@ -1,7 +1,7 @@
 #pragma once
 
-#include "rect2d.hpp"
-#include "point2d.hpp"
+#include "geometry/rect2d.hpp"
+#include "geometry/point2d.hpp"
 
 namespace m2
 {
diff --git a/geometry/region2d.hpp b/geometry/region2d.hpp
index efc7355a04..21a8eba738 100644
--- a/geometry/region2d.hpp
+++ b/geometry/region2d.hpp
@@ -1,12 +1,12 @@
 #pragma once
 
-#include "point2d.hpp"
-#include "rect2d.hpp"
-#include "distance.hpp"
+#include "geometry/point2d.hpp"
+#include "geometry/rect2d.hpp"
+#include "geometry/distance.hpp"
 
-#include "../std/vector.hpp"
-#include "../std/algorithm.hpp"
-#include "../std/type_traits.hpp"
+#include "std/vector.hpp"
+#include "std/algorithm.hpp"
+#include "std/type_traits.hpp"
 
 
 namespace m2
diff --git a/geometry/region2d/binary_operators.cpp b/geometry/region2d/binary_operators.cpp
index f743a1d4cc..5feca099b8 100644
--- a/geometry/region2d/binary_operators.cpp
+++ b/geometry/region2d/binary_operators.cpp
@@ -1,5 +1,5 @@
-#include "boost_concept.hpp"
-#include "binary_operators.hpp"
+#include "geometry/region2d/boost_concept.hpp"
+#include "geometry/region2d/binary_operators.hpp"
 
 
 namespace m2
diff --git a/geometry/region2d/binary_operators.hpp b/geometry/region2d/binary_operators.hpp
index 192ffdf8fd..490c76bbdd 100644
--- a/geometry/region2d/binary_operators.hpp
+++ b/geometry/region2d/binary_operators.hpp
@@ -1,8 +1,8 @@
 #pragma once
 
-#include "../region2d.hpp"
+#include "geometry/region2d.hpp"
 
-#include "../../std/vector.hpp"
+#include "std/vector.hpp"
 
 
 namespace m2
diff --git a/geometry/region2d/boost_concept.hpp b/geometry/region2d/boost_concept.hpp
index f3a857e897..edd3538fb9 100644
--- a/geometry/region2d/boost_concept.hpp
+++ b/geometry/region2d/boost_concept.hpp
@@ -1,20 +1,20 @@
 #pragma once
 
-#include "../point2d.hpp"
-#include "../region2d.hpp"
+#include "geometry/point2d.hpp"
+#include "geometry/region2d.hpp"
 
 #if defined(__clang__)
 #pragma clang diagnostic push
 #pragma clang diagnostic ignored "-Wshorten-64-to-32"
-#include "../../3party/boost/boost/polygon/detail/polygon_sort_adaptor.hpp"
-#include "../../3party/boost/boost/polygon/polygon.hpp"
+#include "3party/boost/boost/polygon/detail/polygon_sort_adaptor.hpp"
+#include "3party/boost/boost/polygon/polygon.hpp"
 #pragma clang diagnostic pop
 #else
-#include "../../3party/boost/boost/polygon/detail/polygon_sort_adaptor.hpp"
-#include "../../3party/boost/boost/polygon/polygon.hpp"
+#include "3party/boost/boost/polygon/detail/polygon_sort_adaptor.hpp"
+#include "3party/boost/boost/polygon/polygon.hpp"
 #endif
 
-#include "../../std/vector.hpp"
+#include "std/vector.hpp"
 
 
 namespace boost { namespace polygon {
diff --git a/geometry/robust_orientation.cpp b/geometry/robust_orientation.cpp
index 03c1729dbb..18844a8e93 100644
--- a/geometry/robust_orientation.cpp
+++ b/geometry/robust_orientation.cpp
@@ -1,8 +1,8 @@
-#include "../base/SRC_FIRST.hpp"
+#include "base/SRC_FIRST.hpp"
 
-#include "robust_orientation.hpp"
+#include "geometry/robust_orientation.hpp"
 
-#include "../base/macros.hpp"
+#include "base/macros.hpp"
 
 extern "C"
 {
diff --git a/geometry/robust_orientation.hpp b/geometry/robust_orientation.hpp
index aa4698ec6f..f2fb074c92 100644
--- a/geometry/robust_orientation.hpp
+++ b/geometry/robust_orientation.hpp
@@ -1,8 +1,8 @@
 #pragma once
 
-#include "point2d.hpp"
+#include "geometry/point2d.hpp"
 
-#include "../base/stl_add.hpp"
+#include "base/stl_add.hpp"
 
 
 namespace m2 { namespace robust
diff --git a/geometry/screenbase.cpp b/geometry/screenbase.cpp
index 1bbff8cf87..08af3c49a0 100644
--- a/geometry/screenbase.cpp
+++ b/geometry/screenbase.cpp
@@ -1,10 +1,10 @@
-#include "screenbase.hpp"
-#include "transformations.hpp"
-#include "angles.hpp"
+#include "geometry/screenbase.hpp"
+#include "geometry/transformations.hpp"
+#include "geometry/angles.hpp"
 
-#include "../base/logging.hpp"
+#include "base/logging.hpp"
 
-#include "../std/cmath.hpp"
+#include "std/cmath.hpp"
 
 
 ScreenBase::ScreenBase() :
diff --git a/geometry/screenbase.hpp b/geometry/screenbase.hpp
index eb74d61937..bfa912e302 100644
--- a/geometry/screenbase.hpp
+++ b/geometry/screenbase.hpp
@@ -1,10 +1,10 @@
 #pragma once
 
-#include "point2d.hpp"
-#include "rect2d.hpp"
-#include "any_rect2d.hpp"
+#include "geometry/point2d.hpp"
+#include "geometry/rect2d.hpp"
+#include "geometry/any_rect2d.hpp"
 
-#include "../base/matrix.hpp"
+#include "base/matrix.hpp"
 
 
 class ScreenBase
diff --git a/geometry/simplification.hpp b/geometry/simplification.hpp
index beda67df76..72da246127 100644
--- a/geometry/simplification.hpp
+++ b/geometry/simplification.hpp
@@ -1,12 +1,12 @@
 #pragma once
-#include "../base/base.hpp"
-#include "../base/stl_add.hpp"
-#include "../base/logging.hpp"
-
-#include "../std/iterator.hpp"
-#include "../std/algorithm.hpp"
-#include "../std/utility.hpp"
-#include "../std/vector.hpp"
+#include "base/base.hpp"
+#include "base/stl_add.hpp"
+#include "base/logging.hpp"
+
+#include "std/iterator.hpp"
+#include "std/algorithm.hpp"
+#include "std/utility.hpp"
+#include "std/vector.hpp"
 
 // Polyline simplification algorithms.
 //
diff --git a/geometry/spline.cpp b/geometry/spline.cpp
index 499ff63bff..418bea301e 100644
--- a/geometry/spline.cpp
+++ b/geometry/spline.cpp
@@ -1,8 +1,8 @@
-#include "spline.hpp"
+#include "geometry/spline.hpp"
 
-#include "../base/logging.hpp"
+#include "base/logging.hpp"
 
-#include "../std/numeric.hpp"
+#include "std/numeric.hpp"
 
 namespace m2
 {
diff --git a/geometry/spline.hpp b/geometry/spline.hpp
index 12c5c77e79..e2800e4669 100644
--- a/geometry/spline.hpp
+++ b/geometry/spline.hpp
@@ -1,9 +1,9 @@
 #pragma once
 
-#include "../std/vector.hpp"
-#include "../std/shared_ptr.hpp"
+#include "std/vector.hpp"
+#include "std/shared_ptr.hpp"
 
-#include "point2d.hpp"
+#include "geometry/point2d.hpp"
 
 namespace m2
 {
diff --git a/geometry/transformations.hpp b/geometry/transformations.hpp
index 7da6a7321d..9fb6dbaf0e 100644
--- a/geometry/transformations.hpp
+++ b/geometry/transformations.hpp
@@ -1,8 +1,8 @@
 #pragma once
 
-#include "point2d.hpp"
+#include "geometry/point2d.hpp"
 
-#include "../base/matrix.hpp"
+#include "base/matrix.hpp"
 
 
 /// v` = v * M, v = [x, y, 1]
diff --git a/geometry/tree4d.hpp b/geometry/tree4d.hpp
index 6bc658f76c..4bf7c5a3dc 100644
--- a/geometry/tree4d.hpp
+++ b/geometry/tree4d.hpp
@@ -1,13 +1,13 @@
 #pragma once
 
-#include "rect2d.hpp"
-#include "point2d.hpp"
+#include "geometry/rect2d.hpp"
+#include "geometry/point2d.hpp"
 
-#include "../base/stl_add.hpp"
-#include "../base/logging.hpp"
+#include "base/stl_add.hpp"
+#include "base/logging.hpp"
 
-#include "../std/sstream.hpp"
-#include "../std/kdtree.hpp"
+#include "std/sstream.hpp"
+#include "std/kdtree.hpp"
 
 
 namespace m4