diff --git a/python/core/conversions.sip b/python/core/conversions.sip
index 985bf659e0e..d0b6475f5cd 100644
--- a/python/core/conversions.sip
+++ b/python/core/conversions.sip
@@ -259,7 +259,7 @@ template <TYPE>
 {
 %TypeHeaderCode
 #include <QList>
-#include "qgspointv2.h"
+#include "qgspoint.h"
 %End
 
 %ConvertFromTypeCode
@@ -333,7 +333,7 @@ template <TYPE>
 {
 %TypeHeaderCode
 #include <QList>
-#include "qgspointv2.h"
+#include "qgspoint.h"
 %End
 
 %ConvertFromTypeCode
diff --git a/python/core/geometry/qgspointv2.sip b/python/core/geometry/qgspointv2.sip
index 2638ff8bbc9..babdc684399 100644
--- a/python/core/geometry/qgspointv2.sip
+++ b/python/core/geometry/qgspointv2.sip
@@ -18,7 +18,7 @@ class QgsPoint: QgsAbstractGeometry
 %End
 
 %TypeHeaderCode
-#include "qgspointv2.h"
+#include "qgspoint.h"
 %End
   public:
 
diff --git a/python/core/qgspoint.sip b/python/core/qgspoint.sip
index 5cce895a9d2..eb8cccbb5f7 100644
--- a/python/core/qgspoint.sip
+++ b/python/core/qgspoint.sip
@@ -20,7 +20,7 @@ class QgsPointXY
 %End
 
 %TypeHeaderCode
-#include "qgspoint.h"
+#include "qgspointxy.h"
 %End
   public:
     QgsPointXY();
diff --git a/src/analysis/network/qgsgraph.h b/src/analysis/network/qgsgraph.h
index 871e5e6b649..b30df6dceae 100644
--- a/src/analysis/network/qgsgraph.h
+++ b/src/analysis/network/qgsgraph.h
@@ -29,7 +29,7 @@
 #include <QVector>
 #include <QVariant>
 
-#include "qgspoint.h"
+#include "qgspointxy.h"
 #include "qgis_analysis.h"
 
 class QgsGraphVertex;
diff --git a/src/analysis/openstreetmap/qgsosmbase.h b/src/analysis/openstreetmap/qgsosmbase.h
index fef70b2ce2c..e16ac510285 100644
--- a/src/analysis/openstreetmap/qgsosmbase.h
+++ b/src/analysis/openstreetmap/qgsosmbase.h
@@ -17,7 +17,7 @@
 
 #include <QString>
 
-#include "qgspoint.h"
+#include "qgspointxy.h"
 
 #include <sqlite3.h>
 #include "qgis_analysis.h"
diff --git a/src/analysis/vector/qgsgeometrysnapper.h b/src/analysis/vector/qgsgeometrysnapper.h
index 199345ec296..717079d272c 100644
--- a/src/analysis/vector/qgsgeometrysnapper.h
+++ b/src/analysis/vector/qgsgeometrysnapper.h
@@ -22,7 +22,7 @@
 #include <QStringList>
 #include "qgsspatialindex.h"
 #include "qgsabstractgeometry.h"
-#include "qgspointv2.h"
+#include "qgspoint.h"
 #include "qgsgeometry.h"
 #include "qgis_analysis.h"
 
diff --git a/src/app/composer/qgscomposeritemwidget.cpp b/src/app/composer/qgscomposeritemwidget.cpp
index d07f7006ee9..f7ad3899036 100644
--- a/src/app/composer/qgscomposeritemwidget.cpp
+++ b/src/app/composer/qgscomposeritemwidget.cpp
@@ -20,7 +20,7 @@
 #include "qgscomposermap.h"
 #include "qgsatlascomposition.h"
 #include "qgscomposition.h"
-#include "qgspoint.h"
+#include "qgspointxy.h"
 #include "qgspropertyoverridebutton.h"
 #include "qgsexpressioncontext.h"
 #include "qgsproject.h"
diff --git a/src/app/dwg/qgsdwgimporter.cpp b/src/app/dwg/qgsdwgimporter.cpp
index 7f401199173..0459affbb97 100644
--- a/src/app/dwg/qgsdwgimporter.cpp
+++ b/src/app/dwg/qgsdwgimporter.cpp
@@ -22,7 +22,7 @@
 #include "libdwgr.h"
 #include "libdxfrw.h"
 #include "qgis.h"
-#include "qgspointv2.h"
+#include "qgspoint.h"
 #include "qgslinestring.h"
 #include "qgscircularstring.h"
 #include "qgscurvepolygon.h"
diff --git a/src/app/gps/qgsgpsinformationwidget.cpp b/src/app/gps/qgsgpsinformationwidget.cpp
index 83be01491b3..b69a0620f34 100644
--- a/src/app/gps/qgsgpsinformationwidget.cpp
+++ b/src/app/gps/qgsgpsinformationwidget.cpp
@@ -29,7 +29,7 @@
 #include "qgslogger.h"
 #include "qgsmaptooladdfeature.h"
 #include "qgsnmeaconnection.h"
-#include "qgspoint.h"
+#include "qgspointxy.h"
 #include "qgsproject.h"
 #include "qgsrubberband.h"
 #include "qgsvectordataprovider.h"
diff --git a/src/app/gps/qgsgpsmarker.h b/src/app/gps/qgsgpsmarker.h
index 62af811b226..7782202479e 100644
--- a/src/app/gps/qgsgpsmarker.h
+++ b/src/app/gps/qgsgpsmarker.h
@@ -18,7 +18,7 @@
 
 #include "qgsmapcanvasitem.h"
 #include "qgscoordinatereferencesystem.h"
-#include "qgspoint.h"
+#include "qgspointxy.h"
 #include <QSvgRenderer>
 
 class QPainter;
diff --git a/src/app/nodetool/qgsselectedfeature.cpp b/src/app/nodetool/qgsselectedfeature.cpp
index 7e410f1ad56..a509fb33c20 100644
--- a/src/app/nodetool/qgsselectedfeature.cpp
+++ b/src/app/nodetool/qgsselectedfeature.cpp
@@ -17,7 +17,7 @@
 #include "nodetool/qgsvertexentry.h"
 
 #include "qgsfeatureiterator.h"
-#include "qgspointv2.h"
+#include "qgspoint.h"
 #include "qgssettings.h"
 #include "qgslogger.h"
 #include "qgsvertexmarker.h"
diff --git a/src/app/nodetool/qgsvertexentry.h b/src/app/nodetool/qgsvertexentry.h
index fbca427fd27..d9c56d70b59 100644
--- a/src/app/nodetool/qgsvertexentry.h
+++ b/src/app/nodetool/qgsvertexentry.h
@@ -16,10 +16,10 @@
 #ifndef QGSVERTEXENTRY_H
 #define QGSVERTEXENTRY_H
 
-#include <qgspointv2.h>
-#include <qgsvertexmarker.h>
-#include <qgsmapcanvas.h>
-#include <qgsmaplayer.h>
+#include "qgspoint.h"
+#include "qgsvertexmarker.h"
+#include "qgsmapcanvas.h"
+#include "qgsmaplayer.h"
 
 class QgsVertexEntry
 {
diff --git a/src/app/qgisapp.cpp b/src/app/qgisapp.cpp
index 304778daee4..45858ceea9e 100644
--- a/src/app/qgisapp.cpp
+++ b/src/app/qgisapp.cpp
@@ -218,7 +218,7 @@ Q_GUI_EXPORT extern int qt_defaultDpiX();
 #include "qgspluginlayerregistry.h"
 #include "qgspluginmanager.h"
 #include "qgspluginregistry.h"
-#include "qgspoint.h"
+#include "qgspointxy.h"
 #include "qgsruntimeprofiler.h"
 #include "qgshandlebadlayers.h"
 #include "qgsproject.h"
diff --git a/src/app/qgisapp.h b/src/app/qgisapp.h
index 1e5755e75dd..493e1803648 100644
--- a/src/app/qgisapp.h
+++ b/src/app/qgisapp.h
@@ -130,7 +130,7 @@ class QgsDataSourceManagerDialog;
 #include "qgsauthmanager.h"
 #include "qgsconfig.h"
 #include "qgsfeature.h"
-#include "qgspoint.h"
+#include "qgspointxy.h"
 #include "qgsmessagebar.h"
 #include "qgsmimedatautils.h"
 #include "qgswelcomepageitemsmodel.h"
diff --git a/src/app/qgsdecorationgrid.cpp b/src/app/qgsdecorationgrid.cpp
index ef619aa9003..5e7c28bc0a4 100644
--- a/src/app/qgsdecorationgrid.cpp
+++ b/src/app/qgsdecorationgrid.cpp
@@ -25,7 +25,7 @@
 #include "qgsrasterlayer.h"
 #include "qgsmaptopixel.h"
 #include "qgspathresolver.h"
-#include "qgspoint.h"
+#include "qgspointxy.h"
 #include "qgsproject.h"
 #include "qgssymbollayerutils.h" //for pointOnLineWithDistance
 #include "qgssymbol.h" //for symbology
diff --git a/src/app/qgsdecorationitem.cpp b/src/app/qgsdecorationitem.cpp
index 24607b6a3c7..d25145e54b4 100644
--- a/src/app/qgsdecorationitem.cpp
+++ b/src/app/qgsdecorationitem.cpp
@@ -24,7 +24,7 @@
 #include "qgsmapdecoration.h"
 #include "qgsmaplayer.h"
 #include "qgsmaptopixel.h"
-#include "qgspoint.h"
+#include "qgspointxy.h"
 #include "qgsproject.h"
 #include "qgssymbollayerutils.h" //for pointOnLineWithDistance
 #include "qgsunittypes.h"
diff --git a/src/app/qgsdecorationscalebar.cpp b/src/app/qgsdecorationscalebar.cpp
index a2c3e2f074f..cdb5692decb 100644
--- a/src/app/qgsdecorationscalebar.cpp
+++ b/src/app/qgsdecorationscalebar.cpp
@@ -29,7 +29,7 @@ email                : sbr00pwb@users.sourceforge.net
 #include "qgsmapcanvas.h"
 #include "qgsmaplayer.h"
 #include "qgsmaptopixel.h"
-#include "qgspoint.h"
+#include "qgspointxy.h"
 #include "qgsproject.h"
 #include "qgsunittypes.h"
 #include "qgssettings.h"
diff --git a/src/app/qgsmapcanvasdockwidget.h b/src/app/qgsmapcanvasdockwidget.h
index eaba859ec99..54337644414 100644
--- a/src/app/qgsmapcanvasdockwidget.h
+++ b/src/app/qgsmapcanvasdockwidget.h
@@ -18,7 +18,7 @@
 #include <ui_qgsmapcanvasdockwidgetbase.h>
 
 #include "qgsdockwidget.h"
-#include "qgspoint.h"
+#include "qgspointxy.h"
 #include "qgis_app.h"
 #include <QWidgetAction>
 #include <QTimer>
diff --git a/src/app/qgsmaptooladdcircularstring.cpp b/src/app/qgsmaptooladdcircularstring.cpp
index ef28bff66d1..d5d9e88356a 100644
--- a/src/app/qgsmaptooladdcircularstring.cpp
+++ b/src/app/qgsmaptooladdcircularstring.cpp
@@ -21,7 +21,7 @@
 #include "qgsgeometryutils.h"
 #include "qgslinestring.h"
 #include "qgsmapcanvas.h"
-#include "qgspointv2.h"
+#include "qgspoint.h"
 #include "qgisapp.h"
 
 QgsMapToolAddCircularString::QgsMapToolAddCircularString( QgsMapToolCapture *parentTool, QgsMapCanvas *canvas, CaptureMode mode )
diff --git a/src/app/qgsmaptoolcircularstringcurvepoint.cpp b/src/app/qgsmaptoolcircularstringcurvepoint.cpp
index d4312d6ee69..ba1124bde8a 100644
--- a/src/app/qgsmaptoolcircularstringcurvepoint.cpp
+++ b/src/app/qgsmaptoolcircularstringcurvepoint.cpp
@@ -17,7 +17,7 @@
 #include "qgscompoundcurve.h"
 #include "qgsgeometryrubberband.h"
 #include "qgsmapcanvas.h"
-#include "qgspointv2.h"
+#include "qgspoint.h"
 #include <QMouseEvent>
 
 QgsMapToolCircularStringCurvePoint::QgsMapToolCircularStringCurvePoint( QgsMapToolCapture *parentTool,
diff --git a/src/app/qgsmaptoolcircularstringradius.cpp b/src/app/qgsmaptoolcircularstringradius.cpp
index 618404e5a3f..3398c755243 100644
--- a/src/app/qgsmaptoolcircularstringradius.cpp
+++ b/src/app/qgsmaptoolcircularstringradius.cpp
@@ -20,7 +20,7 @@
 #include "qgsgeometryutils.h"
 #include "qgsgeometryrubberband.h"
 #include "qgsmapcanvas.h"
-#include "qgspointv2.h"
+#include "qgspoint.h"
 #include "qgsstatusbar.h"
 #include <QDoubleSpinBox>
 #include <QMouseEvent>
diff --git a/src/app/qgsmaptoolcircularstringradius.h b/src/app/qgsmaptoolcircularstringradius.h
index 0073eced80b..aa3fb0462f8 100644
--- a/src/app/qgsmaptoolcircularstringradius.h
+++ b/src/app/qgsmaptoolcircularstringradius.h
@@ -18,7 +18,7 @@
 #define QGSMAPTOOLCIRCULARSTRINGRADIUS_H
 
 #include "qgsmaptooladdcircularstring.h"
-#include "qgspointv2.h"
+#include "qgspoint.h"
 
 class QDoubleSpinBox;
 
diff --git a/src/app/qgsmaptoolmeasureangle.h b/src/app/qgsmaptoolmeasureangle.h
index 6c14294c48e..f431547f23c 100644
--- a/src/app/qgsmaptoolmeasureangle.h
+++ b/src/app/qgsmaptoolmeasureangle.h
@@ -17,7 +17,7 @@
 #define QGSMAPTOOLMEASUREANGLE_H
 
 #include "qgsmaptool.h"
-#include "qgspoint.h"
+#include "qgspointxy.h"
 #include "qgsdistancearea.h"
 #include "qgis_app.h"
 
diff --git a/src/app/qgsmaptoolselect.cpp b/src/app/qgsmaptoolselect.cpp
index 049f14283ff..8cf863b8b32 100644
--- a/src/app/qgsmaptoolselect.cpp
+++ b/src/app/qgsmaptoolselect.cpp
@@ -20,7 +20,7 @@
 #include "qgsmapcanvas.h"
 #include "qgsvectorlayer.h"
 #include "qgsgeometry.h"
-#include "qgspoint.h"
+#include "qgspointxy.h"
 #include "qgis.h"
 
 #include <QMouseEvent>
diff --git a/src/app/qgsmaptoolselectradius.h b/src/app/qgsmaptoolselectradius.h
index 462189beb07..18855df602d 100644
--- a/src/app/qgsmaptoolselectradius.h
+++ b/src/app/qgsmaptoolselectradius.h
@@ -18,7 +18,7 @@ email                : jpalmer at linz dot govt dot nz
 
 
 #include "qgsmaptool.h"
-#include "qgspoint.h"
+#include "qgspointxy.h"
 #include "qgis_app.h"
 
 class QgsMapCanvas;
diff --git a/src/app/qgsmaptoolselectrectangle.cpp b/src/app/qgsmaptoolselectrectangle.cpp
index 42ce690bbe2..31562e72816 100644
--- a/src/app/qgsmaptoolselectrectangle.cpp
+++ b/src/app/qgsmaptoolselectrectangle.cpp
@@ -22,7 +22,7 @@
 #include "qgsvectorlayer.h"
 #include "qgscursors.h"
 #include "qgsgeometry.h"
-#include "qgspoint.h"
+#include "qgspointxy.h"
 #include "qgis.h"
 
 #include <QMouseEvent>
diff --git a/src/app/qgsmeasuredialog.h b/src/app/qgsmeasuredialog.h
index ffb3e35a37e..7215e5636ef 100644
--- a/src/app/qgsmeasuredialog.h
+++ b/src/app/qgsmeasuredialog.h
@@ -19,7 +19,7 @@
 
 #include "ui_qgsmeasurebase.h"
 
-#include "qgspoint.h"
+#include "qgspointxy.h"
 #include "qgsdistancearea.h"
 #include "qgshelp.h"
 #include "qgis_app.h"
diff --git a/src/core/CMakeLists.txt b/src/core/CMakeLists.txt
index b22ae2fa899..85ea71ef2a5 100755
--- a/src/core/CMakeLists.txt
+++ b/src/core/CMakeLists.txt
@@ -224,7 +224,7 @@ SET(QGIS_CORE_SRCS
   qgspathresolver.cpp
   qgspluginlayer.cpp
   qgspluginlayerregistry.cpp
-  qgspoint.cpp
+  qgspointxy.cpp
   qgspointlocator.cpp
   qgsproject.cpp
   qgsprojectbadlayerhandler.cpp
@@ -413,7 +413,7 @@ SET(QGIS_CORE_SRCS
   geometry/qgsmultipoint.cpp
   geometry/qgsmultipolygon.cpp
   geometry/qgsmultisurface.cpp
-  geometry/qgspointv2.cpp
+  geometry/qgspoint.cpp
   geometry/qgspolygon.cpp
   geometry/qgsrectangle.cpp
   geometry/qgsregularpolygon.cpp
@@ -559,7 +559,7 @@ SET(QGIS_CORE_MOC_HDRS
   qgsofflineediting.h
   qgsowsconnection.h
   qgspluginlayer.h
-  qgspoint.h
+  qgspointxy.h
   qgspointlocator.h
   qgsproject.h
   qgsrelationmanager.h
@@ -641,7 +641,7 @@ SET(QGIS_CORE_MOC_HDRS
   raster/qgsrasterlayer.h
   raster/qgsrasterdataprovider.h
 
-  geometry/qgspointv2.h
+  geometry/qgspoint.h
 
   gps/qgsgpsconnection.h
   gps/qgsgpsdetector.h
diff --git a/src/core/annotations/qgsannotation.h b/src/core/annotations/qgsannotation.h
index 78cfa135e20..5e2c5e702d0 100644
--- a/src/core/annotations/qgsannotation.h
+++ b/src/core/annotations/qgsannotation.h
@@ -20,7 +20,7 @@
 
 #include "qgis_core.h"
 #include "qgis.h"
-#include "qgspoint.h"
+#include "qgspointxy.h"
 #include "qgscoordinatereferencesystem.h"
 #include "qgsrendercontext.h"
 #include "qgssymbol.h"
diff --git a/src/core/dxf/qgsdxfexport.cpp b/src/core/dxf/qgsdxfexport.cpp
index 57f129a019a..a3503e2590b 100644
--- a/src/core/dxf/qgsdxfexport.cpp
+++ b/src/core/dxf/qgsdxfexport.cpp
@@ -29,7 +29,7 @@
 #include "qgsdxfexport.h"
 #include "qgsdxfpallabeling.h"
 #include "qgsvectordataprovider.h"
-#include "qgspoint.h"
+#include "qgspointxy.h"
 #include "qgsproject.h"
 #include "qgsrenderer.h"
 #include "qgssymbollayer.h"
@@ -44,7 +44,7 @@
 #include "qgsmaplayerstylemanager.h"
 
 #include "qgswkbtypes.h"
-#include "qgspointv2.h"
+#include "qgspoint.h"
 #include "qgsgeos.h"
 
 #include "pal/feature.h"
diff --git a/src/core/dxf/qgsdxfpaintengine.h b/src/core/dxf/qgsdxfpaintengine.h
index 71444863540..eb1e56b6c6f 100644
--- a/src/core/dxf/qgsdxfpaintengine.h
+++ b/src/core/dxf/qgsdxfpaintengine.h
@@ -21,7 +21,7 @@
 #include "qgis_core.h"
 #include <QPaintEngine>
 #include "qgsabstractgeometry.h"
-#include "qgspointv2.h"
+#include "qgspoint.h"
 
 class QgsDxfExport;
 class QgsDxfPaintDevice;
diff --git a/src/core/geometry/qgsabstractgeometry.cpp b/src/core/geometry/qgsabstractgeometry.cpp
index b768a52455f..81d8d4b2f16 100644
--- a/src/core/geometry/qgsabstractgeometry.cpp
+++ b/src/core/geometry/qgsabstractgeometry.cpp
@@ -18,7 +18,7 @@ email                : marco.hugentobler at sourcepole dot com
 #include "qgswkbptr.h"
 #include "qgsgeos.h"
 #include "qgsmaptopixel.h"
-#include "qgspointv2.h"
+#include "qgspoint.h"
 
 #include <limits>
 #include <QTransform>
diff --git a/src/core/geometry/qgsbox3d.h b/src/core/geometry/qgsbox3d.h
index 8cbf6dfffeb..2917fefdfcf 100644
--- a/src/core/geometry/qgsbox3d.h
+++ b/src/core/geometry/qgsbox3d.h
@@ -20,7 +20,7 @@
 
 #include "qgis_core.h"
 #include "qgsrectangle.h"
-#include "qgspointv2.h"
+#include "qgspoint.h"
 
 /** \ingroup core
  * A 3-dimensional box composed of x, y, z coordinates.
diff --git a/src/core/geometry/qgscircle.h b/src/core/geometry/qgscircle.h
index 1f8ec2dadef..d3af47e2fcd 100644
--- a/src/core/geometry/qgscircle.h
+++ b/src/core/geometry/qgscircle.h
@@ -22,7 +22,7 @@
 
 #include "qgis_core.h"
 #include "qgsellipse.h"
-#include "qgspointv2.h"
+#include "qgspoint.h"
 #include "qgspolygon.h"
 #include "qgsrectangle.h"
 #include "qgscircularstring.h"
diff --git a/src/core/geometry/qgscircularstring.cpp b/src/core/geometry/qgscircularstring.cpp
index 1a5a866e3aa..d12ede393b9 100644
--- a/src/core/geometry/qgscircularstring.cpp
+++ b/src/core/geometry/qgscircularstring.cpp
@@ -21,7 +21,7 @@
 #include "qgsgeometryutils.h"
 #include "qgslinestring.h"
 #include "qgsmaptopixel.h"
-#include "qgspointv2.h"
+#include "qgspoint.h"
 #include "qgswkbptr.h"
 #include <QPainter>
 #include <QPainterPath>
diff --git a/src/core/geometry/qgscurve.cpp b/src/core/geometry/qgscurve.cpp
index d436311cffc..62c417cddbc 100644
--- a/src/core/geometry/qgscurve.cpp
+++ b/src/core/geometry/qgscurve.cpp
@@ -17,7 +17,7 @@
 
 #include "qgscurve.h"
 #include "qgslinestring.h"
-#include "qgspointv2.h"
+#include "qgspoint.h"
 #include "qgsmultipoint.h"
 
 QgsCurve::QgsCurve(): QgsAbstractGeometry()
diff --git a/src/core/geometry/qgsellipse.h b/src/core/geometry/qgsellipse.h
index c80d5d11750..b0cbfd75cd7 100644
--- a/src/core/geometry/qgsellipse.h
+++ b/src/core/geometry/qgsellipse.h
@@ -21,7 +21,7 @@
 #include <QString>
 
 #include "qgis_core.h"
-#include "qgspointv2.h"
+#include "qgspoint.h"
 #include "qgspolygon.h"
 #include "qgslinestring.h"
 #include "qgsrectangle.h"
diff --git a/src/core/geometry/qgsgeometry.cpp b/src/core/geometry/qgsgeometry.cpp
index 14fdbc69980..81c7d24319c 100644
--- a/src/core/geometry/qgsgeometry.cpp
+++ b/src/core/geometry/qgsgeometry.cpp
@@ -30,7 +30,7 @@ email                : morb at ozemail dot com dot au
 #include "qgslogger.h"
 #include "qgsmaptopixel.h"
 #include "qgsmessagelog.h"
-#include "qgspoint.h"
+#include "qgspointxy.h"
 #include "qgsrectangle.h"
 
 #include "qgsvectorlayer.h"
@@ -41,7 +41,7 @@ email                : morb at ozemail dot com dot au
 #include "qgsmultipoint.h"
 #include "qgsmultipolygon.h"
 #include "qgsmultisurface.h"
-#include "qgspointv2.h"
+#include "qgspoint.h"
 #include "qgspolygon.h"
 #include "qgslinestring.h"
 
diff --git a/src/core/geometry/qgsgeometry.h b/src/core/geometry/qgsgeometry.h
index 5a55823e9d8..9aa21baeb1f 100644
--- a/src/core/geometry/qgsgeometry.h
+++ b/src/core/geometry/qgsgeometry.h
@@ -36,8 +36,8 @@ email                : morb at ozemail dot com dot au
 
 #include "qgsabstractgeometry.h"
 #include "qgsfeature.h"
+#include "qgspointxy.h"
 #include "qgspoint.h"
-#include "qgspointv2.h"
 
 
 class QgsGeometryEngine;
diff --git a/src/core/geometry/qgsgeometrycollection.cpp b/src/core/geometry/qgsgeometrycollection.cpp
index 6b76cf1aa8b..0cbd120f0fb 100644
--- a/src/core/geometry/qgsgeometrycollection.cpp
+++ b/src/core/geometry/qgsgeometrycollection.cpp
@@ -21,7 +21,7 @@ email                : marco.hugentobler at sourcepole dot com
 #include "qgscompoundcurve.h"
 #include "qgslinestring.h"
 #include "qgsmultilinestring.h"
-#include "qgspointv2.h"
+#include "qgspoint.h"
 #include "qgsmultipoint.h"
 #include "qgspolygon.h"
 #include "qgsmultipolygon.h"
diff --git a/src/core/geometry/qgsgeometrycollection.h b/src/core/geometry/qgsgeometrycollection.h
index 0f709b9bb56..8d969ad9951 100644
--- a/src/core/geometry/qgsgeometrycollection.h
+++ b/src/core/geometry/qgsgeometrycollection.h
@@ -22,7 +22,7 @@ email                : marco.hugentobler at sourcepole dot com
 #include "qgis_core.h"
 #include "qgis.h"
 #include "qgsabstractgeometry.h"
-#include "qgspointv2.h"
+#include "qgspoint.h"
 
 
 /** \ingroup core
diff --git a/src/core/geometry/qgsgeometryfactory.cpp b/src/core/geometry/qgsgeometryfactory.cpp
index 0ed58f923fe..674d47e825e 100644
--- a/src/core/geometry/qgsgeometryfactory.cpp
+++ b/src/core/geometry/qgsgeometryfactory.cpp
@@ -19,7 +19,7 @@
 #include "qgscircularstring.h"
 #include "qgscompoundcurve.h"
 #include "qgscurvepolygon.h"
-#include "qgspointv2.h"
+#include "qgspoint.h"
 #include "qgspolygon.h"
 #include "qgslinestring.h"
 #include "qgsmulticurve.h"
diff --git a/src/core/geometry/qgsgeometryfactory.h b/src/core/geometry/qgsgeometryfactory.h
index 33783d38ac5..b8008cb943d 100644
--- a/src/core/geometry/qgsgeometryfactory.h
+++ b/src/core/geometry/qgsgeometryfactory.h
@@ -27,7 +27,7 @@ class QgsConstWkbPtr;
 class QgsRectangle;
 
 //compatibility with old classes
-#include "qgspoint.h"
+#include "qgspointxy.h"
 typedef QVector<QgsPointXY> QgsPolyline;
 typedef QVector<QgsPolyline> QgsPolygon;
 typedef QVector<QgsPointXY> QgsMultiPoint;
diff --git a/src/core/geometry/qgsgeometryutils.h b/src/core/geometry/qgsgeometryutils.h
index 90bfba5a716..b4b28376afe 100644
--- a/src/core/geometry/qgsgeometryutils.h
+++ b/src/core/geometry/qgsgeometryutils.h
@@ -20,7 +20,7 @@ email                : marco.hugentobler at sourcepole dot com
 
 #include "qgis_core.h"
 #include "qgis.h"
-#include "qgspointv2.h"
+#include "qgspoint.h"
 
 
 class QgsLineString;
diff --git a/src/core/geometry/qgsmultipoint.cpp b/src/core/geometry/qgsmultipoint.cpp
index fad3f67bd96..0e82d63e6d5 100644
--- a/src/core/geometry/qgsmultipoint.cpp
+++ b/src/core/geometry/qgsmultipoint.cpp
@@ -16,7 +16,7 @@ email                : marco.hugentobler at sourcepole dot com
 #include "qgsmultipoint.h"
 #include "qgsapplication.h"
 #include "qgsgeometryutils.h"
-#include "qgspointv2.h"
+#include "qgspoint.h"
 #include "qgswkbptr.h"
 
 QgsMultiPointV2::QgsMultiPointV2()
diff --git a/src/core/geometry/qgspointv2.cpp b/src/core/geometry/qgspoint.cpp
similarity index 99%
rename from src/core/geometry/qgspointv2.cpp
rename to src/core/geometry/qgspoint.cpp
index fe8a1011cbb..bd37e4b3c14 100644
--- a/src/core/geometry/qgspointv2.cpp
+++ b/src/core/geometry/qgspoint.cpp
@@ -16,7 +16,7 @@
  ***************************************************************************/
 
 
-#include "qgspointv2.h"
+#include "qgspoint.h"
 #include "qgsapplication.h"
 #include "qgscoordinatetransform.h"
 #include "qgsgeometryutils.h"
diff --git a/src/core/geometry/qgspointv2.h b/src/core/geometry/qgspoint.h
similarity index 100%
rename from src/core/geometry/qgspointv2.h
rename to src/core/geometry/qgspoint.h
diff --git a/src/core/geometry/qgsrectangle.cpp b/src/core/geometry/qgsrectangle.cpp
index ad439f1c28d..595734abfa9 100644
--- a/src/core/geometry/qgsrectangle.cpp
+++ b/src/core/geometry/qgsrectangle.cpp
@@ -25,7 +25,7 @@
 #include <QRegExp>
 #include <qnumeric.h>
 
-#include "qgspoint.h"
+#include "qgspointxy.h"
 #include "qgsrectangle.h"
 #include "qgslogger.h"
 #include "qgsbox3d.h"
diff --git a/src/core/geometry/qgsrectangle.h b/src/core/geometry/qgsrectangle.h
index b35ed582555..28fcbc05084 100644
--- a/src/core/geometry/qgsrectangle.h
+++ b/src/core/geometry/qgsrectangle.h
@@ -25,7 +25,7 @@
 class QString;
 class QRectF;
 class QgsBox3d;
-#include "qgspoint.h"
+#include "qgspointxy.h"
 
 
 /** \ingroup core
diff --git a/src/core/geometry/qgsregularpolygon.h b/src/core/geometry/qgsregularpolygon.h
index a6185d842bc..f65b3bf36d9 100644
--- a/src/core/geometry/qgsregularpolygon.h
+++ b/src/core/geometry/qgsregularpolygon.h
@@ -21,7 +21,7 @@
 #include <QString>
 
 #include "qgis_core.h"
-#include "qgspointv2.h"
+#include "qgspoint.h"
 #include "qgspolygon.h"
 #include "qgslinestring.h"
 #include "qgscircle.h"
diff --git a/src/core/qgsbearingutils.cpp b/src/core/qgsbearingutils.cpp
index 21302d47760..a550d8b1836 100644
--- a/src/core/qgsbearingutils.cpp
+++ b/src/core/qgsbearingutils.cpp
@@ -17,7 +17,7 @@
 
 #include "qgsbearingutils.h"
 #include "qgscoordinatereferencesystem.h"
-#include "qgspoint.h"
+#include "qgspointxy.h"
 #include "qgscoordinatetransform.h"
 #include "qgsexception.h"
 
diff --git a/src/core/qgsclipper.h b/src/core/qgsclipper.h
index 679f9c304c5..433324b137a 100644
--- a/src/core/qgsclipper.h
+++ b/src/core/qgsclipper.h
@@ -21,7 +21,7 @@
 
 #include "qgis_core.h"
 #include "qgis.h"
-#include "qgspoint.h"
+#include "qgspointxy.h"
 #include "qgsrectangle.h"
 
 #include <QVector>
diff --git a/src/core/qgscoordinatetransform.cpp b/src/core/qgscoordinatetransform.cpp
index 4880f71e3f7..c70e22cf733 100644
--- a/src/core/qgscoordinatetransform.cpp
+++ b/src/core/qgscoordinatetransform.cpp
@@ -19,7 +19,7 @@
 #include "qgsapplication.h"
 #include "qgsmessagelog.h"
 #include "qgslogger.h"
-#include "qgspoint.h"
+#include "qgspointxy.h"
 #include "qgsrectangle.h"
 #include "qgscsexception.h"
 
diff --git a/src/core/qgsdistancearea.cpp b/src/core/qgsdistancearea.cpp
index 167d0126a05..4fbe80ca005 100644
--- a/src/core/qgsdistancearea.cpp
+++ b/src/core/qgsdistancearea.cpp
@@ -19,7 +19,7 @@
 
 #include "qgsdistancearea.h"
 #include "qgis.h"
-#include "qgspoint.h"
+#include "qgspointxy.h"
 #include "qgscoordinatetransform.h"
 #include "qgscoordinatereferencesystem.h"
 #include "qgsgeometry.h"
diff --git a/src/core/qgsmaptopixel.cpp b/src/core/qgsmaptopixel.cpp
index 7b428a373bc..ab1df920b13 100644
--- a/src/core/qgsmaptopixel.cpp
+++ b/src/core/qgsmaptopixel.cpp
@@ -22,7 +22,7 @@
 #include <QTransform>
 
 #include "qgslogger.h"
-#include "qgspoint.h"
+#include "qgspointxy.h"
 
 
 QgsMapToPixel::QgsMapToPixel( double mapUnitsPerPixel,
diff --git a/src/core/qgspallabeling.h b/src/core/qgspallabeling.h
index d921c00ffba..c86c536f44f 100644
--- a/src/core/qgspallabeling.h
+++ b/src/core/qgspallabeling.h
@@ -37,7 +37,7 @@
 #include "qgsgeometry.h"
 #include "qgsfields.h"
 #include "qgslabelingenginesettings.h"
-#include "qgspoint.h"
+#include "qgspointxy.h"
 #include "qgsmapunitscale.h"
 #include "qgsstringutils.h"
 #include "qgstextrenderer.h"
diff --git a/src/core/qgspointlocator.h b/src/core/qgspointlocator.h
index e5b59f78996..33e1a62bc6f 100644
--- a/src/core/qgspointlocator.h
+++ b/src/core/qgspointlocator.h
@@ -21,7 +21,7 @@ class QgsVectorLayer;
 
 #include "qgis_core.h"
 #include "qgsfeature.h"
-#include "qgspoint.h"
+#include "qgspointxy.h"
 #include "qgscoordinatereferencesystem.h"
 #include "qgscoordinatetransform.h"
 
diff --git a/src/core/qgspoint.cpp b/src/core/qgspointxy.cpp
similarity index 99%
rename from src/core/qgspoint.cpp
rename to src/core/qgspointxy.cpp
index 8d6200ffb8f..591ca02ee51 100644
--- a/src/core/qgspoint.cpp
+++ b/src/core/qgspointxy.cpp
@@ -16,8 +16,8 @@
  ***************************************************************************/
 
 
+#include "qgspointxy.h"
 #include "qgspoint.h"
-#include "qgspointv2.h"
 
 #include <cmath>
 #include <QTextStream>
diff --git a/src/core/qgspoint.h b/src/core/qgspointxy.h
similarity index 97%
rename from src/core/qgspoint.h
rename to src/core/qgspointxy.h
index 7b63e26ee31..c3651d5d10c 100644
--- a/src/core/qgspoint.h
+++ b/src/core/qgspointxy.h
@@ -31,8 +31,13 @@
 class QgsPoint;
 
 /** \ingroup core
- * A class to represent a point.
- * For Z and M support prefer QgsPointV2.
+ * A class to represent a 2D point.
+ *
+ * A QgsPointXY represents a position with X and Y coordinates.
+ * In most scenarios it is preferable to use a QgsPoint instead which also
+ * supports Z and M values.
+ *
+ * \since QGIS 3.0
  */
 class CORE_EXPORT QgsPointXY
 {
diff --git a/src/core/qgspropertytransformer.h b/src/core/qgspropertytransformer.h
index cb299370401..ede8b8d511c 100644
--- a/src/core/qgspropertytransformer.h
+++ b/src/core/qgspropertytransformer.h
@@ -18,7 +18,7 @@
 #include "qgis_core.h"
 #include "qgsexpression.h"
 #include "qgsexpressioncontext.h"
-#include "qgspoint.h"
+#include "qgspointxy.h"
 #include <QVariant>
 #include <QHash>
 #include <QString>
diff --git a/src/core/qgsvectorlayer.cpp b/src/core/qgsvectorlayer.cpp
index 911925557ce..3e8eca61a3e 100644
--- a/src/core/qgsvectorlayer.cpp
+++ b/src/core/qgsvectorlayer.cpp
@@ -57,7 +57,7 @@
 #include "qgsmessagelog.h"
 #include "qgsogcutils.h"
 #include "qgspainting.h"
-#include "qgspoint.h"
+#include "qgspointxy.h"
 #include "qgsproject.h"
 #include "qgsproviderregistry.h"
 #include "qgsrectangle.h"
@@ -73,7 +73,7 @@
 #include "qgsvectorlayerrenderer.h"
 #include "qgsvectorlayerundocommand.h"
 #include "qgsvectorlayerfeaturecounter.h"
-#include "qgspointv2.h"
+#include "qgspoint.h"
 #include "qgsrenderer.h"
 #include "qgssymbollayer.h"
 #include "qgssinglesymbolrenderer.h"
diff --git a/src/core/qgsvectorlayereditutils.cpp b/src/core/qgsvectorlayereditutils.cpp
index c6409ad243b..2d6efc06f1f 100644
--- a/src/core/qgsvectorlayereditutils.cpp
+++ b/src/core/qgsvectorlayereditutils.cpp
@@ -19,7 +19,7 @@
 #include "qgsvectorlayereditbuffer.h"
 #include "qgslinestring.h"
 #include "qgslogger.h"
-#include "qgspointv2.h"
+#include "qgspoint.h"
 #include "qgsgeometryfactory.h"
 #include "qgis.h"
 #include "qgswkbtypes.h"
diff --git a/src/core/raster/qgsrasterviewport.h b/src/core/raster/qgsrasterviewport.h
index 04675f1f1bc..4b0092875d7 100644
--- a/src/core/raster/qgsrasterviewport.h
+++ b/src/core/raster/qgsrasterviewport.h
@@ -17,7 +17,7 @@
 #ifndef QGSRASTERVIEWPORT_H
 #define QGSRASTERVIEWPORT_H
 
-#include "qgspoint.h"
+#include "qgspointxy.h"
 #include "qgscoordinatereferencesystem.h"
 #include "qgsrectangle.h"
 
diff --git a/src/core/simplify/effectivearea.h b/src/core/simplify/effectivearea.h
index b18fcb28ecc..e1dae4ea029 100644
--- a/src/core/simplify/effectivearea.h
+++ b/src/core/simplify/effectivearea.h
@@ -24,7 +24,7 @@
 
 #include "qgsabstractgeometry.h"
 #include "qgscurve.h"
-#include "qgspointv2.h"
+#include "qgspoint.h"
 
 #ifndef _EFFECTIVEAREA_H
 #define _EFFECTIVEAREA_H 1
diff --git a/src/core/symbology-ng/qgsrenderer.cpp b/src/core/symbology-ng/qgsrenderer.cpp
index 7348ea9b74d..791eea6f06b 100644
--- a/src/core/symbology-ng/qgsrenderer.cpp
+++ b/src/core/symbology-ng/qgsrenderer.cpp
@@ -33,7 +33,7 @@
 #include "qgseffectstack.h"
 #include "qgspainteffectregistry.h"
 #include "qgswkbptr.h"
-#include "qgspointv2.h"
+#include "qgspoint.h"
 #include "qgsproperty.h"
 
 #include <QDomElement>
diff --git a/src/core/symbology-ng/qgssymbol.h b/src/core/symbology-ng/qgssymbol.h
index cbefa4dab53..dd13248742f 100644
--- a/src/core/symbology-ng/qgssymbol.h
+++ b/src/core/symbology-ng/qgssymbol.h
@@ -21,7 +21,7 @@
 #include <QList>
 #include <QMap>
 #include "qgsmapunitscale.h"
-#include "qgspointv2.h"
+#include "qgspoint.h"
 #include "qgsfeature.h"
 #include "qgsfields.h"
 #include "qgsrendercontext.h"
diff --git a/src/gui/qgsadvanceddigitizingdockwidget.cpp b/src/gui/qgsadvanceddigitizingdockwidget.cpp
index fd3c813e566..b00a24c6ba1 100644
--- a/src/gui/qgsadvanceddigitizingdockwidget.cpp
+++ b/src/gui/qgsadvanceddigitizingdockwidget.cpp
@@ -26,7 +26,7 @@
 #include "qgsmaptoolcapture.h"
 #include "qgsmaptooladvanceddigitizing.h"
 #include "qgsmessagebaritem.h"
-#include "qgspoint.h"
+#include "qgspointxy.h"
 #include "qgslinestring.h"
 #include "qgsfocuswatcher.h"
 #include "qgssettings.h"
diff --git a/src/gui/qgsgeometryrubberband.cpp b/src/gui/qgsgeometryrubberband.cpp
index 68edfa71c9f..48220f621f7 100644
--- a/src/gui/qgsgeometryrubberband.cpp
+++ b/src/gui/qgsgeometryrubberband.cpp
@@ -18,7 +18,7 @@
 #include "qgsgeometryrubberband.h"
 #include "qgsabstractgeometry.h"
 #include "qgsmapcanvas.h"
-#include "qgspointv2.h"
+#include "qgspoint.h"
 #include <QPainter>
 
 QgsGeometryRubberBand::QgsGeometryRubberBand( QgsMapCanvas *mapCanvas, QgsWkbTypes::GeometryType geomType ): QgsMapCanvasItem( mapCanvas ),
diff --git a/src/gui/qgsmapmouseevent.h b/src/gui/qgsmapmouseevent.h
index 2c2b653be14..0e4b9a0071a 100644
--- a/src/gui/qgsmapmouseevent.h
+++ b/src/gui/qgsmapmouseevent.h
@@ -18,7 +18,7 @@
 
 #include <QMouseEvent>
 
-#include "qgspoint.h"
+#include "qgspointxy.h"
 #include "qgspointlocator.h"
 #include "qgis_gui.h"
 
diff --git a/src/gui/qgsmaptool.h b/src/gui/qgsmaptool.h
index d8777134a71..1e9f6aa6cd5 100644
--- a/src/gui/qgsmaptool.h
+++ b/src/gui/qgsmaptool.h
@@ -19,7 +19,7 @@
 #include "qgsconfig.h"
 #include "qgis.h"
 #include "qgsmessagebar.h"
-#include "qgspointv2.h"
+#include "qgspoint.h"
 #include "qgsmapmouseevent.h"
 
 #include <QCursor>
diff --git a/src/gui/qgsmaptoolidentify.h b/src/gui/qgsmaptoolidentify.h
index 1de6d549f8f..655743219b3 100644
--- a/src/gui/qgsmaptoolidentify.h
+++ b/src/gui/qgsmaptoolidentify.h
@@ -19,7 +19,7 @@
 #include "qgsfeature.h"
 #include "qgsfields.h"
 #include "qgsmaptool.h"
-#include "qgspoint.h"
+#include "qgspointxy.h"
 #include "qgsunittypes.h"
 
 #include <QObject>
diff --git a/src/gui/qgsvertexmarker.h b/src/gui/qgsvertexmarker.h
index b5b263a1d22..14be90294ac 100644
--- a/src/gui/qgsvertexmarker.h
+++ b/src/gui/qgsvertexmarker.h
@@ -17,7 +17,7 @@
 #define QGSVERTEXMARKER_H
 
 #include "qgsmapcanvasitem.h"
-#include "qgspoint.h"
+#include "qgspointxy.h"
 #include "qgis_gui.h"
 
 class QPainter;
diff --git a/src/plugins/coordinate_capture/coordinatecapturemaptool.h b/src/plugins/coordinate_capture/coordinatecapturemaptool.h
index 3da28248540..c768912337b 100644
--- a/src/plugins/coordinate_capture/coordinatecapturemaptool.h
+++ b/src/plugins/coordinate_capture/coordinatecapturemaptool.h
@@ -17,7 +17,7 @@
 #define COORDINATECAPTUREMAPTOOL_H
 
 #include "qgsmaptool.h"
-#include "qgspoint.h"
+#include "qgspointxy.h"
 
 #include <QObject>
 #include <QPointer>
diff --git a/src/plugins/evis/eventbrowser/evisgenericeventbrowsergui.cpp b/src/plugins/evis/eventbrowser/evisgenericeventbrowsergui.cpp
index 771722dcae4..b5a0bdba4c2 100644
--- a/src/plugins/evis/eventbrowser/evisgenericeventbrowsergui.cpp
+++ b/src/plugins/evis/eventbrowser/evisgenericeventbrowsergui.cpp
@@ -32,7 +32,7 @@
 #include "qgsmapcanvas.h"
 #include "qgsgeometry.h"
 #include "qgslogger.h"
-#include "qgspoint.h"
+#include "qgspointxy.h"
 #include "qgsfields.h"
 #include "qgsrectangle.h"
 
diff --git a/src/plugins/evis/idtool/eviseventidtool.h b/src/plugins/evis/idtool/eviseventidtool.h
index 69dba547e6a..b48974e6617 100644
--- a/src/plugins/evis/idtool/eviseventidtool.h
+++ b/src/plugins/evis/idtool/eviseventidtool.h
@@ -33,7 +33,7 @@
 #include "qgsmaplayer.h"
 #include "qgsmaptool.h"
 #include "qgsmapcanvas.h"
-#include "qgspoint.h"
+#include "qgspointxy.h"
 
 #include "evisgenericeventbrowsergui.h"
 
diff --git a/src/plugins/geometry_checker/utils/qgsgeometrycheckerutils.h b/src/plugins/geometry_checker/utils/qgsgeometrycheckerutils.h
index a313763261d..80249450ff0 100644
--- a/src/plugins/geometry_checker/utils/qgsgeometrycheckerutils.h
+++ b/src/plugins/geometry_checker/utils/qgsgeometrycheckerutils.h
@@ -18,7 +18,7 @@
 #define QGS_GEOMETRYCHECKERUTILS_H
 
 #include "geometry/qgsabstractgeometry.h"
-#include "geometry/qgspointv2.h"
+#include "geometry/qgspoint.h"
 #include <qmath.h>
 
 class QgsGeometryEngine;
diff --git a/src/plugins/georeferencer/qgsgcplist.cpp b/src/plugins/georeferencer/qgsgcplist.cpp
index 8ea0aa19fa9..f3f3ea28a3e 100644
--- a/src/plugins/georeferencer/qgsgcplist.cpp
+++ b/src/plugins/georeferencer/qgsgcplist.cpp
@@ -13,7 +13,7 @@
  *                                                                         *
  ***************************************************************************/
 
-#include "qgspoint.h"
+#include "qgspointxy.h"
 #include "qgsgeorefdatapoint.h"
 
 #include "qgsgcplist.h"
diff --git a/src/plugins/georeferencer/qgsimagewarper.h b/src/plugins/georeferencer/qgsimagewarper.h
index 8bf85b56723..0d6aa11cc28 100644
--- a/src/plugins/georeferencer/qgsimagewarper.h
+++ b/src/plugins/georeferencer/qgsimagewarper.h
@@ -20,7 +20,7 @@
 
 #include <gdalwarper.h>
 #include <vector>
-#include "qgspoint.h"
+#include "qgspointxy.h"
 #include "qgscoordinatereferencesystem.h"
 
 class QgsGeorefTransform;
diff --git a/src/plugins/georeferencer/qgsleastsquares.h b/src/plugins/georeferencer/qgsleastsquares.h
index 02f82c43cf8..f78d4166e06 100644
--- a/src/plugins/georeferencer/qgsleastsquares.h
+++ b/src/plugins/georeferencer/qgsleastsquares.h
@@ -19,7 +19,7 @@
 #include <cstdarg>
 #include <stdexcept>
 
-#include "qgspoint.h"
+#include "qgspointxy.h"
 
 
 class QgsLeastSquares
diff --git a/src/plugins/georeferencer/qgsmapcoordsdialog.h b/src/plugins/georeferencer/qgsmapcoordsdialog.h
index f7713a64e1f..82a805f3ca4 100644
--- a/src/plugins/georeferencer/qgsmapcoordsdialog.h
+++ b/src/plugins/georeferencer/qgsmapcoordsdialog.h
@@ -17,7 +17,7 @@
 
 #include "qgsmaptoolemitpoint.h"
 #include "qgssnappingutils.h"
-#include "qgspoint.h"
+#include "qgspointxy.h"
 #include "qgsvertexmarker.h"
 #include "qgsmapcanvas.h"
 
diff --git a/src/plugins/georeferencer/qgsrasterchangecoords.h b/src/plugins/georeferencer/qgsrasterchangecoords.h
index 05cac823d05..ff5f48e51a7 100644
--- a/src/plugins/georeferencer/qgsrasterchangecoords.h
+++ b/src/plugins/georeferencer/qgsrasterchangecoords.h
@@ -18,7 +18,7 @@
 
 #include <QVector>
 
-#include "qgspoint.h"
+#include "qgspointxy.h"
 #include "qgsrectangle.h"
 
 class QgsRasterChangeCoords
diff --git a/src/plugins/grass/qgsgrassregion.h b/src/plugins/grass/qgsgrassregion.h
index 9105014f6fa..cd4ea2fcb99 100644
--- a/src/plugins/grass/qgsgrassregion.h
+++ b/src/plugins/grass/qgsgrassregion.h
@@ -21,7 +21,7 @@
 #include "qgscoordinatetransform.h"
 #include "qgsmaptool.h"
 #include "qgsrubberband.h"
-#include "qgspoint.h"
+#include "qgspointxy.h"
 
 class QgsGrassPlugin;
 class QgsGrassRegionEdit;
diff --git a/src/providers/arcgisrest/qgsarcgisrestutils.cpp b/src/providers/arcgisrest/qgsarcgisrestutils.cpp
index f8caaba59a0..3bbe9e850dc 100644
--- a/src/providers/arcgisrest/qgsarcgisrestutils.cpp
+++ b/src/providers/arcgisrest/qgsarcgisrestutils.cpp
@@ -26,7 +26,7 @@
 #include "geometry/qgsmultipoint.h"
 #include "geometry/qgsmulticurve.h"
 #include "geometry/qgspolygon.h"
-#include "geometry/qgspointv2.h"
+#include "geometry/qgspoint.h"
 
 #include <QEventLoop>
 #include <QNetworkRequest>
diff --git a/src/providers/gdal/qgsgdalprovider.cpp b/src/providers/gdal/qgsgdalprovider.cpp
index 37651876040..2bd50ce4983 100644
--- a/src/providers/gdal/qgsgdalprovider.cpp
+++ b/src/providers/gdal/qgsgdalprovider.cpp
@@ -32,7 +32,7 @@
 #include "qgsrasteridentifyresult.h"
 #include "qgsrasterlayer.h"
 #include "qgsrasterpyramid.h"
-#include "qgspoint.h"
+#include "qgspointxy.h"
 #include "qgssettings.h"
 
 #include <QImage>
diff --git a/src/providers/grass/qgsgrassprovider.cpp b/src/providers/grass/qgsgrassprovider.cpp
index e33afcbf8c1..85c4d114711 100644
--- a/src/providers/grass/qgsgrassprovider.cpp
+++ b/src/providers/grass/qgsgrassprovider.cpp
@@ -26,7 +26,7 @@
 #include "qgsfeature.h"
 #include "qgsfields.h"
 #include "qgslinestring.h"
-#include "qgspointv2.h"
+#include "qgspoint.h"
 #include "qgspolygon.h"
 #include "qgsrectangle.h"
 #include "qgsvectorlayer.h"
diff --git a/src/providers/grass/qgsgrassvectormap.cpp b/src/providers/grass/qgsgrassvectormap.cpp
index b1e401c3bcc..f2fa421f382 100644
--- a/src/providers/grass/qgsgrassvectormap.cpp
+++ b/src/providers/grass/qgsgrassvectormap.cpp
@@ -19,7 +19,7 @@
 
 #include "qgslinestring.h"
 #include "qgspolygon.h"
-#include "qgspointv2.h"
+#include "qgspoint.h"
 
 #include "qgslogger.h"
 #include "qgsgeometry.h"
diff --git a/tests/src/app/testqgisappclipboard.cpp b/tests/src/app/testqgisappclipboard.cpp
index e4b8c293e06..45074477b01 100644
--- a/tests/src/app/testqgisappclipboard.cpp
+++ b/tests/src/app/testqgisappclipboard.cpp
@@ -28,7 +28,7 @@
 #include "qgsclipboard.h"
 #include "qgsvectorlayer.h"
 #include "qgsgeometry.h"
-#include "qgspointv2.h"
+#include "qgspoint.h"
 #include "qgssettings.h"
 
 /** \ingroup UnitTests
diff --git a/tests/src/core/testqgsconnectionpool.cpp b/tests/src/core/testqgsconnectionpool.cpp
index 1f826e87b1c..1cec9eaab38 100644
--- a/tests/src/core/testqgsconnectionpool.cpp
+++ b/tests/src/core/testqgsconnectionpool.cpp
@@ -17,7 +17,7 @@
 #include "qgsapplication.h"
 #include "qgsfeatureiterator.h"
 #include "qgsgeometry.h"
-#include "qgspointv2.h"
+#include "qgspoint.h"
 #include "qgslinestring.h"
 #include "qgsvectorlayer.h"
 #include <QEventLoop>
diff --git a/tests/src/core/testqgsgeometry.cpp b/tests/src/core/testqgsgeometry.cpp
index 69ad6c54f2c..d4ec73606b5 100644
--- a/tests/src/core/testqgsgeometry.cpp
+++ b/tests/src/core/testqgsgeometry.cpp
@@ -31,7 +31,7 @@
 #include <qgsgeometry.h>
 #include "qgsgeometryutils.h"
 #include <qgspoint.h>
-#include "qgspointv2.h"
+#include "qgspoint.h"
 #include "qgslinestring.h"
 #include "qgspolygon.h"
 #include "qgstriangle.h"
diff --git a/tests/src/core/testqgsgeometryimport.cpp b/tests/src/core/testqgsgeometryimport.cpp
index 7e1157b311b..2a109234641 100644
--- a/tests/src/core/testqgsgeometryimport.cpp
+++ b/tests/src/core/testqgsgeometryimport.cpp
@@ -15,7 +15,7 @@
 
 #include "qgsapplication.h"
 #include "qgsgeometry.h"
-#include "qgspoint.h"
+#include "qgspointxy.h"
 #include "qgswkbptr.h"
 #include <QPolygonF>
 
diff --git a/tests/src/core/testqgsmapsettings.cpp b/tests/src/core/testqgsmapsettings.cpp
index 1bdd1ab81ab..2c5921a92a3 100644
--- a/tests/src/core/testqgsmapsettings.cpp
+++ b/tests/src/core/testqgsmapsettings.cpp
@@ -22,7 +22,7 @@
 #include "qgsexpressioncontext.h"
 #include "qgsrectangle.h"
 #include "qgsmapsettings.h"
-#include "qgspoint.h"
+#include "qgspointxy.h"
 #include "qgslogger.h"
 #include "qgsapplication.h"
 #include "qgsmaplayerlistutils.h"
diff --git a/tests/src/core/testqgsmaptopixelgeometrysimplifier.cpp b/tests/src/core/testqgsmaptopixelgeometrysimplifier.cpp
index 5a5ef6105d7..00fa6fa50f0 100644
--- a/tests/src/core/testqgsmaptopixelgeometrysimplifier.cpp
+++ b/tests/src/core/testqgsmaptopixelgeometrysimplifier.cpp
@@ -32,7 +32,7 @@
 #if 0
 #include <qgspoint.h>
 #include "qgsgeometryutils.h"
-#include "qgspointv2.h"
+#include "qgspoint.h"
 #include "qgslinestring.h"
 #include "qgspolygon.h"
 #include "qgscircularstring.h"
diff --git a/tests/src/core/testqgsogrutils.cpp b/tests/src/core/testqgsogrutils.cpp
index 47f07bd03dc..8376dfebbdf 100644
--- a/tests/src/core/testqgsogrutils.cpp
+++ b/tests/src/core/testqgsogrutils.cpp
@@ -26,7 +26,7 @@
 #include "qgsgeometry.h"
 #include "qgsogrutils.h"
 #include "qgsapplication.h"
-#include "qgspointv2.h"
+#include "qgspoint.h"
 
 class TestQgsOgrUtils: public QObject
 {
diff --git a/tests/src/core/testqgsprocessing.cpp b/tests/src/core/testqgsprocessing.cpp
index bbc41699049..19b40c8aa64 100644
--- a/tests/src/core/testqgsprocessing.cpp
+++ b/tests/src/core/testqgsprocessing.cpp
@@ -27,7 +27,7 @@
 #include "qgstestutils.h"
 #include "qgsrasterlayer.h"
 #include "qgsproject.h"
-#include "qgspointv2.h"
+#include "qgspoint.h"
 #include "qgsgeometry.h"
 #include "qgsvectorfilewriter.h"
 
diff --git a/tests/src/core/testqgsvectorfilewriter.cpp b/tests/src/core/testqgsvectorfilewriter.cpp
index f803d35b66e..50374dd14d0 100644
--- a/tests/src/core/testqgsvectorfilewriter.cpp
+++ b/tests/src/core/testqgsvectorfilewriter.cpp
@@ -22,7 +22,7 @@
 #include "qgsvectorfilewriter.h" //logic for writing shpfiles
 #include "qgsfeature.h" //we will need to pass a bunch of these for each rec
 #include "qgsgeometry.h" //each feature needs a geometry
-#include "qgspoint.h" //we will use point geometry
+#include "qgspointxy.h" //we will use point geometry
 #include "qgscoordinatereferencesystem.h" //needed for creating a srs
 #include "qgsapplication.h" //search path for srs.db
 #include "qgslogger.h"
diff --git a/tests/src/providers/grass/testqgsgrassprovider.cpp b/tests/src/providers/grass/testqgsgrassprovider.cpp
index 4828de82962..9fe05e91d65 100644
--- a/tests/src/providers/grass/testqgsgrassprovider.cpp
+++ b/tests/src/providers/grass/testqgsgrassprovider.cpp
@@ -22,24 +22,24 @@
 #include <QTemporaryFile>
 #include "qgstest.h"
 
-#include <qgsapplication.h>
-#include <qgscoordinatereferencesystem.h>
+#include "qgsapplication.h"
+#include "qgscoordinatereferencesystem.h"
 #include "qgsfeatureiterator.h"
-#include <qgsgeometry.h>
-#include <qgslinestring.h>
-#include <qgspointv2.h>
-#include <qgspolygon.h>
-#include <qgsproviderregistry.h>
-#include <qgsrasterbandstats.h>
+#include "qgsgeometry.h"
+#include "qgslinestring.h"
+#include "qgspoint.h"
+#include "qgspolygon.h"
+#include "qgsproviderregistry.h"
+#include "qgsrasterbandstats.h"
 #include "qgsrasterdataprovider.h"
-#include <qgsrasterlayer.h>
+#include "qgsrasterlayer.h"
 #include "qgsrasterprojector.h"
-#include <qgsvectordataprovider.h>
-#include <qgsvectorlayer.h>
+#include "qgsvectordataprovider.h"
+#include "qgsvectorlayer.h"
 
-#include <qgsgrass.h>
-#include <qgsgrassimport.h>
-#include <qgsgrassprovider.h>
+#include "qgsgrass.h"
+#include "qgsgrassimport.h"
+#include "qgsgrassprovider.h"
 
 extern "C"
 {