Cleanup: #include <tools/gen.hxx>

Change-Id: Ic547b4a59102afc8bdbc85ec95ac312e32ef2530
Reviewed-on: https://gerrit.libreoffice.org/1484
Reviewed-by: Michael Stahl <mstahl@redhat.com>
Tested-by: Michael Stahl <mstahl@redhat.com>

13 files changed, 14 insertions, 10 deletions

diff --git a/svx/inc/svx/EnhancedCustomShape2d.hxx b/svx/inc/svx/EnhancedCustomShape2d.hxx
index cbe34fbdd8e0..e2cd4eef637c 100644
--- a/svx/inc/svx/EnhancedCustomShape2d.hxx
+++ b/svx/inc/svx/EnhancedCustomShape2d.hxx
@@ -33,6 +33,7 @@
 #include <com/sun/star/drawing/EnhancedCustomShapeTextFrame.hpp>
 #include <com/sun/star/drawing/EnhancedCustomShapeAdjustmentValue.hpp>
 #include <svx/EnhancedCustomShapeFunctionParser.hxx>
+#include <tools/gen.hxx>
 
 #include <boost/shared_ptr.hpp>
 #include <vector>
diff --git a/svx/inc/svx/IAccessibleViewForwarderListener.hxx b/svx/inc/svx/IAccessibleViewForwarderListener.hxx
index 6d3a7f246e5d..8a9a061bfb5e 100644
--- a/svx/inc/svx/IAccessibleViewForwarderListener.hxx
+++ b/svx/inc/svx/IAccessibleViewForwarderListener.hxx
@@ -21,7 +21,6 @@
 #define _SVX_ACCESSIBILITY_IACCESSIBLE_VIEW_FORWARDER_LISTENER_HXX
 
 #include <sal/types.h>
-#include <tools/gen.hxx>
 
 
 namespace accessibility {
diff --git a/svx/inc/svx/framelink.hxx b/svx/inc/svx/framelink.hxx
index c15c9be28958..a8a05076f471 100644
--- a/svx/inc/svx/framelink.hxx
+++ b/svx/inc/svx/framelink.hxx
@@ -22,7 +22,6 @@
 
 #include <algorithm>
 #include <sal/types.h>
-#include <tools/gen.hxx>
 #include <tools/color.hxx>
 #include "svx/svxdllapi.h"
 #include <vcl/outdev.hxx>
@@ -30,6 +29,8 @@
 
 #include <drawinglayer/primitive2d/baseprimitive2d.hxx>
 
+class Point;
+class Rectangle;
 class OutputDevice;
 
 namespace svx {
diff --git a/svx/inc/svx/msdffdef.hxx b/svx/inc/svx/msdffdef.hxx
index e0b1b10aeede..3ff5a3dbebe8 100644
--- a/svx/inc/svx/msdffdef.hxx
+++ b/svx/inc/svx/msdffdef.hxx
@@ -20,9 +20,9 @@
 #ifndef _MSDFFDEF_HXX
 #define _MSDFFDEF_HXX
 
+#include <sal/types.h>
 #include <tools/solar.h>
 #include <tools/stream.hxx>
-#include <tools/gen.hxx>
 #include "svx/svxdllapi.h"
 
 #define DFF_COMMON_RECORD_HEADER_SIZE           8
diff --git a/svx/inc/svx/sdr/contact/objectcontactofpageview.hxx b/svx/inc/svx/sdr/contact/objectcontactofpageview.hxx
index 49a4af3b34bb..06371bf35b81 100644
--- a/svx/inc/svx/sdr/contact/objectcontactofpageview.hxx
+++ b/svx/inc/svx/sdr/contact/objectcontactofpageview.hxx
@@ -21,7 +21,6 @@
 #define _SDR_CONTACT_OBJECTCONTACTOFPAGEVIEW_HXX
 
 #include <svx/sdr/contact/objectcontact.hxx>
-#include <tools/gen.hxx>
 
 //////////////////////////////////////////////////////////////////////////////
 // predeclarations
diff --git a/svx/inc/svx/sdr/contact/viewcontact.hxx b/svx/inc/svx/sdr/contact/viewcontact.hxx
index a96f14424031..0a1c43905609 100644
--- a/svx/inc/svx/sdr/contact/viewcontact.hxx
+++ b/svx/inc/svx/sdr/contact/viewcontact.hxx
@@ -21,7 +21,6 @@
 #define _SDR_CONTACT_VIEWCONTACT_HXX
 
 #include <sal/types.h>
-#include <tools/gen.hxx>
 #include "svx/svxdllapi.h"
 #include <drawinglayer/primitive2d/baseprimitive2d.hxx>
 
diff --git a/svx/inc/svx/sdr/contact/viewcontactofsdrmediaobj.hxx b/svx/inc/svx/sdr/contact/viewcontactofsdrmediaobj.hxx
index 9cccb542a11d..3ad8580cf12e 100644
--- a/svx/inc/svx/sdr/contact/viewcontactofsdrmediaobj.hxx
+++ b/svx/inc/svx/sdr/contact/viewcontactofsdrmediaobj.hxx
@@ -22,6 +22,7 @@
 
 #include <svx/sdr/contact/viewcontactofsdrobj.hxx>
 #include "svx/svxdllapi.h"
+#include <tools/gen.hxx>
 
 //////////////////////////////////////////////////////////////////////////////
 // predeclarations
diff --git a/svx/inc/svx/sdr/contact/viewobjectcontact.hxx b/svx/inc/svx/sdr/contact/viewobjectcontact.hxx
index 66b2baeda6c3..96c3918a4c42 100644
--- a/svx/inc/svx/sdr/contact/viewobjectcontact.hxx
+++ b/svx/inc/svx/sdr/contact/viewobjectcontact.hxx
@@ -23,7 +23,6 @@
 #include <sal/types.h>
 
 #include <vector>
-#include <tools/gen.hxx>
 #include "svx/svxdllapi.h"
 #include <drawinglayer/primitive2d/baseprimitive2d.hxx>
 
diff --git a/svx/inc/svx/sdr/contact/viewobjectcontactofsdrmediaobj.hxx b/svx/inc/svx/sdr/contact/viewobjectcontactofsdrmediaobj.hxx
index 25257e582520..e1e24dab8442 100644
--- a/svx/inc/svx/sdr/contact/viewobjectcontactofsdrmediaobj.hxx
+++ b/svx/inc/svx/sdr/contact/viewobjectcontactofsdrmediaobj.hxx
@@ -22,6 +22,7 @@
 
 #include <svx/sdr/contact/viewobjectcontactofsdrobj.hxx>
 #include <svx/sdr/contact/viewobjectcontact.hxx>
+#include <tools/gen.hxx>
 
 namespace avmedia { class MediaItem; }
 class Window;
diff --git a/svx/inc/svx/sdr/overlay/overlayhatchrect.hxx b/svx/inc/svx/sdr/overlay/overlayhatchrect.hxx
index 2ccf60fc0cbe..7f01c3537e42 100644
--- a/svx/inc/svx/sdr/overlay/overlayhatchrect.hxx
+++ b/svx/inc/svx/sdr/overlay/overlayhatchrect.hxx
@@ -22,7 +22,6 @@
 
 #include <svx/sdr/overlay/overlayobject.hxx>
 #include <vcl/hatch.hxx>
-#include <tools/gen.hxx>
 
 //////////////////////////////////////////////////////////////////////////////
 
diff --git a/svx/inc/svx/sdr/overlay/overlayobjectlist.hxx b/svx/inc/svx/sdr/overlay/overlayobjectlist.hxx
index 67c4e510f17e..ea75ace1e94a 100644
--- a/svx/inc/svx/sdr/overlay/overlayobjectlist.hxx
+++ b/svx/inc/svx/sdr/overlay/overlayobjectlist.hxx
@@ -21,7 +21,7 @@
 #define _SDR_OVERLAY_OVERLAYOBJECTLIST_HXX
 
 #include <svx/sdr/overlay/overlayobject.hxx>
-#include <tools/gen.hxx>
+#include <sal/types.h>
 #include "svx/svxdllapi.h"
 
 //////////////////////////////////////////////////////////////////////////////
@@ -30,6 +30,8 @@
 
 //////////////////////////////////////////////////////////////////////////////
 
+class Point;
+
 namespace sdr
 {
     namespace overlay
diff --git a/svx/inc/svx/unoshape.hxx b/svx/inc/svx/unoshape.hxx
index 1a1752900c2a..36bf13f81a30 100644
--- a/svx/inc/svx/unoshape.hxx
+++ b/svx/inc/svx/unoshape.hxx
@@ -37,7 +37,7 @@
 #include <com/sun/star/container/XChild.hpp>
 #include <com/sun/star/beans/XMultiPropertySet.hpp>
 #include <com/sun/star/beans/XMultiPropertyStates.hpp>
-#include <tools/gen.hxx>
+#include <sal/types.h>
 #include <tools/weakbase.hxx>
 #include <svl/lstner.hxx>
 #include <editeng/unoipset.hxx>
@@ -62,6 +62,8 @@ class SfxItemSet;
 class SdrModel;
 class SvxDrawPage;
 class SvGlobalName;
+class Pair;
+
 // Dimension arrows change size/position on save/reload (#i59051#)
 namespace basegfx
     {
diff --git a/svx/inc/xpolyimp.hxx b/svx/inc/xpolyimp.hxx
index ea5766b9cbea..f3b06ef77fe4 100644
--- a/svx/inc/xpolyimp.hxx
+++ b/svx/inc/xpolyimp.hxx
@@ -20,10 +20,11 @@
 #ifndef _XPOLYIMP_HXX
 #define _XPOLYIMP_HXX
 
-#include <tools/gen.hxx>
 #include <svx/xpoly.hxx>
 #include <vector>
 
+class Point;
+
 class ImpXPolygon
 {
 public: