2 files changed, 16 insertions, 4 deletions
diff --git a/tools/inc/poly.h b/tools/inc/poly.h
index a925f9b42739..9f05dcc2b3e4 100644
--- a/tools/inc/poly.h
+++ b/tools/inc/poly.h
@@ -19,7 +19,9 @@
 #ifndef _POLY_H
 #define _POLY_H
 
-#include <tools/gen.hxx>
+#include <sal/types.h>
+
+class Point;
 
 class SAL_WARN_UNUSED ImplPolygonData
 {
diff --git a/tools/inc/tools/svborder.hxx b/tools/inc/tools/svborder.hxx
index 0aebbfecdd47..de4a8666cbd8 100644
--- a/tools/inc/tools/svborder.hxx
+++ b/tools/inc/tools/svborder.hxx
@@ -29,11 +29,21 @@ class TOOLS_DLLPUBLIC SvBorder
 
 public:
     SvBorder()
-    { nTop = nRight = nBottom = nLeft = 0; }
+    {
+        nTop = nRight = nBottom = nLeft = 0;
+    }
     SvBorder( const Size & rSz )
-    { nTop = nBottom = rSz.Height(); nRight = nLeft = rSz.Width(); }
+    {
+        nTop = nBottom = rSz.Height();
+        nRight = nLeft = rSz.Width();
+    }
     SvBorder( long nLeftP, long nTopP, long nRightP, long nBottomP )
-    { nLeft = nLeftP; nTop = nTopP; nRight = nRightP; nBottom = nBottomP; }
+    {
+        nLeft = nLeftP;
+        nTop = nTopP;
+        nRight = nRightP;
+        nBottom = nBottomP;
+    }
     sal_Bool    operator == ( const SvBorder & rObj ) const
             {
                 return nTop == rObj.nTop && nRight == rObj.nRight &&