diff --git a/Device/Mask/Line.cpp b/Device/Mask/Line.cpp
index 93ebca92e8cd9d308c5a1a1ea1cefb794d42292a..bee489523d18ed6d264a270a18e794bb2ef89239 100644
--- a/Device/Mask/Line.cpp
+++ b/Device/Mask/Line.cpp
@@ -19,9 +19,8 @@
 #include <boost/geometry.hpp>
 #include <limits>
 
-typedef boost::geometry::model::d2::point_xy<double> point_t;
-// typedef model::box<point_t> box_t;
-typedef boost::geometry::model::linestring<point_t> line_t;
+using point_t = boost::geometry::model::d2::point_xy<double>;
+using line_t = boost::geometry::model::linestring<point_t>;
 
 Line::Line(double x1, double y1, double x2, double y2)
     : IShape2D("Line"), m_x1(x1), m_y1(y1), m_x2(x2), m_y2(y2)
diff --git a/Device/Mask/Polygon.cpp b/Device/Mask/Polygon.cpp
index 6431f79e1e991da000203539325d92090761f155..7876297f6a69000c46c769a6dd03dd315dcb7c5e 100644
--- a/Device/Mask/Polygon.cpp
+++ b/Device/Mask/Polygon.cpp
@@ -20,8 +20,8 @@
 //! The private data for polygons to hide boost dependency from the header
 class PolygonPrivate {
 public:
-    typedef boost::geometry::model::d2::point_xy<double> point_t;
-    typedef boost::geometry::model::polygon<point_t> polygon_t;
+    using point_t = boost::geometry::model::d2::point_xy<double>;
+    using polygon_t = boost::geometry::model::polygon<point_t>;
     polygon_t polygon;
     void init_from(const std::vector<double>& x, const std::vector<double>& y);
     void get_points(std::vector<double>& xpos, std::vector<double>& ypos);