Decrease header files dependencies

Change-Id: I654e71e56d60bf629625df09eb93b21c9ef670e8

12 files changed, 8 insertions, 15 deletions

diff --git a/vcl/generic/glyphs/glyphcache.cxx b/vcl/generic/glyphs/glyphcache.cxx
index 66dc23760ed7..bf2159ede80d 100644
--- a/vcl/generic/glyphs/glyphcache.cxx
+++ b/vcl/generic/glyphs/glyphcache.cxx
@@ -30,7 +30,6 @@
 #include <stdio.h>
 #include <stdlib.h>
 #include <math.h>
-#include <vcl/salbtype.hxx>
 #include <gcach_ftyp.hxx>
 
 #include <vcl/svapp.hxx>
diff --git a/vcl/inc/vcl/salbtype.hxx b/vcl/inc/vcl/salbtype.hxx
index 89da4a6af377..31f9f02a6be4 100644
--- a/vcl/inc/vcl/salbtype.hxx
+++ b/vcl/inc/vcl/salbtype.hxx
@@ -26,7 +26,7 @@
 #include <tools/debug.hxx>
 #include <vcl/salgtype.hxx>
 #include <tools/color.hxx>
-#include <tools/gen.hxx>
+#include <tools/helpers.hxx>
 #include <tools/solar.h>
 #include <vcl/dllapi.h>
 
diff --git a/vcl/source/app/sound.cxx b/vcl/source/app/sound.cxx
index 0a56b2c433f7..2ffc190cf399 100644
--- a/vcl/source/app/sound.cxx
+++ b/vcl/source/app/sound.cxx
@@ -18,13 +18,8 @@
  */
 
 
-#include <tools/urlobj.hxx>
-
-#include <unotools/localfilehelper.hxx>
-#include <unotools/ucbstreamhelper.hxx>
 #include <vcl/svapp.hxx>
 #include <vcl/window.hxx>
-#include <vcl/salbtype.hxx>
 #include <vcl/sound.hxx>
 
 #include <salframe.hxx>
diff --git a/vcl/source/gdi/cvtsvm.cxx b/vcl/source/gdi/cvtsvm.cxx
index c8ad028d8e1c..f4a0152b4b88 100644
--- a/vcl/source/gdi/cvtsvm.cxx
+++ b/vcl/source/gdi/cvtsvm.cxx
@@ -31,10 +31,10 @@
 #include <string.h>
 #include <tools/debug.hxx>
 #include <tools/stream.hxx>
+#include <tools/helpers.hxx>
 #include <vcl/virdev.hxx>
 #include <vcl/graph.hxx>
 #include <vcl/lineinfo.hxx>
-#include <vcl/salbtype.hxx>
 #include <vcl/cvtsvm.hxx>
 #include <rtl/strbuf.hxx>
 
diff --git a/vcl/source/gdi/impanmvw.cxx b/vcl/source/gdi/impanmvw.cxx
index df4deadfdf32..7be51d2ab264 100644
--- a/vcl/source/gdi/impanmvw.cxx
+++ b/vcl/source/gdi/impanmvw.cxx
@@ -21,7 +21,7 @@
 #include "impanmvw.hxx"
 #include <vcl/virdev.hxx>
 #include <vcl/window.hxx>
-#include <vcl/salbtype.hxx>
+#include <tools/helpers.hxx>
 
 // ----------------
 // - ImplAnimView -
diff --git a/vcl/source/gdi/impgraph.cxx b/vcl/source/gdi/impgraph.cxx
index 6762543ad23c..5d28efa9fce9 100644
--- a/vcl/source/gdi/impgraph.cxx
+++ b/vcl/source/gdi/impgraph.cxx
@@ -31,6 +31,7 @@
 #include <tools/urlobj.hxx>
 #include <tools/debug.hxx>
 #include <tools/stream.hxx>
+#include <tools/helpers.hxx>
 
 #include <ucbhelper/content.hxx>
 
@@ -40,7 +41,6 @@
 #include <vcl/virdev.hxx>
 #include <vcl/gfxlink.hxx>
 #include <vcl/cvtgrf.hxx>
-#include <vcl/salbtype.hxx>
 #include <vcl/graph.hxx>
 #include <vcl/metaact.hxx>
 
diff --git a/vcl/source/gdi/metaact.cxx b/vcl/source/gdi/metaact.cxx
index 1a25a12156ba..7cfa2bc9f0c1 100644
--- a/vcl/source/gdi/metaact.cxx
+++ b/vcl/source/gdi/metaact.cxx
@@ -31,8 +31,8 @@
 #include <string.h>
 #include <tools/stream.hxx>
 #include <tools/vcompat.hxx>
+#include <tools/helpers.hxx>
 #include <vcl/outdev.hxx>
-#include <vcl/salbtype.hxx>
 #include <vcl/metaact.hxx>
 #include <vcl/graphictools.hxx>
 #include <vcl/rendergraphicrasterizer.hxx>
diff --git a/vcl/source/gdi/print2.cxx b/vcl/source/gdi/print2.cxx
index 7280360b95e2..8e66e514157f 100644
--- a/vcl/source/gdi/print2.cxx
+++ b/vcl/source/gdi/print2.cxx
@@ -41,7 +41,6 @@
 #include <vcl/virdev.hxx>
 #include <vcl/metaact.hxx>
 #include <vcl/gdimtf.hxx>
-#include <vcl/salbtype.hxx>
 #include <vcl/print.hxx>
 #include <vcl/svapp.hxx>
 #include <vcl/bmpacc.hxx>
diff --git a/vcl/source/gdi/regband.cxx b/vcl/source/gdi/regband.cxx
index 146c38a77488..154574af54dc 100644
--- a/vcl/source/gdi/regband.cxx
+++ b/vcl/source/gdi/regband.cxx
@@ -27,8 +27,9 @@
  ************************************************************************/
 
 #include <tools/debug.hxx>
-#include <vcl/salbtype.hxx>
+#include <tools/helpers.hxx>
 #include <vcl/regband.hxx>
+#include <osl/diagnose.hxx>
 
 #include <algorithm>
 
diff --git a/vcl/source/gdi/region.cxx b/vcl/source/gdi/region.cxx
index 11eed095468b..795fc48afcd5 100644
--- a/vcl/source/gdi/region.cxx
+++ b/vcl/source/gdi/region.cxx
@@ -32,6 +32,7 @@
 #include <tools/vcompat.hxx>
 #include <tools/stream.hxx>
 #include <tools/debug.hxx>
+#include <tools/helpers.hxx>
 #include <vcl/region.hxx>
 #include <vcl/regband.hxx>
 
diff --git a/vcl/unx/generic/app/saldisp.cxx b/vcl/unx/generic/app/saldisp.cxx
index 90bdf839fcb0..e9b4ba099e6e 100644
--- a/vcl/unx/generic/app/saldisp.cxx
+++ b/vcl/unx/generic/app/saldisp.cxx
@@ -77,7 +77,6 @@ Status XineramaGetInfo(Display*, int, XRectangle*, unsigned char*, int*);
 #include <unx/salgdi.h>
 #include <unx/salframe.h>
 #include <vcl/keycodes.hxx>
-#include <vcl/salbtype.hxx>
 #include <unx/salbmp.h>
 #include <osl/mutex.h>
 #include <unx/salobj.h>
diff --git a/vcl/unx/generic/app/soicon.cxx b/vcl/unx/generic/app/soicon.cxx
index 79d9e6019035..5b062f9304e7 100644
--- a/vcl/unx/generic/app/soicon.cxx
+++ b/vcl/unx/generic/app/soicon.cxx
@@ -32,7 +32,6 @@
 #include <unx/salbmp.h>
 #include <unx/soicon.hxx>
 
-#include <vcl/salbtype.hxx>
 #include <vcl/bitmap.hxx>
 #include <vcl/bitmapex.hxx>
 #include <vcl/graph.hxx>