9 files changed, 19 insertions, 11 deletions
diff --git a/include/editeng/hangulhanja.hxx b/include/editeng/hangulhanja.hxx
index b73911119a6a..74fdbe4d96eb 100644
--- a/include/editeng/hangulhanja.hxx
+++ b/include/editeng/hangulhanja.hxx
@@ -24,6 +24,7 @@
 #include <com/sun/star/lang/XMultiServiceFactory.hpp>
 #include <com/sun/star/lang/Locale.hpp>
 #include <com/sun/star/uno/Sequence.hxx>
+#include <com/sun/star/uno/XComponentContext.hpp>
 #include <editeng/editengdllapi.h>
 #include <i18nlangtag/mslangid.hxx>
 
diff --git a/include/framework/menuconfiguration.hxx b/include/framework/menuconfiguration.hxx
index ad820f4e46cb..a6bc26f9a8e0 100644
--- a/include/framework/menuconfiguration.hxx
+++ b/include/framework/menuconfiguration.hxx
@@ -28,6 +28,8 @@
 #include <com/sun/star/container/XIndexContainer.hpp>
 #include <com/sun/star/container/XIndexAccess.hpp>
 #include <com/sun/star/frame/XDispatchProvider.hpp>
+#include <com/sun/star/uno/XComponentContext.hpp>
+
 #include <framework/fwedllapi.h>
 
 #include <cppuhelper/weak.hxx>
diff --git a/include/svtools/addresstemplate.hxx b/include/svtools/addresstemplate.hxx
index 7985bd6817fe..a922ed3f1726 100644
--- a/include/svtools/addresstemplate.hxx
+++ b/include/svtools/addresstemplate.hxx
@@ -31,6 +31,7 @@
 #include <com/sun/star/container/XNameAccess.hpp>
 #include <com/sun/star/util/AliasProgrammaticPair.hpp>
 #include <com/sun/star/sdb/XDatabaseContext.hpp>
+#include <com/sun/star/uno/XComponentContext.hpp>
 #include <com/sun/star/sdbc/XDataSource.hpp>
 #include <unotools/configitem.hxx>
 
diff --git a/include/svtools/table/tablerenderer.hxx b/include/svtools/table/tablerenderer.hxx
index 5b4428cea979..bbd7d85be31b 100644
--- a/include/svtools/table/tablerenderer.hxx
+++ b/include/svtools/table/tablerenderer.hxx
@@ -26,6 +26,8 @@
 
 #include <boost/shared_ptr.hpp>
 
+class StyleSettings;
+
 //........................................................................
 namespace svt { namespace table
 {
diff --git a/include/svx/ucsubset.hxx b/include/svx/ucsubset.hxx
index 371a5c82b5b2..4cf0b451be54 100644
--- a/include/svx/ucsubset.hxx
+++ b/include/svx/ucsubset.hxx
@@ -24,6 +24,7 @@
 
 #include <svx/ucsubset.hrc>
 #include <vcl/metric.hxx>
+#include "tools/rc.hxx"
 
 #include <list>
 
diff --git a/include/vcl/button.hxx b/include/vcl/button.hxx
index fae2d1d1a74c..863d25f88e57 100644
--- a/include/vcl/button.hxx
+++ b/include/vcl/button.hxx
@@ -21,6 +21,7 @@
 #define INCLUDED_VCL_BUTTON_HXX
 
 #include <tools/solar.h>
+#include <tools/color.hxx>
 #include <vcl/dllapi.h>
 #include <vcl/image.hxx>
 #include <vcl/ctrl.hxx>
diff --git a/include/vcl/ctrl.hxx b/include/vcl/ctrl.hxx
index f5d61246db26..fb29c7168889 100644
--- a/include/vcl/ctrl.hxx
+++ b/include/vcl/ctrl.hxx
@@ -28,6 +28,7 @@
 
 // forward
 namespace vcl { struct ImplControlData; struct ControlLayoutData; }
+class StyleSettings;
 
 // -----------
 // - Control -
@@ -180,13 +181,7 @@ public:
     void            SetReferenceDevice( OutputDevice* _referenceDevice );
     OutputDevice*   GetReferenceDevice() const;
 
-    Font            GetUnzoomedControlPointFont() const
-    {
-        Font aFont( GetCanonicalFont( GetSettings().GetStyleSettings() ) );
-        if ( IsControlFont() )
-            aFont.Merge( GetControlFont() );
-        return aFont;
-    }
+    Font            GetUnzoomedControlPointFont() const;
 };
 
 #endif // INCLUDED_VCL_CTRL_HXX
diff --git a/include/vcl/outdev.hxx b/include/vcl/outdev.hxx
index 546331be8ea1..52eb6b52edd2 100644
--- a/include/vcl/outdev.hxx
+++ b/include/vcl/outdev.hxx
@@ -29,14 +29,15 @@
 #include <vcl/region.hxx>
 #include <vcl/mapmod.hxx>
 #include <vcl/wall.hxx>
-#include <vcl/settings.hxx>
 #include <vcl/salnativewidgets.hxx>
 #include <tools/poly.hxx>
 #include <basegfx/vector/b2enums.hxx>
 #include <com/sun/star/uno/Reference.h>
 #include <unotools/fontdefs.hxx>
 #include <basegfx/polygon/b2dpolypolygon.hxx>
+#include <boost/scoped_ptr.hpp>
 #include <com/sun/star/drawing/LineCap.hpp>
+
 #include <vector>
 
 struct ImplOutDevData;
@@ -53,6 +54,7 @@ class ImplMultiTextLineInfo;
 class SalGraphics;
 class Gradient;
 class Hatch;
+class AllSettings;
 class Bitmap;
 class BitmapReadAccess;
 class BitmapEx;
@@ -70,6 +72,7 @@ class SalLayout;
 class ImplLayoutArgs;
 class ImplFontAttributes;
 class VirtualDevice;
+class Window;
 struct SalTwoRect;
 
 namespace com {
@@ -325,7 +328,7 @@ private:
     TextAlign                   meTextAlign;
     RasterOp                    meRasterOp;
     Wallpaper                   maBackground;
-    AllSettings                 maSettings;
+    boost::scoped_ptr<AllSettings> mxSettings;
     MapMode                     maMapMode;
     Point                       maRefPoint;
     sal_uInt16                  mnAntialiasing;
@@ -1169,7 +1172,7 @@ public:
     TextAlign                   GetTextAlign() const { return maFont.GetAlign(); }
 
     virtual void                SetSettings( const AllSettings& rSettings );
-    const AllSettings&          GetSettings() const { return maSettings; }
+    const AllSettings&          GetSettings() const { return *mxSettings; }
 
     SystemGraphicsData          GetSystemGfxData() const;
     css::uno::Any               GetSystemGfxDataAny() const;
diff --git a/include/vcl/svapp.hxx b/include/vcl/svapp.hxx
index 558d528e61b3..3f86d1c54f3e 100644
--- a/include/vcl/svapp.hxx
+++ b/include/vcl/svapp.hxx
@@ -31,12 +31,14 @@
 #include <comphelper/solarmutex.hxx>
 #include <rtl/ustring.hxx>
 #include <osl/thread.hxx>
+#include <tools/gen.hxx>
 #include <tools/link.hxx>
 #include <tools/solar.h>
 #include <vcl/dllapi.h>
 #include <vcl/apptypes.hxx>
-#include <vcl/settings.hxx>
 #include <vcl/vclevent.hxx>
+#include <vcl/metric.hxx>
+#include <unotools/localedatawrapper.hxx>
 
 class BitmapEx;
 class Link;