12 files changed, 9 insertions, 11 deletions
diff --git a/sd/inc/sdfilter.hxx b/sd/inc/sdfilter.hxx
index d44121487001..5dc9502dfa8e 100644
--- a/sd/inc/sdfilter.hxx
+++ b/sd/inc/sdfilter.hxx
@@ -20,7 +20,7 @@
 #ifndef _SD_SDFILTER_HXX
 #define _SD_SDFILTER_HXX
 
-#include <tools/gen.hxx>
+#include <sal/types.h>
 #include <rtl/ustring.hxx>
 #include <com/sun/star/frame/XModel.hpp>
 #include <com/sun/star/task/XStatusIndicator.hpp>
diff --git a/sd/source/filter/eppt/eppt.hxx b/sd/source/filter/eppt/eppt.hxx
index 98cbc88881d3..15137631878f 100644
--- a/sd/source/filter/eppt/eppt.hxx
+++ b/sd/source/filter/eppt/eppt.hxx
@@ -21,9 +21,9 @@
 #define _EPPT_HXX_
 #include <vector>
 #include "escherex.hxx"
+#include <sal/types.h>
 #include <tools/solar.h>
 #include <sot/storage.hxx>
-#include <tools/gen.hxx>
 #include <vcl/graph.hxx>
 #include <unotools/fontcvt.hxx>
 #include <tools/string.hxx>
diff --git a/sd/source/filter/ppt/propread.hxx b/sd/source/filter/ppt/propread.hxx
index c983e62c3617..b05b9770f90a 100644
--- a/sd/source/filter/ppt/propread.hxx
+++ b/sd/source/filter/ppt/propread.hxx
@@ -23,9 +23,9 @@
 #include <map>
 #include <boost/ptr_container/ptr_vector.hpp>
 
+#include <sal/types.h>
 #include <tools/solar.h>
 #include <sot/storage.hxx>
-#include <tools/gen.hxx>
 #include <tools/stream.hxx>
 
 #include <tools/string.hxx>
diff --git a/sd/source/ui/inc/undoheaderfooter.hxx b/sd/source/ui/inc/undoheaderfooter.hxx
index fdf32d5af16c..588e1297c7e7 100644
--- a/sd/source/ui/inc/undoheaderfooter.hxx
+++ b/sd/source/ui/inc/undoheaderfooter.hxx
@@ -20,7 +20,6 @@
 #ifndef _SD_UNDOHEADERFOOTER_HXX
 #define _SD_UNDOHEADERFOOTER_HXX
 
-#include <tools/gen.hxx>
 #include "sdundo.hxx"
 #include "sdpage.hxx"
 #include "sddllapi.h"
diff --git a/sd/source/ui/slidesorter/cache/SlsBitmapCompressor.hxx b/sd/source/ui/slidesorter/cache/SlsBitmapCompressor.hxx
index 20fb898a616e..9e15502f2a2a 100644
--- a/sd/source/ui/slidesorter/cache/SlsBitmapCompressor.hxx
+++ b/sd/source/ui/slidesorter/cache/SlsBitmapCompressor.hxx
@@ -21,7 +21,6 @@
 #define SD_SLIDESORTER_BITMAP_COMPRESSOR_HXX
 
 #include <sal/types.h>
-#include <tools/gen.hxx>
 #include <boost/shared_ptr.hpp>
 
 
diff --git a/sd/source/ui/slidesorter/cache/SlsPageCache.cxx b/sd/source/ui/slidesorter/cache/SlsPageCache.cxx
index 8b238b6ac122..294ae9f76f64 100644
--- a/sd/source/ui/slidesorter/cache/SlsPageCache.cxx
+++ b/sd/source/ui/slidesorter/cache/SlsPageCache.cxx
@@ -18,6 +18,7 @@
  */
 
 
+#include <tools/gen.hxx>
 #include "SlsGenericPageCache.hxx"
 #include "SlsRequestFactory.hxx"
 #include "cache/SlsPageCache.hxx"
diff --git a/sd/source/ui/slidesorter/inc/cache/SlsPageCache.hxx b/sd/source/ui/slidesorter/inc/cache/SlsPageCache.hxx
index e41694354a6e..23d6187e7d30 100644
--- a/sd/source/ui/slidesorter/inc/cache/SlsPageCache.hxx
+++ b/sd/source/ui/slidesorter/inc/cache/SlsPageCache.hxx
@@ -22,10 +22,10 @@
 
 #include "cache/SlsCacheContext.hxx"
 #include <sal/types.h>
-#include <tools/gen.hxx>
 #include <boost/scoped_ptr.hpp>
 #include <vcl/bitmap.hxx>
 
+struct Size;
 
 namespace sd { namespace slidesorter { namespace cache {
 
diff --git a/sd/source/ui/slidesorter/inc/controller/SlsAnimationFunction.hxx b/sd/source/ui/slidesorter/inc/controller/SlsAnimationFunction.hxx
index b52a0c84f984..44828655a36c 100644
--- a/sd/source/ui/slidesorter/inc/controller/SlsAnimationFunction.hxx
+++ b/sd/source/ui/slidesorter/inc/controller/SlsAnimationFunction.hxx
@@ -24,7 +24,6 @@
 #include <basegfx/point/b2dpoint.hxx>
 #include <boost/noncopyable.hpp>
 #include <boost/function.hpp>
-#include <tools/gen.hxx>
 #include <vector>
 
 namespace sd { namespace slidesorter { namespace view {
diff --git a/sd/source/ui/slidesorter/inc/controller/SlsScrollBarManager.hxx b/sd/source/ui/slidesorter/inc/controller/SlsScrollBarManager.hxx
index 5b791908c212..a3d18b25fe9c 100644
--- a/sd/source/ui/slidesorter/inc/controller/SlsScrollBarManager.hxx
+++ b/sd/source/ui/slidesorter/inc/controller/SlsScrollBarManager.hxx
@@ -28,8 +28,6 @@
 #include <boost/shared_ptr.hpp>
 #include <boost/function.hpp>
 
-class Point;
-class Rectangle;
 class ScrollBar;
 class ScrollBarBox;
 class Window;
diff --git a/sd/source/ui/slidesorter/inc/controller/SlsSelectionObserver.hxx b/sd/source/ui/slidesorter/inc/controller/SlsSelectionObserver.hxx
index 8e70d97834f8..51718fa931b0 100644
--- a/sd/source/ui/slidesorter/inc/controller/SlsSelectionObserver.hxx
+++ b/sd/source/ui/slidesorter/inc/controller/SlsSelectionObserver.hxx
@@ -20,7 +20,7 @@
 #ifndef SD_SLIDESORTER_CONTROLLER_SELECTION_OBSERVER_HXX
 #define SD_SLIDESORTER_CONTROLLER_SELECTION_OBSERVER_HXX
 
-#include <tools/gen.hxx>
+#include <sal/types.h>
 #include <vector>
 #include <boost/shared_ptr.hpp>
 
diff --git a/sd/source/ui/slidesorter/view/SlsLayeredDevice.cxx b/sd/source/ui/slidesorter/view/SlsLayeredDevice.cxx
index 47efd3870946..601525951231 100644
--- a/sd/source/ui/slidesorter/view/SlsLayeredDevice.cxx
+++ b/sd/source/ui/slidesorter/view/SlsLayeredDevice.cxx
@@ -26,6 +26,7 @@
 #include <boost/bind.hpp>
 #include <boost/function.hpp>
 
+#include <tools/gen.hxx>
 
 namespace sd { namespace slidesorter { namespace view {
 
diff --git a/sd/source/ui/slidesorter/view/SlsLayeredDevice.hxx b/sd/source/ui/slidesorter/view/SlsLayeredDevice.hxx
index 4060ff27ac8c..6cd755cc8eda 100644
--- a/sd/source/ui/slidesorter/view/SlsLayeredDevice.hxx
+++ b/sd/source/ui/slidesorter/view/SlsLayeredDevice.hxx
@@ -23,7 +23,6 @@
 #include "view/SlsILayerPainter.hxx"
 #include "SlideSorter.hxx"
 
-#include <tools/gen.hxx>
 #include <vcl/region.hxx>
 #include <vcl/virdev.hxx>
 
@@ -33,6 +32,8 @@
 #include <boost/enable_shared_from_this.hpp>
 #include <vector>
 
+class Rectangle;
+
 namespace sd { namespace slidesorter { namespace view {
 
 /** A simple wrapper around an OutputDevice that provides support for