14 files changed, 18 insertions, 12 deletions
diff --git a/vcl/generic/print/glyphset.cxx b/vcl/generic/print/glyphset.cxx
index 5c90618c2087..d5635e7e4d5b 100644
--- a/vcl/generic/print/glyphset.cxx
+++ b/vcl/generic/print/glyphset.cxx
@@ -27,6 +27,8 @@
 #include "fontsubset.hxx"
 #include "vcl/fontmanager.hxx"
 
+#include <tools/gen.hxx>
+
 #include "osl/thread.h"
 
 #include "sal/alloca.h"
diff --git a/vcl/generic/print/glyphset.hxx b/vcl/generic/print/glyphset.hxx
index 40172377f53e..f469d9b2a3af 100644
--- a/vcl/generic/print/glyphset.hxx
+++ b/vcl/generic/print/glyphset.hxx
@@ -26,11 +26,11 @@
 
 #include "rtl/string.hxx"
 
-#include "tools/gen.hxx"
-
 #include <list>
 #include <boost/unordered_map.hpp>
 
+class Point;
+
 namespace psp {
 
 class PrinterGfx;
diff --git a/vcl/inc/generic/gendisp.hxx b/vcl/inc/generic/gendisp.hxx
index d64fc9f1135c..9e603b933166 100644
--- a/vcl/inc/generic/gendisp.hxx
+++ b/vcl/inc/generic/gendisp.hxx
@@ -25,7 +25,6 @@
 #include <osl/conditn.hxx>
 #include <salwtype.hxx>
 #include <vcl/dllapi.h>
-#include <tools/gen.hxx>
 #include <list>
 #include <vector>
 
diff --git a/vcl/inc/outfont.hxx b/vcl/inc/outfont.hxx
index 741d6be82158..53ec90991bc7 100644
--- a/vcl/inc/outfont.hxx
+++ b/vcl/inc/outfont.hxx
@@ -20,9 +20,9 @@
 #ifndef _SV_OUTFONT_HXX
 #define _SV_OUTFONT_HXX
 
+#include <sal/types.h>
 #include <tools/string.hxx>
 #include <i18npool/lang.h>
-#include <tools/gen.hxx>
 #include <tools/solar.h>
 #include <vcl/dllapi.h>
 #include <unotools/fontdefs.hxx>
@@ -42,6 +42,7 @@ class Font;
 class ConvertChar;
 struct FontMatchStatus;
 class OutputDevice;
+class Size;
 
 namespace com { namespace sun { namespace star { namespace lang { struct Locale; }}}}
 
diff --git a/vcl/inc/svdata.hxx b/vcl/inc/svdata.hxx
index f7dcbd674782..ff87f290c70a 100644
--- a/vcl/inc/svdata.hxx
+++ b/vcl/inc/svdata.hxx
@@ -20,10 +20,11 @@
 #ifndef _SV_SVDATA_HXX
 #define _SV_SVDATA_HXX
 
+#include "sal/types.h"
+
 #include <osl/thread.hxx>
 #include <rtl/ref.hxx>
 
-#include "tools/gen.hxx"
 #include "tools/shl.hxx"
 #include "tools/link.hxx"
 #include "tools/fldunit.hxx"
@@ -50,7 +51,6 @@ class ImplDirectFontSubstitution;
 struct ImplHotKey;
 struct ImplEventHook;
 class Point;
-class Rectangle;
 class ResMgr;
 class ImplAccelManager;
 class ImplDevFontList;
diff --git a/vcl/inc/unx/i18n_status.hxx b/vcl/inc/unx/i18n_status.hxx
index 03330f238dcb..92310f1732a5 100644
--- a/vcl/inc/unx/i18n_status.hxx
+++ b/vcl/inc/unx/i18n_status.hxx
@@ -21,7 +21,6 @@
 #define _SAL_I18N_STATUS_HXX
 
 #include <tools/string.hxx>
-#include <tools/gen.hxx>
 
 #include <rtl/ustring.hxx>
 #include <salimestatus.hxx>
diff --git a/vcl/inc/unx/salstd.hxx b/vcl/inc/unx/salstd.hxx
index 2417cfe4a2af..73a2868836ce 100644
--- a/vcl/inc/unx/salstd.hxx
+++ b/vcl/inc/unx/salstd.hxx
@@ -20,7 +20,6 @@
 #ifndef _SALSTD_HXX
 #define _SALSTD_HXX
 
-#include <tools/gen.hxx>
 #include <tools/solar.h>
 
 // -=-= X-Lib forwards -=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=
diff --git a/vcl/inc/vcl/font.hxx b/vcl/inc/vcl/font.hxx
index 077b4f100336..f651ba6c1401 100644
--- a/vcl/inc/vcl/font.hxx
+++ b/vcl/inc/vcl/font.hxx
@@ -20,8 +20,8 @@
 #ifndef _SV_FONT_HXX
 #define _SV_FONT_HXX
 
+#include <sal/types.h>
 #include <vcl/dllapi.h>
-#include <tools/gen.hxx>
 #include <tools/string.hxx>
 #include <i18npool/lang.h>
 #include <tools/color.hxx>
@@ -33,6 +33,7 @@ class SvStream;
 
 class Impl_Font;
 class ImplFontAttributes;
+class Size;
 
 // --------
 // - Font -
diff --git a/vcl/inc/vcl/gradient.hxx b/vcl/inc/vcl/gradient.hxx
index 27fc81fd7519..d9bbf7aea1ad 100644
--- a/vcl/inc/vcl/gradient.hxx
+++ b/vcl/inc/vcl/gradient.hxx
@@ -20,9 +20,9 @@
 #ifndef _SV_GRADIENT_HXX
 #define _SV_GRADIENT_HXX
 
+#include <sal/types.h>
 #include <vcl/dllapi.h>
 #include <tools/color.hxx>
-#include <tools/gen.hxx>
 
 #include <vcl/vclenum.hxx>
 
@@ -30,6 +30,8 @@
 // - Impl_Gradient -
 // ----------------
 
+class Rectangle;
+class Point;
 class SvStream;
 
 class Impl_Gradient
diff --git a/vcl/inc/vcl/lineinfo.hxx b/vcl/inc/vcl/lineinfo.hxx
index 648b060da6fd..d5165a63e016 100644
--- a/vcl/inc/vcl/lineinfo.hxx
+++ b/vcl/inc/vcl/lineinfo.hxx
@@ -20,8 +20,8 @@
 #ifndef _SV_LINEINFO_HXX
 #define _SV_LINEINFO_HXX
 
+#include <sal/types.h>
 #include <vcl/dllapi.h>
-#include <tools/gen.hxx>
 #include <vcl/vclenum.hxx>
 #include <basegfx/vector/b2enums.hxx>
 #include <com/sun/star/drawing/LineCap.hpp>
diff --git a/vcl/inc/vcl/wall.hxx b/vcl/inc/vcl/wall.hxx
index 84d008430823..e18adf78f60b 100644
--- a/vcl/inc/vcl/wall.hxx
+++ b/vcl/inc/vcl/wall.hxx
@@ -23,8 +23,8 @@
 #include <tools/solar.h>
 #include <vcl/dllapi.h>
 #include <tools/color.hxx>
+#include <tools/gen.hxx>
 
-class Rectangle;
 class Gradient;
 class BitmapEx;
 class ImplWallpaper;
diff --git a/vcl/source/app/svdata.cxx b/vcl/source/app/svdata.cxx
index e8716cd13129..657c3ee3c237 100644
--- a/vcl/source/app/svdata.cxx
+++ b/vcl/source/app/svdata.cxx
@@ -26,6 +26,7 @@
 #include <rtl/process.h>
 #include <tools/debug.hxx>
 #include <tools/resary.hxx>
+#include <tools/gen.hxx>
 #include <unotools/fontcfg.hxx>
 #include <cppuhelper/implbase1.hxx>
 #include <comphelper/string.hxx>
diff --git a/vcl/source/gdi/font.cxx b/vcl/source/gdi/font.cxx
index bbb74ed0f50f..b80e8e00b3ca 100644
--- a/vcl/source/gdi/font.cxx
+++ b/vcl/source/gdi/font.cxx
@@ -23,6 +23,7 @@
 #include "tools/stream.hxx"
 #include "tools/vcompat.hxx"
 #include "tools/debug.hxx"
+#include <tools/gen.hxx>
 
 #include "vcl/font.hxx"
 
diff --git a/vcl/source/gdi/gradient.cxx b/vcl/source/gdi/gradient.cxx
index 06b3e487b887..ea8a6bcd60c3 100644
--- a/vcl/source/gdi/gradient.cxx
+++ b/vcl/source/gdi/gradient.cxx
@@ -20,6 +20,7 @@
 #include <tools/stream.hxx>
 #include <tools/vcompat.hxx>
 #include <tools/debug.hxx>
+#include <tools/gen.hxx>
 #include <vcl/gradient.hxx>
 
 // =======================================================================