11 files changed, 15 insertions, 7 deletions
diff --git a/sw/inc/anchoreddrawobject.hxx b/sw/inc/anchoreddrawobject.hxx
index 43ecefad83ba..4c26983953e4 100644
--- a/sw/inc/anchoreddrawobject.hxx
+++ b/sw/inc/anchoreddrawobject.hxx
@@ -20,7 +20,8 @@
 #define _ANCHOREDDRAWOBJECT_HXX
 
 #include <anchoredobject.hxx>
-#include <tools/gen.hxx>
+
+class Rectangle;
 
 /** class for the positioning of drawing objects
 
diff --git a/sw/inc/frmfmt.hxx b/sw/inc/frmfmt.hxx
index a3a347f78601..bf016ee46765 100644
--- a/sw/inc/frmfmt.hxx
+++ b/sw/inc/frmfmt.hxx
@@ -28,7 +28,6 @@
 class SwFlyFrm;
 class SwAnchoredObject;
 class Graphic;
-class Point;
 class ImageMap;
 class IMapObject;
 class SwRect;
diff --git a/sw/inc/node.hxx b/sw/inc/node.hxx
index b79401f4d19d..7690cf8149d0 100644
--- a/sw/inc/node.hxx
+++ b/sw/inc/node.hxx
@@ -25,8 +25,8 @@
 #include <boost/utility.hpp>
 #include <boost/shared_ptr.hpp>
 
+#include <sal/types.h>
 #include <tools/mempool.hxx>
-#include <tools/gen.hxx>
 
 #include "swdllapi.h"
 #include <ndarr.hxx>
@@ -75,6 +75,7 @@ class IDocumentFieldsAccess;
 class IDocumentContentOperations;
 class IDocumentListItems;
 class SwOLENodes;
+class Point;
 
 /// Base class of the Writer document model elements.
 class SW_DLLPUBLIC SwNode
diff --git a/sw/inc/numrule.hxx b/sw/inc/numrule.hxx
index 3b468ef61d88..562b7a9e5fc8 100644
--- a/sw/inc/numrule.hxx
+++ b/sw/inc/numrule.hxx
@@ -19,7 +19,7 @@
 #ifndef _NUMRULE_HXX
 #define _NUMRULE_HXX
 
-#include <tools/gen.hxx>
+#include <sal/types.h>
 #include <tools/string.hxx>
 #include <editeng/svxenum.hxx>
 #include <editeng/numitem.hxx>
@@ -42,6 +42,7 @@ class SwCharFmt;
 class SwDoc;
 class SwFmtVertOrient;
 class SwTxtNode;
+class Size;
 
 const sal_Unicode cBulletChar = 0x2022; ///< Character for lists.
 
diff --git a/sw/inc/pam.hxx b/sw/inc/pam.hxx
index bfe7214bc332..31e1008abbc6 100644
--- a/sw/inc/pam.hxx
+++ b/sw/inc/pam.hxx
@@ -20,7 +20,7 @@
 #define _PAM_HXX
 
 #include <stddef.h>         ///< For MemPool.
-#include <tools/gen.hxx>
+#include <sal/types.h>
 #include <tools/mempool.hxx>
 #include <cshtyp.hxx>       ///< For function definitions.
 #include <ring.hxx>         ///< Super class.
@@ -35,6 +35,7 @@ class SwDoc;
 class SwNode;
 class SwCntntNode;
 class SwPaM;
+class Point;
 
 namespace com { namespace sun { namespace star { namespace util {
     struct SearchOptions;
diff --git a/sw/source/core/crsr/pam.cxx b/sw/source/core/crsr/pam.cxx
index baf62ad58ba3..e9b78020808e 100644
--- a/sw/source/core/crsr/pam.cxx
+++ b/sw/source/core/crsr/pam.cxx
@@ -17,6 +17,7 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
+#include <tools/gen.hxx>
 #include <hintids.hxx>
 #include <editeng/protitem.hxx>
 #include <cntfrm.hxx>
diff --git a/sw/source/core/docnode/node.cxx b/sw/source/core/docnode/node.cxx
index 132282fa175f..a97261150a36 100644
--- a/sw/source/core/docnode/node.cxx
+++ b/sw/source/core/docnode/node.cxx
@@ -21,6 +21,7 @@
 #include <hintids.hxx>
 #include <editeng/frmdiritem.hxx>
 #include <editeng/protitem.hxx>
+#include <tools/gen.hxx>
 #include <com/sun/star/i18n/CharacterIteratorMode.hpp>
 #include <fmtcntnt.hxx>
 #include <fmtanchr.hxx>
diff --git a/sw/source/core/fields/postithelper.cxx b/sw/source/core/fields/postithelper.cxx
index 326490b0fef0..570631947042 100644
--- a/sw/source/core/fields/postithelper.cxx
+++ b/sw/source/core/fields/postithelper.cxx
@@ -18,8 +18,6 @@
  */
 
 
-#include <tools/gen.hxx>
-
 #include <postithelper.hxx>
 #include <PostItMgr.hxx>
 #include <AnnotationWin.hxx>
@@ -39,6 +37,8 @@
 #include <editeng/charhiddenitem.hxx>
 #include <switerator.hxx>
 
+class Point;
+
 namespace {
 
 struct LayoutInfoOrder
diff --git a/sw/source/core/inc/fntcache.hxx b/sw/source/core/inc/fntcache.hxx
index 2206d2865398..7d2981b9ba3f 100644
--- a/sw/source/core/inc/fntcache.hxx
+++ b/sw/source/core/inc/fntcache.hxx
@@ -32,6 +32,7 @@ class SwDrawTextInfo;
 class ViewShell;
 class SwSubFont;
 class MapMode;
+class Point;
 
 class SwFntCache : public SwCache
 {
diff --git a/sw/source/core/inc/swfont.hxx b/sw/source/core/inc/swfont.hxx
index fd94e33ee622..cb8011333343 100644
--- a/sw/source/core/inc/swfont.hxx
+++ b/sw/source/core/inc/swfont.hxx
@@ -22,6 +22,7 @@
 #include <i18npool/lang.h>
 #include <tools/color.hxx>
 #include <tools/stream.hxx>
+#include <tools/gen.hxx>
 #include <editeng/svxfont.hxx>
 #include <swtypes.hxx>
 #include <drawfont.hxx>     // SwDrawTextInfo
diff --git a/sw/source/core/layout/anchoreddrawobject.cxx b/sw/source/core/layout/anchoreddrawobject.cxx
index 621f5fc83ea7..6b3e5b5be023 100644
--- a/sw/source/core/layout/anchoreddrawobject.cxx
+++ b/sw/source/core/layout/anchoreddrawobject.cxx
@@ -33,6 +33,7 @@
 // --> #i32795#
 // template class <std::vector>
 #include <vector>
+#include <tools/gen.hxx>
 
 // --> #i28749#
 #include <com/sun/star/text/PositionLayoutDir.hpp>