4 files changed, 7 insertions, 6 deletions
diff --git a/include/vcl/bitmap.hxx b/include/vcl/bitmap.hxx
index 74d3a2e11724..b995111f16a4 100644
--- a/include/vcl/bitmap.hxx
+++ b/include/vcl/bitmap.hxx
@@ -466,7 +466,7 @@ public:
     void                    Vectorize(
                                 GDIMetaFile& rMtf,
                                 sal_uInt8 cReduce,
-                                const Link<long,void>* pProgress );
+                                const Link<tools::Long,void>* pProgress );
 
     /** Change various global color characteristics
 
diff --git a/include/vcl/devicecoordinate.hxx b/include/vcl/devicecoordinate.hxx
index 14e43b22c024..0d5eeb6aeb28 100644
--- a/include/vcl/devicecoordinate.hxx
+++ b/include/vcl/devicecoordinate.hxx
@@ -11,6 +11,7 @@
 #define INCLUDED_VCL_DEVICE_COORDINATE_HXX
 
 #include <config_vcl.h>
+#include <tools/long.hxx>
 
 #if VCL_FLOAT_DEVICE_PIXEL
 #include <basegfx/point/b2dpoint.hxx>
@@ -19,7 +20,7 @@ typedef double DeviceCoordinate;
 #else /* !VCL_FLOAT_DEVICE_PIXEL */
 
 #include <basegfx/point/b2ipoint.hxx>
-typedef long DeviceCoordinate;
+typedef tools::Long DeviceCoordinate;
 
 #endif /* ! Carpet Cushion */
 
diff --git a/include/vcl/metaact.hxx b/include/vcl/metaact.hxx
index 52c1bf7d935d..600afe9b6790 100644
--- a/include/vcl/metaact.hxx
+++ b/include/vcl/metaact.hxx
@@ -503,7 +503,7 @@ private:
 
     Point       maStartPt;
     OUString    maStr;
-    std::unique_ptr<long[]>
+    std::unique_ptr<tools::Long[]>
                 mpDXAry;
     sal_Int32   mnIndex;
     sal_Int32   mnLen;
diff --git a/include/vcl/salgtype.hxx b/include/vcl/salgtype.hxx
index 720c4c1d8255..d19bf776a31f 100644
--- a/include/vcl/salgtype.hxx
+++ b/include/vcl/salgtype.hxx
@@ -36,11 +36,11 @@ enum class DeviceFormat {
 
 constexpr ::Color SALCOLOR_NONE ( 0xFF, 0xFF, 0xFF, 0xFF );
 
-// must equal to class Point
+// must equal to the Windows POINT type, which is why we use sal_Int32
 struct SalPoint
 {
-    tools::Long        mnX;
-    tools::Long        mnY;
+    sal_Int32        mnX;
+    sal_Int32        mnY;
 };
 
 typedef const SalPoint*   PCONSTSALPOINT;