fix-includes.pl: sc

Change-Id: Iade3fedac5d2f8e978b7dd9c30f001d7d1564946

65 files changed, 144 insertions, 248 deletions

diff --git a/sc/inc/AccessibleFilterMenu.hxx b/sc/inc/AccessibleFilterMenu.hxx
index a78fa209a289..65da10f1e4f9 100644
--- a/sc/inc/AccessibleFilterMenu.hxx
+++ b/sc/inc/AccessibleFilterMenu.hxx
@@ -21,7 +21,7 @@
 #define INCLUDED_SC_INC_ACCESSIBLEFILTERMENU_HXX
 
 #include "AccessibleContextBase.hxx"
-#include "cppuhelper/implbase1.hxx"
+#include <cppuhelper/implbase1.hxx>
 
 #include <com/sun/star/accessibility/XAccessibleSelection.hpp>
 #include <com/sun/star/accessibility/XAccessibleText.hpp>
diff --git a/sc/inc/AccessibleFilterMenuItem.hxx b/sc/inc/AccessibleFilterMenuItem.hxx
index e01bdeca48c8..b659b47716c8 100644
--- a/sc/inc/AccessibleFilterMenuItem.hxx
+++ b/sc/inc/AccessibleFilterMenuItem.hxx
@@ -21,7 +21,7 @@
 #define INCLUDED_SC_INC_ACCESSIBLEFILTERMENUITEM_HXX
 
 #include "AccessibleContextBase.hxx"
-#include "cppuhelper/implbase1.hxx"
+#include <cppuhelper/implbase1.hxx>
 
 #include <com/sun/star/accessibility/XAccessibleAction.hpp>
 
diff --git a/sc/inc/AccessibleFilterTopWindow.hxx b/sc/inc/AccessibleFilterTopWindow.hxx
index 23039791ee8b..59831508eb2b 100644
--- a/sc/inc/AccessibleFilterTopWindow.hxx
+++ b/sc/inc/AccessibleFilterTopWindow.hxx
@@ -21,7 +21,7 @@
 #define INCLUDED_SC_INC_ACCESSIBLEFILTERTOPWINDOW_HXX
 
 #include "AccessibleFilterMenu.hxx"
-#include "cppuhelper/implbase1.hxx"
+#include <cppuhelper/implbase1.hxx>
 
 class ScCheckListMenuWindow;
 
diff --git a/sc/inc/AccessibleGlobal.hxx b/sc/inc/AccessibleGlobal.hxx
index abcc263cf53c..0df34de462be 100644
--- a/sc/inc/AccessibleGlobal.hxx
+++ b/sc/inc/AccessibleGlobal.hxx
@@ -21,7 +21,7 @@
 #define INCLUDED_SC_INC_ACCESSIBLEGLOBAL_HXX
 
 #include <com/sun/star/accessibility/XAccessibleStateSet.hpp>
-#include "cppuhelper/implbase1.hxx"
+#include <cppuhelper/implbase1.hxx>
 
 #include <set>
 
diff --git a/sc/inc/address.hxx b/sc/inc/address.hxx
index f856f3d578d5..7fcdee159da9 100644
--- a/sc/inc/address.hxx
+++ b/sc/inc/address.hxx
@@ -26,7 +26,7 @@
 
 #include <limits>
 #include "scdllapi.h"
-#include <types.hxx>
+#include "types.hxx"
 #include <formula/grammar.hxx>
 
 #include <com/sun/star/uno/Sequence.hxx>
diff --git a/sc/inc/brdcst.hxx b/sc/inc/brdcst.hxx
index 77cd7fe19460..39c0b86f7766 100644
--- a/sc/inc/brdcst.hxx
+++ b/sc/inc/brdcst.hxx
@@ -21,7 +21,7 @@
 
 #include "global.hxx"
 #include "address.hxx"
-#include <simplehintids.hxx>
+#include "simplehintids.hxx"
 #include <tools/rtti.hxx>
 #include <svl/hint.hxx>
 
diff --git a/sc/inc/calcconfig.hxx b/sc/inc/calcconfig.hxx
index df342f5d5068..33d31c749a7f 100644
--- a/sc/inc/calcconfig.hxx
+++ b/sc/inc/calcconfig.hxx
@@ -11,9 +11,9 @@
 #define INCLUDED_SC_INC_CALCCONFIG_HXX
 
 #include "scdllapi.h"
-#include "formula/grammar.hxx"
+#include <formula/grammar.hxx>
 
-#include "rtl/ustring.hxx"
+#include <rtl/ustring.hxx>
 
 // have to match the registry values
 enum ScRecalcOptions
diff --git a/sc/inc/cellform.hxx b/sc/inc/cellform.hxx
index dd82df64b598..9798dac2de55 100644
--- a/sc/inc/cellform.hxx
+++ b/sc/inc/cellform.hxx
@@ -22,7 +22,7 @@
 
 #include <tools/solar.h>
 #include "scdllapi.h"
-#include "rtl/ustring.hxx"
+#include <rtl/ustring.hxx>
 
 class SvNumberFormatter;
 class Color;
diff --git a/sc/inc/cellvalues.hxx b/sc/inc/cellvalues.hxx
index 4263250201ee..4f4c50fab4fd 100644
--- a/sc/inc/cellvalues.hxx
+++ b/sc/inc/cellvalues.hxx
@@ -10,7 +10,7 @@
 #ifndef INCLUDED_SC_INC_CELLVALUES_HXX
 #define INCLUDED_SC_INC_CELLVALUES_HXX
 
-#include <address.hxx>
+#include "address.hxx"
 
 class ScColumn;
 
diff --git a/sc/inc/clipcontext.hxx b/sc/inc/clipcontext.hxx
index e6e759721f59..7791a938fddc 100644
--- a/sc/inc/clipcontext.hxx
+++ b/sc/inc/clipcontext.hxx
@@ -11,7 +11,7 @@
 #define INCLUDED_SC_INC_CLIPCONTEXT_HXX
 
 #include "address.hxx"
-#include <cellvalue.hxx>
+#include "cellvalue.hxx"
 
 #include <vector>
 #include <boost/unordered_map.hpp>
diff --git a/sc/inc/colorscale.hxx b/sc/inc/colorscale.hxx
index 7d89c12a5c0d..6639741dced6 100644
--- a/sc/inc/colorscale.hxx
+++ b/sc/inc/colorscale.hxx
@@ -14,7 +14,7 @@
 #include <boost/scoped_ptr.hpp>
 #include <formula/grammar.hxx>
 #include <tools/color.hxx>
-#include <rangelst.hxx>
+#include "rangelst.hxx"
 #include "conditio.hxx"
 
 #include <svl/listener.hxx>
diff --git a/sc/inc/column.hxx b/sc/inc/column.hxx
index 526c8e3af598..0376d5ab2aa1 100644
--- a/sc/inc/column.hxx
+++ b/sc/inc/column.hxx
@@ -26,7 +26,7 @@
 #include "rangenam.hxx"
 #include "types.hxx"
 #include "mtvelements.hxx"
-#include "formula/types.hxx"
+#include <formula/types.hxx>
 
 #include <set>
 #include <vector>
diff --git a/sc/inc/compare.hxx b/sc/inc/compare.hxx
index f072d577c7f7..5f99ef2db4aa 100644
--- a/sc/inc/compare.hxx
+++ b/sc/inc/compare.hxx
@@ -22,7 +22,7 @@
 
 #include "queryentry.hxx"
 
-#include "svl/sharedstring.hxx"
+#include <svl/sharedstring.hxx>
 
 class ScDocument;
 
diff --git a/sc/inc/compiler.hxx b/sc/inc/compiler.hxx
index b1fa059f5f93..8ea5c770e8ce 100644
--- a/sc/inc/compiler.hxx
+++ b/sc/inc/compiler.hxx
@@ -26,8 +26,8 @@
 #include "scdllapi.h"
 #include "global.hxx"
 #include "refdata.hxx"
-#include "formula/token.hxx"
-#include "formula/grammar.hxx"
+#include <formula/token.hxx>
+#include <formula/grammar.hxx>
 #include <unotools/charclass.hxx>
 #include <rtl/ustrbuf.hxx>
 #include <com/sun/star/sheet/ExternalLinkInfo.hpp>
diff --git a/sc/inc/conditio.hxx b/sc/inc/conditio.hxx
index 2ded89313dbd..730855a7e10f 100644
--- a/sc/inc/conditio.hxx
+++ b/sc/inc/conditio.hxx
@@ -22,7 +22,7 @@
 
 #include "global.hxx"
 #include "address.hxx"
-#include "formula/grammar.hxx"
+#include <formula/grammar.hxx>
 #include "scdllapi.h"
 #include "rangelst.hxx"
 
diff --git a/sc/inc/datauno.hxx b/sc/inc/datauno.hxx
index 7f650f9836c1..e3196ba988a8 100644
--- a/sc/inc/datauno.hxx
+++ b/sc/inc/datauno.hxx
@@ -48,8 +48,8 @@
 #include <cppuhelper/implbase4.hxx>
 #include <cppuhelper/implbase5.hxx>
 #include <cppuhelper/implbase6.hxx>
-#include "svl/itemprop.hxx"
-#include "svl/lstner.hxx"
+#include <svl/itemprop.hxx>
+#include <svl/lstner.hxx>
 #include <boost/ptr_container/ptr_vector.hpp>
 
 class ScDBData;
diff --git a/sc/inc/defaultsoptions.hxx b/sc/inc/defaultsoptions.hxx
index c34e977953ba..e87f61697eba 100644
--- a/sc/inc/defaultsoptions.hxx
+++ b/sc/inc/defaultsoptions.hxx
@@ -12,7 +12,7 @@
 
 #include <svl/poolitem.hxx>
 #include <unotools/configitem.hxx>
-#include "formula/grammar.hxx"
+#include <formula/grammar.hxx>
 #include "scdllapi.h"
 #include "global.hxx"
 
diff --git a/sc/inc/docoptio.hxx b/sc/inc/docoptio.hxx
index 8d80279acc29..9e06437fb65c 100644
--- a/sc/inc/docoptio.hxx
+++ b/sc/inc/docoptio.hxx
@@ -27,7 +27,7 @@
 #include "scmod.hxx"
 #include "optutil.hxx"
 
-#include "formula/grammar.hxx"
+#include <formula/grammar.hxx>
 
 class SC_DLLPUBLIC ScDocOptions
 {
diff --git a/sc/inc/document.hxx b/sc/inc/document.hxx
index 3d8bcda3b2ca..b2516904c963 100644
--- a/sc/inc/document.hxx
+++ b/sc/inc/document.hxx
@@ -31,8 +31,8 @@
 #include "tabopparams.hxx"
 #include "sortparam.hxx"
 #include "types.hxx"
-#include "formula/grammar.hxx"
-#include "formula/types.hxx"
+#include <formula/grammar.hxx>
+#include <formula/types.hxx>
 #include <com/sun/star/chart2/XChartDocument.hpp>
 #include "typedstrdata.hxx"
 #include "compressedarray.hxx"
diff --git a/sc/inc/documentimport.hxx b/sc/inc/documentimport.hxx
index 0b2450deb7f8..4b84f0d8fe4a 100644
--- a/sc/inc/documentimport.hxx
+++ b/sc/inc/documentimport.hxx
@@ -13,7 +13,7 @@
 #include "scdllapi.h"
 #include "address.hxx"
 
-#include "rtl/ustring.hxx"
+#include <rtl/ustring.hxx>
 
 #include <boost/noncopyable.hpp>
 
diff --git a/sc/inc/dpcache.hxx b/sc/inc/dpcache.hxx
index 6129ca401485..4647227a43e8 100644
--- a/sc/inc/dpcache.hxx
+++ b/sc/inc/dpcache.hxx
@@ -22,7 +22,7 @@
 #include "global.hxx"
 #include "dpnumgroupinfo.hxx"
 #include "calcmacros.hxx"
-#include "tools/date.hxx"
+#include <tools/date.hxx>
 
 #include <boost/noncopyable.hpp>
 #include <boost/scoped_ptr.hpp>
diff --git a/sc/inc/dpfilteredcache.hxx b/sc/inc/dpfilteredcache.hxx
index 64ba5027b603..a740a929cbe8 100644
--- a/sc/inc/dpfilteredcache.hxx
+++ b/sc/inc/dpfilteredcache.hxx
@@ -20,8 +20,8 @@
 #ifndef INCLUDED_SC_INC_DPFILTEREDCACHE_HXX
 #define INCLUDED_SC_INC_DPFILTEREDCACHE_HXX
 
-#include "sal/types.h"
-#include "osl/mutex.hxx"
+#include <sal/types.h>
+#include <osl/mutex.hxx>
 #include "global.hxx"
 #include "dpitemdata.hxx"
 #include "calcmacros.hxx"
diff --git a/sc/inc/dpitemdata.hxx b/sc/inc/dpitemdata.hxx
index 6bb2502a8b13..5ab1b1ac76d3 100644
--- a/sc/inc/dpitemdata.hxx
+++ b/sc/inc/dpitemdata.hxx
@@ -13,8 +13,8 @@
 #include "scdllapi.h"
 #include "address.hxx"
 
-#include "sal/types.h"
-#include "rtl/ustring.hxx"
+#include <sal/types.h>
+#include <rtl/ustring.hxx>
 #include "calcmacros.hxx"
 #include "dpglobal.hxx"
 
diff --git a/sc/inc/dptabdat.hxx b/sc/inc/dptabdat.hxx
index 9981d856cbff..bde9dd1ac8cb 100644
--- a/sc/inc/dptabdat.hxx
+++ b/sc/inc/dptabdat.hxx
@@ -26,7 +26,7 @@
 #include "dpcache.hxx"
 #include "calcmacros.hxx"
 
-#include "svl/zforlist.hxx"
+#include <svl/zforlist.hxx>
 
 #include <vector>
 #include <set>
diff --git a/sc/inc/dptabsrc.hxx b/sc/inc/dptabsrc.hxx
index aaea244150e6..6d9d73e21028 100644
--- a/sc/inc/dptabsrc.hxx
+++ b/sc/inc/dptabsrc.hxx
@@ -44,7 +44,7 @@
 #include <cppuhelper/implbase3.hxx>
 #include <cppuhelper/implbase5.hxx>
 #include <cppuhelper/implbase6.hxx>
-#include "rtl/ref.hxx"
+#include <rtl/ref.hxx>
 
 #include "dptabdat.hxx"
 #include "dpglobal.hxx"
diff --git a/sc/inc/dptypes.hxx b/sc/inc/dptypes.hxx
index cb905119b390..7e272ff0a57f 100644
--- a/sc/inc/dptypes.hxx
+++ b/sc/inc/dptypes.hxx
@@ -10,7 +10,7 @@
 #ifndef INCLUDED_SC_INC_DPTYPES_HXX
 #define INCLUDED_SC_INC_DPTYPES_HXX
 
-#include "rtl/ustring.hxx"
+#include <rtl/ustring.hxx>
 
 #include <boost/unordered_set.hpp>
 
diff --git a/sc/inc/dputil.hxx b/sc/inc/dputil.hxx
index 6381dd41f386..002389e33b1b 100644
--- a/sc/inc/dputil.hxx
+++ b/sc/inc/dputil.hxx
@@ -10,7 +10,7 @@
 #ifndef INCLUDED_SC_INC_DPUTIL_HXX
 #define INCLUDED_SC_INC_DPUTIL_HXX
 
-#include "rtl/ustring.hxx"
+#include <rtl/ustring.hxx>
 #include "scdllapi.h"
 #include "global.hxx"
 
diff --git a/sc/inc/dragdata.hxx b/sc/inc/dragdata.hxx
index 7f98a0591b47..77f23c89db86 100644
--- a/sc/inc/dragdata.hxx
+++ b/sc/inc/dragdata.hxx
@@ -10,7 +10,7 @@
 #ifndef INCLUDED_SC_INC_DRAGDATA_HXX
 #define INCLUDED_SC_INC_DRAGDATA_HXX
 
-#include "rtl/ustring.hxx"
+#include <rtl/ustring.hxx>
 
 class ScTransferObj;
 class ScDrawTransferObj;
diff --git a/sc/inc/editdataarray.hxx b/sc/inc/editdataarray.hxx
index 21ecb8d49b9f..4eb57b990135 100644
--- a/sc/inc/editdataarray.hxx
+++ b/sc/inc/editdataarray.hxx
@@ -21,7 +21,7 @@
 #define INCLUDED_SC_INC_EDITDATAARRAY_HXX
 
 #include "address.hxx"
-#include "editeng/editobj.hxx"
+#include <editeng/editobj.hxx>
 
 #include <vector>
 #include <boost/shared_ptr.hpp>
diff --git a/sc/inc/externalrefmgr.hxx b/sc/inc/externalrefmgr.hxx
index 10e87a9d0709..00b968d1ff23 100644
--- a/sc/inc/externalrefmgr.hxx
+++ b/sc/inc/externalrefmgr.hxx
@@ -22,17 +22,17 @@
 
 #include "global.hxx"
 #include "address.hxx"
-#include "sfx2/objsh.hxx"
-#include "sfx2/lnkbase.hxx"
-#include "sfx2/event.hxx"
-#include "tools/time.hxx"
-#include "vcl/timer.hxx"
-#include "svl/zforlist.hxx"
-#include "svl/lstner.hxx"
+#include <sfx2/objsh.hxx>
+#include <sfx2/lnkbase.hxx>
+#include <sfx2/event.hxx>
+#include <tools/time.hxx>
+#include <vcl/timer.hxx>
+#include <svl/zforlist.hxx>
+#include <svl/lstner.hxx>
 #include "types.hxx"
 #include "rangelst.hxx"
-#include "formula/token.hxx"
-#include "osl/mutex.hxx"
+#include <formula/token.hxx>
+#include <osl/mutex.hxx>
 
 #include <boost/unordered_map.hpp>
 #include <boost/unordered_set.hpp>
diff --git a/sc/inc/formulagroup.hxx b/sc/inc/formulagroup.hxx
index de10a461cfbe..a063cdfa3143 100644
--- a/sc/inc/formulagroup.hxx
+++ b/sc/inc/formulagroup.hxx
@@ -13,9 +13,9 @@
 #include "address.hxx"
 #include "types.hxx"
 #include "platforminfo.hxx"
-#include <stlalgorithm.hxx>
+#include "stlalgorithm.hxx"
 
-#include "svl/sharedstringpool.hxx"
+#include <svl/sharedstringpool.hxx>
 
 #include <vector>
 #include <boost/noncopyable.hpp>
diff --git a/sc/inc/formulaopt.hxx b/sc/inc/formulaopt.hxx
index 4e195abbecf8..906804efee84 100644
--- a/sc/inc/formulaopt.hxx
+++ b/sc/inc/formulaopt.hxx
@@ -14,7 +14,7 @@
 #include <svl/poolitem.hxx>
 #include <unotools/configitem.hxx>
 #include <unotools/localedatawrapper.hxx>
-#include "formula/grammar.hxx"
+#include <formula/grammar.hxx>
 #include "scdllapi.h"
 #include "global.hxx"
 #include "calcconfig.hxx"
diff --git a/sc/inc/helpids.h b/sc/inc/helpids.h
index b5303e221803..26465041bf3a 100644
--- a/sc/inc/helpids.h
+++ b/sc/inc/helpids.h
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#include "sfx2/sfxcommands.h"
-#include "svx/svxcommands.h"
+#include <sfx2/sfxcommands.h>
+#include <svx/svxcommands.h>
 #include "sccommands.h"
 
 #define HID_INSWIN_POS                                          "SC_HID_INSWIN_POS"
diff --git a/sc/inc/importfilterdata.hxx b/sc/inc/importfilterdata.hxx
index 9144f9d4c9ef..089f427d2bfc 100644
--- a/sc/inc/importfilterdata.hxx
+++ b/sc/inc/importfilterdata.hxx
@@ -10,7 +10,7 @@
 #ifndef INCLUDED_SC_INC_IMPORTFILTERDATA_HXX
 #define INCLUDED_SC_INC_IMPORTFILTERDATA_HXX
 
-#include <address.hxx>
+#include "address.hxx"
 
 #include <boost/noncopyable.hpp>
 #include <boost/scoped_ptr.hpp>
diff --git a/sc/inc/lookupcache.hxx b/sc/inc/lookupcache.hxx
index 88f5f0b954c8..411ae6c54763 100644
--- a/sc/inc/lookupcache.hxx
+++ b/sc/inc/lookupcache.hxx
@@ -22,7 +22,7 @@
 
 #include "address.hxx"
 #include "global.hxx"
-#include "formula/token.hxx"
+#include <formula/token.hxx>
 #include <svl/listener.hxx>
 
 #include <boost/unordered_map.hpp>
diff --git a/sc/inc/macromgr.hxx b/sc/inc/macromgr.hxx
index 2c7c30eba452..ecbf08f30c0a 100644
--- a/sc/inc/macromgr.hxx
+++ b/sc/inc/macromgr.hxx
@@ -12,7 +12,7 @@
 
 #include <com/sun/star/container/XContainerListener.hpp>
 
-#include "rtl/ustring.hxx"
+#include <rtl/ustring.hxx>
 #include "scdllapi.h"
 
 #include <boost/unordered_map.hpp>
diff --git a/sc/inc/mtvelements.hxx b/sc/inc/mtvelements.hxx
index 836e6dd1b13c..b09f70dc5dbb 100644
--- a/sc/inc/mtvelements.hxx
+++ b/sc/inc/mtvelements.hxx
@@ -12,12 +12,12 @@
 
 #include "address.hxx"
 #include "formulacell.hxx"
-#include "svl/broadcast.hxx"
-#include "svl/sharedstring.hxx"
-#include "editeng/editobj.hxx"
+#include <svl/broadcast.hxx>
+#include <svl/sharedstring.hxx>
+#include <editeng/editobj.hxx>
 #include "calcmacros.hxx"
 #include "postit.hxx"
-#include "osl/mutex.hxx"
+#include <osl/mutex.hxx>
 
 #if DEBUG_COLUMN_STORAGE
 #ifdef NDEBUG
diff --git a/sc/inc/nameuno.hxx b/sc/inc/nameuno.hxx
index a92f894cebfa..1c76955da094 100644
--- a/sc/inc/nameuno.hxx
+++ b/sc/inc/nameuno.hxx
@@ -22,7 +22,7 @@
 
 #include <svl/lstner.hxx>
 #include "address.hxx"
-#include "formula/grammar.hxx"
+#include <formula/grammar.hxx>
 #include <com/sun/star/sheet/XLabelRange.hpp>
 #include <com/sun/star/sheet/XLabelRanges.hpp>
 #include <com/sun/star/sheet/XCellRangeReferrer.hpp>
diff --git a/sc/inc/orcusfilters.hxx b/sc/inc/orcusfilters.hxx
index 79aec8bca486..2df40a6f6fb5 100644
--- a/sc/inc/orcusfilters.hxx
+++ b/sc/inc/orcusfilters.hxx
@@ -10,7 +10,7 @@
 #ifndef INCLUDED_SC_INC_ORCUSFILTERS_HXX
 #define INCLUDED_SC_INC_ORCUSFILTERS_HXX
 
-#include "rtl/ustring.hxx"
+#include <rtl/ustring.hxx>
 
 class ScDocument;
 class SvTreeListBox;
diff --git a/sc/inc/orcusxml.hxx b/sc/inc/orcusxml.hxx
index 6ff9190311a5..cc41f3b6c3e0 100644
--- a/sc/inc/orcusxml.hxx
+++ b/sc/inc/orcusxml.hxx
@@ -12,7 +12,7 @@
 
 #include "scdllapi.h"
 #include "address.hxx"
-#include "vcl/image.hxx"
+#include <vcl/image.hxx>
 
 #include <vector>
 #include <boost/ptr_container/ptr_vector.hpp>
diff --git a/sc/inc/pch/precompiled_sc.hxx b/sc/inc/pch/precompiled_sc.hxx
index 8e32152a07ee..fec06222d76f 100644
--- a/sc/inc/pch/precompiled_sc.hxx
+++ b/sc/inc/pch/precompiled_sc.hxx
@@ -14,104 +14,7 @@
  also fixes all possible problems, so it's usually better to use it).
 */
 
-#include "basegfx/matrix/b2dhommatrix.hxx"
-#include "basegfx/polygon/b2dpolygon.hxx"
-#include "basegfx/polygon/b2dpolygontools.hxx"
-#include "basegfx/range/b2drange.hxx"
-#include "basic/basmgr.hxx"
-#include "comphelper/processfactory.hxx"
-#include "comphelper/string.hxx"
-#include "cppuhelper/implbase1.hxx"
-#include "drawinglayer/primitive2d/baseprimitive2d.hxx"
-#include "drawinglayer/primitive2d/polypolygonprimitive2d.hxx"
-#include "editeng/autokernitem.hxx"
-#include "editeng/charreliefitem.hxx"
-#include "editeng/charscaleitem.hxx"
-#include "editeng/colritem.hxx"
-#include "editeng/contouritem.hxx"
-#include "editeng/crossedoutitem.hxx"
-#include "editeng/editdata.hxx"
-#include "editeng/editobj.hxx"
-#include "editeng/editstat.hxx"
-#include "editeng/eeitem.hxx"
-#include "editeng/emphasismarkitem.hxx"
-#include "editeng/escapementitem.hxx"
-#include "editeng/fhgtitem.hxx"
-#include "editeng/fieldupdater.hxx"
-#include "editeng/flditem.hxx"
-#include "editeng/fontitem.hxx"
-#include "editeng/kernitem.hxx"
-#include "editeng/langitem.hxx"
-#include "editeng/misspellrange.hxx"
-#include "editeng/outliner.hxx"
-#include "editeng/postitem.hxx"
-#include "editeng/section.hxx"
-#include "editeng/shdditem.hxx"
-#include "editeng/udlnitem.hxx"
-#include "editeng/unoedsrc.hxx"
-#include "editeng/unolingu.hxx"
-#include "editeng/wghtitem.hxx"
-#include "editeng/wrlmitem.hxx"
-#include "editeng/xmlcnitm.hxx"
-#include "formula/FormulaCompiler.hxx"
-#include "formula/errorcodes.hxx"
-#include "formula/grammar.hxx"
-#include "formula/opcode.hxx"
-#include "formula/token.hxx"
-#include "formula/vectortoken.hxx"
-#include "i18nlangtag/lang.h"
-#include "i18nlangtag/mslangid.hxx"
 #include "libxml/xpath.h"
-#include "rtl/bootstrap.hxx"
-#include "rtl/math.hxx"
-#include "rtl/strbuf.hxx"
-#include "rtl/ustring.hxx"
-#include "sal/types.h"
-#include "sfx2/app.hxx"
-#include "sfx2/docfile.hxx"
-#include "sfx2/docfilt.hxx"
-#include "sfx2/fcontnr.hxx"
-#include "sfx2/linkmgr.hxx"
-#include "sfx2/objsh.hxx"
-#include "svl/PasswordHelper.hxx"
-#include "svl/broadcast.hxx"
-#include "svl/intitem.hxx"
-#include "svl/itemset.hxx"
-#include "svl/sharedstring.hxx"
-#include "svl/sharedstringpool.hxx"
-#include "svl/smplhint.hxx"
-#include "svl/stritem.hxx"
-#include "svl/urihelper.hxx"
-#include "svl/zforlist.hxx"
-#include "svl/zformat.hxx"
-#include "svtools/fmtfield.hxx"
-#include "svtools/svlbitm.hxx"
-#include "svtools/treelistbox.hxx"
-#include "svtools/treelistentry.hxx"
-#include "svtools/viewdataentry.hxx"
-#include "svx/dataaccessdescriptor.hxx"
-#include "svx/sdr/overlay/overlaymanager.hxx"
-#include "svx/unoapi.hxx"
-#include "tools/color.hxx"
-#include "tools/fract.hxx"
-#include "tools/gen.hxx"
-#include "tools/urlobj.hxx"
-#include "unotools/calendarwrapper.hxx"
-#include "unotools/collatorwrapper.hxx"
-#include "unotools/localedatawrapper.hxx"
-#include "unotools/localfilehelper.hxx"
-#include "unotools/pathoptions.hxx"
-#include "unotools/textsearch.hxx"
-#include "unotools/ucbhelper.hxx"
-#include "vcl/lineinfo.hxx"
-#include "vcl/msgbox.hxx"
-#include "vcl/outdev.hxx"
-#include "vcl/svapp.hxx"
-#include "vcl/unohelp.hxx"
-#include "vcl/waitobj.hxx"
-#include "xmloff/nmspmap.hxx"
-#include "xmloff/prstylei.hxx"
-#include "xmloff/xmlnmspe.hxx"
 #include <algorithm>
 #include <avmedia/mediaitem.hxx>
 #include <avmedia/mediaplayer.hxx>
@@ -121,6 +24,7 @@
 #include <basegfx/point/b2dpoint.hxx>
 #include <basegfx/polygon/b2dpolygon.hxx>
 #include <basegfx/polygon/b2dpolygontools.hxx>
+#include <basegfx/range/b2drange.hxx>
 #include <basegfx/tools/zoomtools.hxx>
 #include <basic/basmgr.hxx>
 #include <basic/sbmeth.hxx>
@@ -526,6 +430,7 @@
 #include <cppuhelper/bootstrap.hxx>
 #include <cppuhelper/component_context.hxx>
 #include <cppuhelper/factory.hxx>
+#include <cppuhelper/implbase1.hxx>
 #include <cppuhelper/implbase2.hxx>
 #include <cppuhelper/supportsservice.hxx>
 #include <cstddef>
@@ -534,6 +439,8 @@
 #include <cstring>
 #include <ctype.h>
 #include <drawinglayer/geometry/viewinformation2d.hxx>
+#include <drawinglayer/primitive2d/baseprimitive2d.hxx>
+#include <drawinglayer/primitive2d/polypolygonprimitive2d.hxx>
 #include <drawinglayer/processor2d/baseprocessor2d.hxx>
 #include <drawinglayer/processor2d/processorfromoutputdevice.hxx>
 #include <editeng/acorrcfg.hxx>
@@ -543,6 +450,7 @@
 #include <editeng/boxitem.hxx>
 #include <editeng/brushitem.hxx>
 #include <editeng/charreliefitem.hxx>
+#include <editeng/charscaleitem.hxx>
 #include <editeng/colritem.hxx>
 #include <editeng/contouritem.hxx>
 #include <editeng/crossedoutitem.hxx>
@@ -555,6 +463,7 @@
 #include <editeng/emphasismarkitem.hxx>
 #include <editeng/escapementitem.hxx>
 #include <editeng/fhgtitem.hxx>
+#include <editeng/fieldupdater.hxx>
 #include <editeng/flditem.hxx>
 #include <editeng/flstitem.hxx>
 #include <editeng/fontitem.hxx>
@@ -571,6 +480,7 @@
 #include <editeng/lineitem.hxx>
 #include <editeng/lrspitem.hxx>
 #include <editeng/lspcitem.hxx>
+#include <editeng/misspellrange.hxx>
 #include <editeng/numitem.hxx>
 #include <editeng/orphitem.hxx>
 #include <editeng/outliner.hxx>
@@ -580,6 +490,7 @@
 #include <editeng/postitem.hxx>
 #include <editeng/scriptspaceitem.hxx>
 #include <editeng/scripttypeitem.hxx>
+#include <editeng/section.hxx>
 #include <editeng/shaditem.hxx>
 #include <editeng/shdditem.hxx>
 #include <editeng/sizeitem.hxx>
@@ -590,6 +501,7 @@
 #include <editeng/udlnitem.hxx>
 #include <editeng/ulspitem.hxx>
 #include <editeng/unoedhlp.hxx>
+#include <editeng/unoedsrc.hxx>
 #include <editeng/unofield.hxx>
 #include <editeng/unofored.hxx>
 #include <editeng/unoipset.hxx>
@@ -603,10 +515,12 @@
 #include <editeng/wrlmitem.hxx>
 #include <editeng/xmlcnitm.hxx>
 #include <float.h>
+#include <formula/FormulaCompiler.hxx>
 #include <formula/IFunctionDescription.hxx>
 #include <formula/errorcodes.hxx>
 #include <formula/formulahelper.hxx>
 #include <formula/grammar.hxx>
+#include <formula/opcode.hxx>
 #include <formula/token.hxx>
 #include <formula/vectortoken.hxx>
 #include <functional>
@@ -638,6 +552,7 @@
 #include <osl/time.h>
 #include <queue>
 #include <rsc/rscsfx.hxx>
+#include <rtl/bootstrap.hxx>
 #include <rtl/crc.h>
 #include <rtl/instance.hxx>
 #include <rtl/math.hxx>
@@ -739,6 +654,7 @@
 #include <svl/ptitem.hxx>
 #include <svl/rectitem.hxx>
 #include <svl/sharecontrolfile.hxx>
+#include <svl/sharedstring.hxx>
 #include <svl/sharedstringpool.hxx>
 #include <svl/slstitm.hxx>
 #include <svl/smplhint.hxx>
@@ -758,6 +674,7 @@
 #include <svtools/ehdl.hxx>
 #include <svtools/embedhlp.hxx>
 #include <svtools/embedtransfer.hxx>
+#include <svtools/fmtfield.hxx>
 #include <svtools/imapobj.hxx>
 #include <svtools/inettbc.hxx>
 #include <svtools/insdlg.hxx>
@@ -775,6 +692,7 @@
 #include <svtools/treelistentry.hxx>
 #include <svtools/unoevent.hxx>
 #include <svtools/unoimap.hxx>
+#include <svtools/viewdataentry.hxx>
 #include <svtools/xwindowitem.hxx>
 #include <svx/AccessibleControlShape.hxx>
 #include <svx/AccessibleShape.hxx>
@@ -947,10 +865,12 @@
 #include <toolkit/awt/vclxdevice.hxx>
 #include <toolkit/helper/convert.hxx>
 #include <toolkit/helper/vclunohelper.hxx>
+#include <tools/color.hxx>
 #include <tools/date.hxx>
 #include <tools/datetime.hxx>
 #include <tools/debug.hxx>
 #include <tools/diagnose_ex.h>
+#include <tools/fract.hxx>
 #include <tools/gen.hxx>
 #include <tools/globname.hxx>
 #include <tools/mempool.hxx>
@@ -991,6 +911,7 @@
 #include <unotools/tempfile.hxx>
 #include <unotools/textsearch.hxx>
 #include <unotools/transliterationwrapper.hxx>
+#include <unotools/ucbhelper.hxx>
 #include <unotools/ucbstreamhelper.hxx>
 #include <unotools/useroptions.hxx>
 #include <utility>
@@ -1043,6 +964,7 @@
 #include <xmloff/i18nmap.hxx>
 #include <xmloff/nmspmap.hxx>
 #include <xmloff/numehelp.hxx>
+#include <xmloff/prstylei.hxx>
 #include <xmloff/txtparae.hxx>
 #include <xmloff/txtprmap.hxx>
 #include <xmloff/xmlaustp.hxx>
@@ -1059,5 +981,4 @@
 #include <xmloff/xmltoken.hxx>
 #include <xmloff/xmltypes.hxx>
 #include <xmloff/xmluconv.hxx>
-
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sc/inc/pch/precompiled_scfilt.hxx b/sc/inc/pch/precompiled_scfilt.hxx
index aaad32c2b621..08f8d64fae39 100644
--- a/sc/inc/pch/precompiled_scfilt.hxx
+++ b/sc/inc/pch/precompiled_scfilt.hxx
@@ -14,54 +14,7 @@
  also fixes all possible problems, so it's usually better to use it).
 */
 
-#include "cppuhelper/factory.hxx"
-#include "cppuhelper/implementationentry.hxx"
-#include "editeng/editstat.hxx"
-#include "formula/errorcodes.hxx"
 #include "officecfg/Office/Common.hxx"
-#include "oox/core/filterbase.hxx"
-#include "oox/core/relations.hxx"
-#include "oox/core/xmlfilterbase.hxx"
-#include "oox/drawingml/chart/datasourcemodel.hxx"
-#include "oox/drawingml/connectorshapecontext.hxx"
-#include "oox/drawingml/fillproperties.hxx"
-#include "oox/drawingml/graphicshapecontext.hxx"
-#include "oox/drawingml/lineproperties.hxx"
-#include "oox/drawingml/shapepropertymap.hxx"
-#include "oox/drawingml/theme.hxx"
-#include "oox/drawingml/themefragmenthandler.hxx"
-#include "oox/helper/attributelist.hxx"
-#include "oox/helper/binaryinputstream.hxx"
-#include "oox/helper/binaryoutputstream.hxx"
-#include "oox/helper/containerhelper.hxx"
-#include "oox/helper/graphichelper.hxx"
-#include "oox/helper/helper.hxx"
-#include "oox/helper/progressbar.hxx"
-#include "oox/helper/propertymap.hxx"
-#include "oox/helper/propertyset.hxx"
-#include "oox/ole/olestorage.hxx"
-#include "oox/ole/vbaproject.hxx"
-#include "oox/token/properties.hxx"
-#include "oox/token/tokens.hxx"
-#include "oox/vml/vmlshape.hxx"
-#include "oox/vml/vmlshapecontainer.hxx"
-#include "rtl/strbuf.hxx"
-#include "sal/config.h"
-#include "sal/types.h"
-#include "svl/poolcach.hxx"
-#include "svl/sharedstring.hxx"
-#include "svl/sharedstringpool.hxx"
-#include "svx/algitem.hxx"
-#include "svx/sdr/properties/properties.hxx"
-#include "svx/sdtaitm.hxx"
-#include "svx/sxmspitm.hxx"
-#include "svx/unoapi.hxx"
-#include "svx/xflclit.hxx"
-#include "svx/xlnstit.hxx"
-#include "svx/xlnstwit.hxx"
-#include "tools/urlobj.hxx"
-#include "vcl/mapmod.hxx"
-#include "vcl/msgbox.hxx"
 #include <algorithm>
 #include <basegfx/point/b2dpoint.hxx>
 #include <basegfx/polygon/b2dpolygon.hxx>
@@ -341,7 +294,9 @@
 #include <comphelper/types.hxx>
 #include <config_orcus.h>
 #include <cppuhelper/component_context.hxx>
+#include <cppuhelper/factory.hxx>
 #include <cppuhelper/implbase1.hxx>
+#include <cppuhelper/implementationentry.hxx>
 #include <cppuhelper/supportsservice.hxx>
 #include <cstring>
 #include <ctype.h>
@@ -388,6 +343,7 @@
 #include <filter/msfilter/msvbahelper.hxx>
 #include <filter/msfilter/svxmsbas.hxx>
 #include <filter/msfilter/util.hxx>
+#include <formula/errorcodes.hxx>
 #include <formula/grammar.hxx>
 #include <fstream>
 #include <iostream>
@@ -403,14 +359,28 @@
 #include <oox/core/contexthandler.hxx>
 #include <oox/core/fastparser.hxx>
 #include <oox/core/filterbase.hxx>
+#include <oox/core/relations.hxx>
 #include <oox/core/xmlfilterbase.hxx>
+#include <oox/drawingml/chart/datasourcemodel.hxx>
+#include <oox/drawingml/connectorshapecontext.hxx>
+#include <oox/drawingml/fillproperties.hxx>
+#include <oox/drawingml/graphicshapecontext.hxx>
+#include <oox/drawingml/lineproperties.hxx>
+#include <oox/drawingml/shapepropertymap.hxx>
+#include <oox/drawingml/theme.hxx>
+#include <oox/drawingml/themefragmenthandler.hxx>
 #include <oox/export/chartexport.hxx>
 #include <oox/export/drawingml.hxx>
 #include <oox/export/shapes.hxx>
 #include <oox/export/utils.hxx>
 #include <oox/export/vmlexport.hxx>
 #include <oox/helper/attributelist.hxx>
+#include <oox/helper/binaryinputstream.hxx>
+#include <oox/helper/binaryoutputstream.hxx>
 #include <oox/helper/containerhelper.hxx>
+#include <oox/helper/graphichelper.hxx>
+#include <oox/helper/helper.hxx>
+#include <oox/helper/progressbar.hxx>
 #include <oox/helper/propertymap.hxx>
 #include <oox/helper/propertyset.hxx>
 #include <oox/ole/olehelper.hxx>
@@ -418,6 +388,8 @@
 #include <oox/ole/vbaproject.hxx>
 #include <oox/token/properties.hxx>
 #include <oox/token/tokens.hxx>
+#include <oox/vml/vmlshape.hxx>
+#include <oox/vml/vmlshapecontainer.hxx>
 #include <osl/conditn.hxx>
 #include <osl/diagnose.h>
 #include <osl/endian.h>
@@ -437,6 +409,7 @@
 #include <sal/log.hxx>
 #include <sal/macros.h>
 #include <sal/mathconf.h>
+#include <sal/types.h>
 #include <salhelper/thread.hxx>
 #include <sax/fshelper.hxx>
 #include <sax/tools/converter.hxx>
@@ -463,7 +436,9 @@
 #include <svl/itempool.hxx>
 #include <svl/itemset.hxx>
 #include <svl/languageoptions.hxx>
+#include <svl/poolcach.hxx>
 #include <svl/poolitem.hxx>
+#include <svl/sharedstring.hxx>
 #include <svl/sharedstringpool.hxx>
 #include <svl/stritem.hxx>
 #include <svl/style.hxx>
@@ -488,6 +463,7 @@
 #include <svx/pageitem.hxx>
 #include <svx/rotmodit.hxx>
 #include <svx/sdasitm.hxx>
+#include <svx/sdr/properties/properties.hxx>
 #include <svx/sdtaitm.hxx>
 #include <svx/svdattr.hxx>
 #include <svx/svditer.hxx>
@@ -505,6 +481,7 @@
 #include <svx/svdpage.hxx>
 #include <svx/svdpool.hxx>
 #include <svx/svdxcgv.hxx>
+#include <svx/sxmspitm.hxx>
 #include <svx/unoapi.hxx>
 #include <svx/unomid.hxx>
 #include <svx/xbitmap.hxx>
@@ -515,6 +492,8 @@
 #include <svx/xfltrit.hxx>
 #include <svx/xlineit.hxx>
 #include <svx/xlinjoit.hxx>
+#include <svx/xlnstit.hxx>
+#include <svx/xlnstwit.hxx>
 #include <svx/xlntrit.hxx>
 #include <svx/xoutbmp.hxx>
 #include <toolkit/helper/vclunohelper.hxx>
@@ -546,6 +525,8 @@
 #include <vcl/font.hxx>
 #include <vcl/graph.hxx>
 #include <vcl/graphicfilter.hxx>
+#include <vcl/mapmod.hxx>
+#include <vcl/msgbox.hxx>
 #include <vcl/outdev.hxx>
 #include <vcl/settings.hxx>
 #include <vcl/svapp.hxx>
@@ -553,5 +534,4 @@
 #include <vcl/virdev.hxx>
 #include <vcl/wmf.hxx>
 #include <vector>
-
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sc/inc/pch/precompiled_scopencl.hxx b/sc/inc/pch/precompiled_scopencl.hxx
index 23d754ff50f0..82714668d2fa 100644
--- a/sc/inc/pch/precompiled_scopencl.hxx
+++ b/sc/inc/pch/precompiled_scopencl.hxx
@@ -14,14 +14,13 @@
  also fixes all possible problems, so it's usually better to use it).
 */
 
-#include "formula/vectortoken.hxx"
-#include "sal/config.h"
 #include <algorithm>
 #include <boost/scoped_array.hpp>
 #include <boost/scoped_ptr.hpp>
 #include <cmath>
 #include <config_folders.h>
 #include <float.h>
+#include <formula/vectortoken.hxx>
 #include <iostream>
 #include <list>
 #include <map>
@@ -31,6 +30,7 @@
 #include <rtl/digest.h>
 #include <rtl/strbuf.hxx>
 #include <rtl/ustring.hxx>
+#include <sal/config.h>
 #include <sstream>
 #include <stdio.h>
 #include <stdlib.h>
diff --git a/sc/inc/pch/precompiled_scui.hxx b/sc/inc/pch/precompiled_scui.hxx
index 0b69759f71a8..42b3f846eb60 100644
--- a/sc/inc/pch/precompiled_scui.hxx
+++ b/sc/inc/pch/precompiled_scui.hxx
@@ -14,17 +14,6 @@
  also fixes all possible problems, so it's usually better to use it).
 */
 
-#include "formula/grammar.hxx"
-#include "formula/opcode.hxx"
-#include "rtl/ustrbuf.hxx"
-#include "sal/types.h"
-#include "svl/sharedstringpool.hxx"
-#include "svtools/svlbitm.hxx"
-#include "svtools/treelistentry.hxx"
-#include "vcl/msgbox.hxx"
-#include "vcl/settings.hxx"
-#include "vcl/svapp.hxx"
-#include "vcl/window.hxx"
 #include <basic/sbmeth.hxx>
 #include <basic/sbmod.hxx>
 #include <basic/sbstar.hxx>
@@ -66,12 +55,16 @@
 #include <editeng/shdditem.hxx>
 #include <editeng/udlnitem.hxx>
 #include <editeng/wghtitem.hxx>
+#include <formula/grammar.hxx>
+#include <formula/opcode.hxx>
 #include <i18nlangtag/languagetag.hxx>
 #include <limits.h>
 #include <math.h>
 #include <osl/thread.h>
 #include <rtl/math.hxx>
 #include <rtl/tencinfo.h>
+#include <rtl/ustrbuf.hxx>
+#include <sal/types.h>
 #include <sfx2/app.hxx>
 #include <sfx2/basedlgs.hxx>
 #include <sfx2/childwin.hxx>
@@ -88,12 +81,15 @@
 #include <svl/cjkoptions.hxx>
 #include <svl/eitem.hxx>
 #include <svl/intitem.hxx>
+#include <svl/sharedstringpool.hxx>
 #include <svl/stritem.hxx>
 #include <svl/style.hxx>
 #include <svl/zforlist.hxx>
 #include <svtools/collatorres.hxx>
 #include <svtools/ehdl.hxx>
 #include <svtools/sfxecode.hxx>
+#include <svtools/svlbitm.hxx>
+#include <svtools/treelistentry.hxx>
 #include <svx/algitem.hxx>
 #include <svx/dlgutil.hxx>
 #include <svx/drawitem.hxx>
@@ -116,6 +112,6 @@
 #include <vcl/settings.hxx>
 #include <vcl/svapp.hxx>
 #include <vcl/waitobj.hxx>
+#include <vcl/window.hxx>
 #include <vector>
-
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sc/inc/pch/precompiled_vbaobj.hxx b/sc/inc/pch/precompiled_vbaobj.hxx
index 679b85db1a11..867fec2e460d 100644
--- a/sc/inc/pch/precompiled_vbaobj.hxx
+++ b/sc/inc/pch/precompiled_vbaobj.hxx
@@ -14,10 +14,6 @@
  also fixes all possible problems, so it's usually better to use it).
 */
 
-#include "com/sun/star/lang/XMultiServiceFactory.hpp"
-#include "com/sun/star/registry/XRegistryKey.hpp"
-#include "comphelper/servicedecl.hxx"
-#include "cppuhelper/implementationentry.hxx"
 #include <algorithm>
 #include <basic/sberrors.hxx>
 #include <basic/sbmeth.hxx>
@@ -88,8 +84,10 @@
 #include <com/sun/star/lang/IndexOutOfBoundsException.hpp>
 #include <com/sun/star/lang/XComponent.hpp>
 #include <com/sun/star/lang/XMultiComponentFactory.hpp>
+#include <com/sun/star/lang/XMultiServiceFactory.hpp>
 #include <com/sun/star/lang/XServiceInfo.hpp>
 #include <com/sun/star/reflection/XIdlMethod.hpp>
+#include <com/sun/star/registry/XRegistryKey.hpp>
 #include <com/sun/star/script/ArrayWrapper.hpp>
 #include <com/sun/star/script/BasicErrorException.hpp>
 #include <com/sun/star/script/ModuleInfo.hpp>
@@ -203,6 +201,7 @@
 #include <com/sun/star/xml/AttributeData.hpp>
 #include <comphelper/anytostring.hxx>
 #include <comphelper/processfactory.hxx>
+#include <comphelper/servicedecl.hxx>
 #include <comphelper/servicehelper.hxx>
 #include <comphelper/unwrapargs.hxx>
 #include <cppuhelper/bootstrap.hxx>
@@ -210,6 +209,7 @@
 #include <cppuhelper/implbase1.hxx>
 #include <cppuhelper/implbase3.hxx>
 #include <cppuhelper/implbase4.hxx>
+#include <cppuhelper/implementationentry.hxx>
 #include <cppuhelper/queryinterface.hxx>
 #include <filter/msfilter/msvbahelper.hxx>
 #include <filter/msfilter/util.hxx>
@@ -327,5 +327,4 @@
 #include <vcl/window.hxx>
 #include <vcl/wrkwin.hxx>
 #include <vector>
-
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sc/inc/queryentry.hxx b/sc/inc/queryentry.hxx
index a39e87e43856..1c3a067a3f6f 100644
--- a/sc/inc/queryentry.hxx
+++ b/sc/inc/queryentry.hxx
@@ -22,7 +22,7 @@
 
 #include "address.hxx"
 #include "global.hxx"
-#include "svl/sharedstring.hxx"
+#include <svl/sharedstring.hxx>
 
 #include <vector>
 
diff --git a/sc/inc/rangenam.hxx b/sc/inc/rangenam.hxx
index dbf7eb47e7eb..5d782e99e525 100644
--- a/sc/inc/rangenam.hxx
+++ b/sc/inc/rangenam.hxx
@@ -22,7 +22,7 @@
 
 #include "global.hxx"
 #include "address.hxx"
-#include "formula/grammar.hxx"
+#include <formula/grammar.hxx>
 #include "scdllapi.h"
 #include "calcmacros.hxx"
 
diff --git a/sc/inc/refhint.hxx b/sc/inc/refhint.hxx
index 9ded863d5f98..1f927312327b 100644
--- a/sc/inc/refhint.hxx
+++ b/sc/inc/refhint.hxx
@@ -10,8 +10,8 @@
 #ifndef INCLUDED_SC_INC_REFHINT_HXX
 #define INCLUDED_SC_INC_REFHINT_HXX
 
-#include <address.hxx>
-#include <simplehintids.hxx>
+#include "address.hxx"
+#include "simplehintids.hxx"
 
 namespace sc {
 
diff --git a/sc/inc/refreshtimer.hxx b/sc/inc/refreshtimer.hxx
index c392b9c939a3..0c1726db4ee1 100644
--- a/sc/inc/refreshtimer.hxx
+++ b/sc/inc/refreshtimer.hxx
@@ -22,7 +22,7 @@
 
 #include <vcl/timer.hxx>
 #include <osl/mutex.hxx>
-#include <scdllapi.h>
+#include "scdllapi.h"
 
 class ScRefreshTimerControl
 {
diff --git a/sc/inc/rowheightcontext.hxx b/sc/inc/rowheightcontext.hxx
index 50d2109a54c4..21e9ee4e9e09 100644
--- a/sc/inc/rowheightcontext.hxx
+++ b/sc/inc/rowheightcontext.hxx
@@ -10,7 +10,7 @@
 #ifndef INCLUDED_SC_INC_ROWHEIGHTCONTEXT_HXX
 #define INCLUDED_SC_INC_ROWHEIGHTCONTEXT_HXX
 
-#include <scdllapi.h>
+#include "scdllapi.h"
 
 #include <tools/fract.hxx>
 
diff --git a/sc/inc/scabstdlg.hxx b/sc/inc/scabstdlg.hxx
index 3ac772a91369..2028a0105e02 100644
--- a/sc/inc/scabstdlg.hxx
+++ b/sc/inc/scabstdlg.hxx
@@ -28,7 +28,7 @@
 #include "sc.hrc"
 #include "global.hxx"
 #include "pivot.hxx"
-#include "i18nlangtag/lang.h"
+#include <i18nlangtag/lang.h>
 #include "asciiopt.hxx"
 
 #include <tabvwsh.hxx>
diff --git a/sc/inc/scdllapi.h b/sc/inc/scdllapi.h
index 83c3feafe475..2e88ef197444 100644
--- a/sc/inc/scdllapi.h
+++ b/sc/inc/scdllapi.h
@@ -20,7 +20,7 @@
 #ifndef INCLUDED_SC_INC_SCDLLAPI_H
 #define INCLUDED_SC_INC_SCDLLAPI_H
 
-#include "sal/types.h"
+#include <sal/types.h>
 
 #if defined(SC_DLLIMPLEMENTATION)
 #define SC_DLLPUBLIC  SAL_DLLPUBLIC_EXPORT
diff --git a/sc/inc/scmatrix.hxx b/sc/inc/scmatrix.hxx
index 26bb20fb86a6..1eab349abc1d 100644
--- a/sc/inc/scmatrix.hxx
+++ b/sc/inc/scmatrix.hxx
@@ -22,10 +22,10 @@
 
 #include "global.hxx"
 #include "types.hxx"
-#include "formula/errorcodes.hxx"
+#include <formula/errorcodes.hxx>
 #include "scdllapi.h"
 #include <rtl/ustring.hxx>
-#include "svl/sharedstring.hxx"
+#include <svl/sharedstring.hxx>
 
 #include <boost/intrusive_ptr.hpp>
 #include <boost/interprocess/smart_ptr/unique_ptr.hpp>
diff --git a/sc/inc/scopetools.hxx b/sc/inc/scopetools.hxx
index 7f9819246aec..443ceafc0b28 100644
--- a/sc/inc/scopetools.hxx
+++ b/sc/inc/scopetools.hxx
@@ -10,7 +10,7 @@
 #ifndef INCLUDED_SC_INC_SCOPETOOLS_HXX
 #define INCLUDED_SC_INC_SCOPETOOLS_HXX
 
-#include <scdllapi.h>
+#include "scdllapi.h"
 
 class ScDocument;
 
diff --git a/sc/inc/spellcheckcontext.hxx b/sc/inc/spellcheckcontext.hxx
index e07e972ebd78..3804c37cff07 100644
--- a/sc/inc/spellcheckcontext.hxx
+++ b/sc/inc/spellcheckcontext.hxx
@@ -11,7 +11,7 @@
 #define INCLUDED_SC_INC_SPELLCHECKCONTEXT_HXX
 
 #include "address.hxx"
-#include "editeng/misspellrange.hxx"
+#include <editeng/misspellrange.hxx>
 
 #include <boost/unordered_map.hpp>
 
diff --git a/sc/inc/tabbgcolor.hxx b/sc/inc/tabbgcolor.hxx
index c359301a724b..e93385bd2b73 100644
--- a/sc/inc/tabbgcolor.hxx
+++ b/sc/inc/tabbgcolor.hxx
@@ -20,7 +20,7 @@
 #ifndef INCLUDED_SC_INC_TABBGCOLOR_HXX
 #define INCLUDED_SC_INC_TABBGCOLOR_HXX
 
-#include "tools/color.hxx"
+#include <tools/color.hxx>
 #include "address.hxx"
 
 #include <vector>
diff --git a/sc/inc/table.hxx b/sc/inc/table.hxx
index 16680dca0413..1581e72e8266 100644
--- a/sc/inc/table.hxx
+++ b/sc/inc/table.hxx
@@ -31,7 +31,7 @@
 #include "postit.hxx"
 #include "types.hxx"
 #include "cellvalue.hxx"
-#include "formula/types.hxx"
+#include <formula/types.hxx>
 #include "calcmacros.hxx"
 
 #include <set>
diff --git a/sc/inc/tabprotection.hxx b/sc/inc/tabprotection.hxx
index 577716432a9d..f1d2799ac2e6 100644
--- a/sc/inc/tabprotection.hxx
+++ b/sc/inc/tabprotection.hxx
@@ -20,7 +20,7 @@
 #ifndef INCLUDED_SC_INC_TABPROTECTION_HXX
 #define INCLUDED_SC_INC_TABPROTECTION_HXX
 
-#include "sal/types.h"
+#include <sal/types.h>
 #include <com/sun/star/uno/Sequence.hxx>
 
 #include "global.hxx"
diff --git a/sc/inc/textuno.hxx b/sc/inc/textuno.hxx
index b02271124f56..9de49885a45b 100644
--- a/sc/inc/textuno.hxx
+++ b/sc/inc/textuno.hxx
@@ -32,7 +32,7 @@
 #include <cppuhelper/implbase3.hxx>
 #include <cppuhelper/implbase5.hxx>
 
-#include "rtl/ref.hxx"
+#include <rtl/ref.hxx>
 #include "scdllapi.h"
 
 #include <boost/noncopyable.hpp>
diff --git a/sc/inc/token.hxx b/sc/inc/token.hxx
index ec0bfc2821a2..6c15cbdf3ebe 100644
--- a/sc/inc/token.hxx
+++ b/sc/inc/token.hxx
@@ -23,12 +23,12 @@
 #include <vector>
 #include <boost/intrusive_ptr.hpp>
 
-#include "formula/opcode.hxx"
+#include <formula/opcode.hxx>
 #include "refdata.hxx"
 #include <tools/mempool.hxx>
 #include "scdllapi.h"
-#include "formula/IFunctionDescription.hxx"
-#include "formula/token.hxx"
+#include <formula/IFunctionDescription.hxx>
+#include <formula/token.hxx>
 #include "scmatrix.hxx"
 #include "calcmacros.hxx"
 
diff --git a/sc/inc/tokenarray.hxx b/sc/inc/tokenarray.hxx
index c7ff3dcb1b93..c2191a8a934c 100644
--- a/sc/inc/tokenarray.hxx
+++ b/sc/inc/tokenarray.hxx
@@ -20,7 +20,7 @@
 #ifndef INCLUDED_SC_INC_TOKENARRAY_HXX
 #define INCLUDED_SC_INC_TOKENARRAY_HXX
 
-#include "formula/token.hxx"
+#include <formula/token.hxx>
 #include "scdllapi.h"
 #include "types.hxx"
 #include "calcmacros.hxx"
diff --git a/sc/inc/typedstrdata.hxx b/sc/inc/typedstrdata.hxx
index aeb59153fd94..4e393b790baa 100644
--- a/sc/inc/typedstrdata.hxx
+++ b/sc/inc/typedstrdata.hxx
@@ -10,7 +10,7 @@
 #ifndef INCLUDED_SC_INC_TYPEDSTRDATA_HXX
 #define INCLUDED_SC_INC_TYPEDSTRDATA_HXX
 
-#include "rtl/ustring.hxx"
+#include <rtl/ustring.hxx>
 #include "scdllapi.h"
 
 #include <set>
diff --git a/sc/inc/types.hxx b/sc/inc/types.hxx
index 216a58d2fdf5..8d37ad45e6a3 100644
--- a/sc/inc/types.hxx
+++ b/sc/inc/types.hxx
@@ -10,7 +10,7 @@
 #ifndef INCLUDED_SC_INC_TYPES_HXX
 #define INCLUDED_SC_INC_TYPES_HXX
 
-#include "sal/types.h"
+#include <sal/types.h>
 
 #include <boost/intrusive_ptr.hpp>
 #include <boost/unordered_map.hpp>
diff --git a/sc/inc/viewuno.hxx b/sc/inc/viewuno.hxx
index dcfbb9b14f07..e1ebe6d47ae3 100644
--- a/sc/inc/viewuno.hxx
+++ b/sc/inc/viewuno.hxx
@@ -41,7 +41,7 @@
 #include <com/sun/star/datatransfer/XTransferableSupplier.hpp>
 
 #include "address.hxx"
-#include "boost/ptr_container/ptr_vector.hpp"
+#include <boost/ptr_container/ptr_vector.hpp>
 
 class ScTabViewShell;
 class ScPreviewShell;
diff --git a/sc/inc/xmlwrap.hxx b/sc/inc/xmlwrap.hxx
index c3d44fd0b096..8bb78af88f8c 100644
--- a/sc/inc/xmlwrap.hxx
+++ b/sc/inc/xmlwrap.hxx
@@ -23,7 +23,7 @@
 #include <com/sun/star/uno/Reference.hxx>
 #include <com/sun/star/uno/Sequence.hxx>
 #include <com/sun/star/frame/XModel.hpp>
-#include <importfilterdata.hxx>
+#include "importfilterdata.hxx"
 #include <sal/types.h>
 
 class ScDocument;