diff --git a/include/svx/sdr/overlay/overlaymanager.hxx b/include/svx/sdr/overlay/overlaymanager.hxx
index 5d84de28c865..c0a03c405521 100644
--- a/include/svx/sdr/overlay/overlaymanager.hxx
+++ b/include/svx/sdr/overlay/overlaymanager.hxx
@@ -26,6 +26,7 @@
 #include <svx/sdr/overlay/overlayobject.hxx>
 #include <vcl/mapmod.hxx>
 #include <tools/color.hxx>
+#include <tools/gen.hxx>
 #include <svx/svxdllapi.h>
 #include <svtools/optionsdrawinglayer.hxx>
 #include <basegfx/matrix/b2dhommatrix.hxx>
diff --git a/include/vcl/gfxlink.hxx b/include/vcl/gfxlink.hxx
index c092f0bbf7ec..4d326d9f24ae 100644
--- a/include/vcl/gfxlink.hxx
+++ b/include/vcl/gfxlink.hxx
@@ -22,6 +22,7 @@
 
 #include <rtl/ustring.hxx>
 #include <tools/stream.hxx>
+#include <tools/gen.hxx>
 #include <tools/solar.h>
 #include <vcl/dllapi.h>
 #include <vcl/mapmod.hxx>
diff --git a/include/vcl/mapmod.hxx b/include/vcl/mapmod.hxx
index 7ec4ca50239b..266e38f1ad0f 100644
--- a/include/vcl/mapmod.hxx
+++ b/include/vcl/mapmod.hxx
@@ -20,12 +20,10 @@
 #ifndef INCLUDED_VCL_MAPMOD_HXX
 #define INCLUDED_VCL_MAPMOD_HXX
 
-#include <tools/gen.hxx>
-#include <tools/solar.h>
 #include <vcl/dllapi.h>
-#include <tools/resid.hxx>
 #include <tools/mapunit.hxx>
 
+class Point;
 class Fraction;
 class SvStream;
 class OutputDevice;
diff --git a/vcl/source/gdi/mapmod.cxx b/vcl/source/gdi/mapmod.cxx
index 62852d37adbb..d12b09497fc5 100644
--- a/vcl/source/gdi/mapmod.cxx
+++ b/vcl/source/gdi/mapmod.cxx
@@ -19,6 +19,7 @@
 
 #include <vcl/mapmod.hxx>
 
+#include <tools/gen.hxx>
 #include <tools/fract.hxx>
 #include <tools/stream.hxx>
 #include <tools/vcompat.hxx>