[ooo-build-commit] .: 4 commits - basebmp/inc basegfx/inc basegfx/source canvas/inc canvas/source comphelper/inc comphelper/source cppcanvas/source dtrans/source i18npool/inc i18npool/source padmin/source regexp/source rsc/inc rsc/source sax/inc sot/inc sot/source svl/inc svl/source svtools/bmpmaker svtools/inc svtools/source svtools/workben toolkit/inc toolkit/source toolkit/workben tools/inc tools/os2 tools/source tools/win ucbhelper/inc ucbhelper/source ucbhelper/workben unotools/inc unotools/source vcl/aqua vcl/inc vcl/os2 vcl/source vcl/test vcl/unx vcl/win vcl/workben
Petr Mladek
pmladek at kemper.freedesktop.org
Tue Oct 5 10:13:16 PDT 2010
canvas/inc/canvas/base/bufferedgraphicdevicebase.hxx | 10 ----
canvas/source/cairo/cairo_repainttarget.hxx | 2
comphelper/inc/comphelper/accessibleselectionhelper.hxx | 2
comphelper/inc/comphelper/ihwrapnofilter.hxx | 4 -
comphelper/inc/comphelper/ofopxmlhelper.hxx | 2
comphelper/inc/comphelper/sequenceashashmap.hxx | 2
comphelper/inc/comphelper/sequenceasvector.hxx | 2
comphelper/inc/comphelper/stillreadwriteinteraction.hxx | 2
comphelper/source/eventattachermgr/eventattachermgr.cxx | 2
comphelper/source/misc/accessibletexthelper.cxx | 2
comphelper/source/misc/stillreadwriteinteraction.cxx | 6 --
comphelper/source/processfactory/componentfactory.cxx | 2
comphelper/source/property/MasterPropertySet.cxx | 2
comphelper/source/property/MasterPropertySetInfo.cxx | 2
comphelper/source/property/TypeGeneration.cxx | 4 -
comphelper/source/xml/ofopxmlhelper.cxx | 12 ----
cppcanvas/source/inc/action.hxx | 2
cppcanvas/source/inc/implrenderer.hxx | 2
cppcanvas/source/mtfrenderer/outdevstate.hxx | 12 ----
cppcanvas/source/wrapper/implbitmap.hxx | 4 -
cppcanvas/source/wrapper/implbitmapcanvas.hxx | 6 --
cppcanvas/source/wrapper/implcolor.hxx | 4 -
cppcanvas/source/wrapper/implcustomsprite.hxx | 2
cppcanvas/source/wrapper/implfont.hxx | 4 -
cppcanvas/source/wrapper/implpolypolygon.hxx | 6 --
cppcanvas/source/wrapper/implsprite.hxx | 2
cppcanvas/source/wrapper/implspritecanvas.hxx | 4 -
cppcanvas/source/wrapper/impltext.cxx | 6 --
cppcanvas/source/wrapper/impltext.hxx | 8 ---
dtrans/source/generic/clipboardmanager.hxx | 2
dtrans/source/generic/generic_clipboard.hxx | 4 -
dtrans/source/os2/clipb/OS2Bitmap.cxx | 2
dtrans/source/os2/clipb/Os2Transferable.hxx | 2
dtrans/source/win32/dnd/globals.hxx | 2
dtrans/source/win32/dnd/source.hxx | 4 -
dtrans/source/win32/dnd/target.hxx | 4 -
dtrans/source/win32/dtobj/DOTransferable.cxx | 2
dtrans/source/win32/dtobj/DOTransferable.hxx | 2
dtrans/source/win32/dtobj/DtObjFactory.cxx | 4 -
dtrans/source/win32/dtobj/FetcList.cxx | 2
dtrans/source/win32/dtobj/FmtFilter.hxx | 2
dtrans/source/win32/dtobj/TxtCnvtHlp.hxx | 2
dtrans/source/win32/dtobj/XTDataObject.cxx | 2
dtrans/source/win32/dtobj/XTDataObject.hxx | 4 -
dtrans/source/win32/ftransl/ftransl.cxx | 2
dtrans/source/win32/ftransl/ftranslentry.cxx | 2
dtrans/source/win32/workbench/XTDo.cxx | 2
i18npool/inc/i18npool/mslangid.hxx | 2
padmin/source/cmddlg.cxx | 2
padmin/source/cmddlg.hxx | 2
padmin/source/helper.cxx | 2
padmin/source/helper.hxx | 6 --
padmin/source/newppdlg.hxx | 2
padmin/source/padialog.hxx | 2
padmin/source/progress.cxx | 2
padmin/source/titlectrl.cxx | 2
regexp/source/reclass.hxx | 10 ----
rsc/inc/rscdef.hxx | 2
rsc/inc/rsclst.hxx | 2
rsc/inc/rscrsc.hxx | 6 --
rsc/source/res/rscarray.cxx | 2
rsc/source/tools/rscchar.cxx | 2
sax/inc/sax/parser/saxparser.hxx | 2
sot/inc/absdev.hxx | 2
sot/inc/sot/exchange.hxx | 2
sot/inc/sot/factory.hxx | 4 -
sot/inc/sot/object.hxx | 4 -
sot/inc/sot/sotdata.hxx | 2
sot/inc/sot/sotref.hxx | 2
sot/inc/sot/storage.hxx | 6 --
sot/inc/stg.hxx | 10 ----
sot/source/sdstor/stg.cxx | 4 -
sot/source/sdstor/stgavl.hxx | 2
sot/source/sdstor/stgcache.hxx | 4 -
sot/source/sdstor/stgelem.hxx | 2
sot/source/sdstor/stgstrms.hxx | 2
sot/source/sdstor/storage.cxx | 2
svl/inc/pickerhistoryaccess.hxx | 2
svl/inc/svl/cntwall.hxx | 2
svl/inc/svl/isethint.hxx | 2
svl/inc/svl/macitem.hxx | 2
svl/inc/svl/style.hxx | 2
svl/inc/svl/zforlist.hxx | 2
svl/inc/xmlement.hxx | 2
svl/source/fsstor/fsstorage.cxx | 4 -
svl/source/items/cenumitm.cxx | 2
svl/source/items/style.cxx | 2
svl/source/notify/listener.cxx | 2
svl/source/notify/listenerbase.cxx | 2
svl/source/notify/lstner.cxx | 2
svl/source/numbers/nbdll.cxx | 2
svtools/bmpmaker/bmp.cxx | 2
svtools/inc/QueryFolderName.hxx | 2
svtools/inc/acceleratorexecute.hxx | 12 ----
svtools/inc/addresstemplate.hxx | 2
svtools/inc/calendar.hxx | 6 --
svtools/inc/ctrlbox.hxx | 12 ----
svtools/inc/ctrltool.hxx | 4 -
svtools/inc/filectrl.hxx | 2
svtools/inc/filedlg.hxx | 2
svtools/inc/fileview.hxx | 2
svtools/inc/roadmap.hxx | 2
svtools/inc/rtfout.hxx | 2
svtools/inc/ruler.hxx | 2
svtools/inc/scrwin.hxx | 2
svtools/inc/stdmenu.hxx | 2
svtools/inc/svtools/accessiblefactory.hxx | 4 -
svtools/inc/svtools/chartprettypainter.hxx | 2
svtools/inc/svtools/colrdlg.hxx | 2
svtools/inc/svtools/editbrowsebox.hxx | 2
svtools/inc/svtools/ehdl.hxx | 2
svtools/inc/svtools/embedhlp.hxx | 2
svtools/inc/svtools/inettbc.hxx | 2
svtools/inc/svtools/insdlg.hxx | 2
svtools/inc/svtools/printdlg.hxx | 14 -----
svtools/inc/svtools/prnsetup.hxx | 12 ----
svtools/inc/svtools/stdctrl.hxx | 4 -
svtools/inc/svtools/svicnvw.hxx | 2
svtools/inc/svtools/svlbitm.hxx | 4 -
svtools/inc/svtools/svlbox.hxx | 6 --
svtools/inc/svtools/table/tabledatawindow.hxx | 2
svtools/inc/svtools/texteng.hxx | 2
svtools/inc/svtools/transfer.hxx | 2
svtools/inc/svtools/treelist.hxx | 2
svtools/inc/svtools/valueset.hxx | 4 -
svtools/inc/svtools/wizardmachine.hxx | 2
svtools/inc/svtools/wizdlg.hxx | 2
svtools/inc/taskbar.hxx | 2
svtools/inc/wallitem.hxx | 2
svtools/source/brwbox/datwin.cxx | 6 --
svtools/source/brwbox/datwin.hxx | 4 -
svtools/source/brwbox/editbrowsebox.cxx | 8 ---
svtools/source/config/accessibilityoptions.cxx | 10 ----
svtools/source/config/printoptions.cxx | 14 -----
svtools/source/config/test/test.cxx | 2
svtools/source/contnr/ctrdll.cxx | 2
svtools/source/contnr/fileview.cxx | 2
svtools/source/contnr/imivctl.hxx | 4 -
svtools/source/contnr/svimpbox.cxx | 6 --
svtools/source/contnr/svimpicn.cxx | 4 -
svtools/source/contnr/svlbitm.cxx | 2
svtools/source/contnr/svlbox.cxx | 2
svtools/source/contnr/svtabbx.cxx | 4 -
svtools/source/contnr/templwin.cxx | 6 --
svtools/source/control/calendar.cxx | 16 ------
svtools/source/control/ctrlbox.cxx | 4 -
svtools/source/control/ctrldll.cxx | 2
svtools/source/control/ctrltool.cxx | 4 -
svtools/source/control/filectrl.cxx | 2
svtools/source/control/headbar.cxx | 8 ---
svtools/source/control/hyperlabel.cxx | 4 -
svtools/source/control/inettbc.cxx | 8 ---
svtools/source/control/prgsbar.cxx | 4 -
svtools/source/control/roadmap.cxx | 5 --
svtools/source/control/stdmenu.cxx | 2
svtools/source/control/taskbar.cxx | 4 -
svtools/source/control/taskbox.cxx | 2
svtools/source/control/taskmisc.cxx | 2
svtools/source/control/taskstat.cxx | 2
svtools/source/control/valueimp.hxx | 2
svtools/source/control/valueset.cxx | 4 -
svtools/source/dialogs/addresstemplate.cxx | 10 ----
svtools/source/dialogs/filedlg2.cxx | 2
svtools/source/dialogs/filedlg2.hxx | 2
svtools/source/dialogs/printdlg.cxx | 6 --
svtools/source/dialogs/prnsetup.cxx | 2
svtools/source/dialogs/propctrl.cxx | 6 --
svtools/source/dialogs/propctrl.hxx | 8 ---
svtools/source/dialogs/wizardmachine.cxx | 2
svtools/source/dialogs/wizdlg.cxx | 6 --
svtools/source/edit/texteng.cxx | 8 ---
svtools/source/edit/textview.cxx | 8 ---
svtools/source/filter.vcl/filter/filter.cxx | 2
svtools/source/filter.vcl/igif/decode.hxx | 2
svtools/source/filter.vcl/ixpm/xpmread.cxx | 4 -
svtools/source/filter.vcl/wmf/winmtf.hxx | 4 -
svtools/source/filter.vcl/wmf/wmfwr.cxx | 2
svtools/source/hatchwindow/hatchwindowfactory.hxx | 2
svtools/source/inc/gifread.hxx | 4 -
svtools/source/inc/gradwrap.hxx | 2
svtools/source/inc/jpeg.hxx | 2
svtools/source/inc/property.hxx | 14 -----
svtools/source/inc/svimpbox.hxx | 4 -
svtools/source/inc/svimpicn.hxx | 4 -
svtools/source/inc/xbmread.hxx | 4 -
svtools/source/inc/xpmread.hxx | 2
svtools/source/misc/acceleratorexecute.cxx | 20 --------
svtools/source/misc/embedhlp.cxx | 2
svtools/source/misc/helpagentwindow.cxx | 6 --
svtools/source/misc/imagemgr.cxx | 2
svtools/source/misc/imageresourceaccess.cxx | 2
svtools/source/misc/imap2.cxx | 2
svtools/source/misc/transfer.cxx | 8 ---
svtools/source/misc/transfer2.cxx | 6 --
svtools/source/productregistration/productregistration.cxx | 2
svtools/source/productregistration/registrationdlg.cxx | 4 -
svtools/source/productregistration/registrationdlg.hxx | 2
svtools/source/table/tablecontrol_impl.hxx | 4 -
svtools/source/table/tablegeometry.hxx | 4 -
svtools/source/uno/addrtempuno.cxx | 4 -
svtools/source/uno/popupmenucontrollerbase.cxx | 2
svtools/source/uno/statusbarcontroller.cxx | 2
svtools/source/uno/toolboxcontroller.cxx | 2
svtools/source/uno/unoevent.cxx | 2
svtools/source/uno/unoimap.cxx | 2
svtools/workben/browser.cxx | 2
svtools/workben/stest.cxx | 2
svtools/workben/urange.cxx | 2
toolkit/inc/toolkit/awt/vclxwindows.hxx | 2
toolkit/inc/toolkit/controls/eventcontainer.hxx | 4 -
toolkit/inc/toolkit/controls/unocontrol.hxx | 2
toolkit/inc/toolkit/helper/accessiblefactory.hxx | 4 -
toolkit/inc/toolkit/helper/formpdfexport.hxx | 6 --
toolkit/source/awt/vclxtoolkit.cxx | 4 -
toolkit/source/awt/vclxwindows.cxx | 2
toolkit/source/awt/xthrobber.cxx | 2
toolkit/source/controls/dialogcontrol.cxx | 2
toolkit/source/controls/eventcontainer.cxx | 2
toolkit/source/controls/geometrycontrolmodel.cxx | 2
toolkit/source/controls/roadmapcontrol.cxx | 2
toolkit/source/controls/roadmapentry.cxx | 5 --
toolkit/source/controls/tree/treecontrol.cxx | 2
toolkit/source/controls/unocontrol.cxx | 2
toolkit/source/controls/unocontrols.cxx | 2
toolkit/source/helper/formpdfexport.cxx | 32 -------------
toolkit/source/helper/tkresmgr.cxx | 2
toolkit/workben/layout/wordcountdialog.hxx | 2
toolkit/workben/layout/zoom.hxx | 4 -
tools/inc/tools/color.hxx | 2
tools/inc/tools/debug.hxx | 2
tools/inc/tools/errcode.hxx | 2
tools/inc/tools/fsys.hxx | 2
tools/inc/tools/inetmsg.hxx | 4 -
tools/inc/tools/ownlist.hxx | 2
tools/inc/tools/pstm.hxx | 4 -
tools/inc/tools/stream.hxx | 2
tools/inc/tools/string.hxx | 4 -
tools/inc/tools/tenccvt.hxx | 2
tools/os2/source/dll/toolsdll.cxx | 4 -
tools/source/fsys/dirent.cxx | 2
tools/source/fsys/os2.cxx | 2
tools/source/fsys/tdir.cxx | 2
tools/source/generic/color.cxx | 2
tools/source/generic/fract.cxx | 2
tools/source/generic/poly.cxx | 4 -
tools/source/inet/inetmsg.cxx | 2
tools/source/memtools/contnr.cxx | 6 --
tools/source/memtools/mempool.cxx | 2
tools/source/rc/resmgr.cxx | 2
tools/source/stream/strmos2.cxx | 2
tools/source/string/tstring.cxx | 8 ---
tools/source/string/tustring.cxx | 6 --
tools/win/inc/toolsdll.hxx | 2
ucbhelper/inc/ucbhelper/commandenvironment.hxx | 2
ucbhelper/inc/ucbhelper/commandenvironmentproxy.hxx | 2
ucbhelper/inc/ucbhelper/interceptedinteraction.hxx | 4 -
ucbhelper/source/provider/cancelcommandexecution.cxx | 2
ucbhelper/source/provider/configureucb.cxx | 2
ucbhelper/source/provider/handleinteractionrequest.cxx | 2
ucbhelper/source/provider/provconf.cxx | 2
ucbhelper/workben/ucbexplorer/ucbexplorer.cxx | 2
unotools/inc/unotools/accessiblerelationsethelper.hxx | 2
unotools/inc/unotools/accessiblestatesethelper.hxx | 2
unotools/inc/unotools/collatorwrapper.hxx | 2
unotools/inc/unotools/localedatawrapper.hxx | 2
unotools/inc/unotools/optionsdlg.hxx | 2
unotools/inc/unotools/unotunnelhelper.hxx | 2
unotools/inc/unotools/xmlaccelcfg.hxx | 2
unotools/source/config/eventcfg.cxx | 2
unotools/source/config/historyoptions.cxx | 14 -----
unotools/source/config/inetoptions.cxx | 2
unotools/source/config/javaoptions.cxx | 2
unotools/source/i18n/calendarwrapper.cxx | 2
unotools/source/i18n/charclass.cxx | 2
unotools/source/i18n/collatorwrapper.cxx | 2
unotools/source/i18n/localedatawrapper.cxx | 4 -
unotools/source/i18n/nativenumberwrapper.cxx | 2
unotools/source/i18n/numberformatcodewrapper.cxx | 2
unotools/source/i18n/textsearch.cxx | 2
unotools/source/processfactory/componentfactory.cxx | 2
unotools/source/ucbhelper/XTempFile.hxx | 2
unotools/source/ucbhelper/ucblockbytes.cxx | 4 -
unotools/source/ucbhelper/ucbstreamhelper.cxx | 2
unotools/source/ucbhelper/xtempfile.cxx | 4 -
vcl/aqua/inc/aqua11yfocustracker.hxx | 2
vcl/aqua/inc/keyboardfocuslistener.hxx | 2
vcl/aqua/source/a11y/documentfocuslistener.cxx | 6 --
vcl/aqua/source/a11y/documentfocuslistener.hxx | 4 -
vcl/aqua/source/dtrans/DropTarget.cxx | 2
vcl/aqua/source/dtrans/DropTarget.hxx | 2
vcl/aqua/source/dtrans/OSXTransferable.cxx | 2
vcl/aqua/source/dtrans/test_aquacb.cxx | 2
vcl/inc/vcl/dndevdis.hxx | 2
vcl/inc/vcl/graphite_adaptors.hxx | 8 ---
vcl/inc/vcl/impprn.hxx | 2
vcl/inc/vcl/longcurr.hxx | 2
vcl/inc/vcl/salbmp.hxx | 2
vcl/inc/vcl/salframe.hxx | 4 -
vcl/inc/vcl/svapp.hxx | 4 -
vcl/inc/vcl/svdata.hxx | 2
vcl/inc/vcl/window.hxx | 6 --
vcl/os2/inc/salsound.hxx | 2
vcl/os2/source/app/salinst.cxx | 4 -
vcl/os2/source/app/sallang.cxx | 2
vcl/os2/source/gdi/salgdi.cxx | 2
vcl/os2/source/gdi/salgdi2.cxx | 2
vcl/os2/source/gdi/salgdi3.cxx | 8 ---
vcl/os2/source/window/salframe.cxx | 8 ---
vcl/source/app/sound.cxx | 4 -
vcl/source/app/stdtext.cxx | 2
vcl/source/app/svdata.cxx | 4 -
vcl/source/app/timer.cxx | 2
vcl/source/app/unohelp.cxx | 4 -
vcl/source/components/factory.cxx | 4 -
vcl/source/control/button.cxx | 8 ---
vcl/source/control/combobox.cxx | 2
vcl/source/control/ctrl.cxx | 2
vcl/source/control/edit.cxx | 8 ---
vcl/source/control/field2.cxx | 4 -
vcl/source/control/fixbrd.cxx | 2
vcl/source/control/group.cxx | 2
vcl/source/control/ilstbox.cxx | 6 --
vcl/source/control/longcurr.cxx | 2
vcl/source/control/menubtn.cxx | 2
vcl/source/control/morebtn.cxx | 2
vcl/source/control/slider.cxx | 2
vcl/source/gdi/bitmap.cxx | 2
vcl/source/gdi/bitmap2.cxx | 2
vcl/source/gdi/bitmapex.cxx | 4 -
vcl/source/gdi/cvtgrf.cxx | 2
vcl/source/gdi/hatch.cxx | 2
vcl/source/gdi/image.cxx | 6 --
vcl/source/gdi/imagerepository.cxx | 2
vcl/source/gdi/impbmp.cxx | 2
vcl/source/gdi/impgraph.cxx | 2
vcl/source/gdi/impvect.cxx | 2
vcl/source/gdi/jobset.cxx | 2
vcl/source/gdi/outdev.cxx | 4 -
vcl/source/gdi/outdev2.cxx | 2
vcl/source/gdi/outdev3.cxx | 6 --
vcl/source/gdi/outdev5.cxx | 2
vcl/source/gdi/outdev6.cxx | 2
vcl/source/gdi/outmap.cxx | 2
vcl/source/gdi/print.cxx | 2
vcl/source/gdi/region.cxx | 6 --
vcl/source/gdi/salgdilayout.cxx | 2
vcl/source/gdi/sallayout.cxx | 4 -
vcl/source/gdi/virdev.cxx | 2
vcl/source/glyphs/graphite_textsrc.hxx | 8 ---
vcl/source/window/accel.cxx | 4 -
vcl/source/window/brdwin.cxx | 2
vcl/source/window/btndlg.cxx | 2
vcl/source/window/cmdevt.cxx | 4 -
vcl/source/window/dialog.cxx | 2
vcl/source/window/dockmgr.cxx | 4 -
vcl/source/window/dockwin.cxx | 4 -
vcl/source/window/floatwin.cxx | 4 -
vcl/source/window/introwin.cxx | 2
vcl/source/window/javachild.cxx | 2
vcl/source/window/keycod.cxx | 6 --
vcl/source/window/msgbox.cxx | 4 -
vcl/source/window/scrwnd.cxx | 8 ---
vcl/source/window/split.cxx | 2
vcl/source/window/splitwin.cxx | 2
vcl/source/window/status.cxx | 2
vcl/source/window/syschild.cxx | 6 --
vcl/source/window/syswin.cxx | 2
vcl/source/window/tabdlg.cxx | 2
vcl/source/window/tabpage.cxx | 2
vcl/source/window/toolbox.cxx | 4 -
vcl/source/window/toolbox2.cxx | 2
vcl/source/window/window.cxx | 4 -
vcl/source/window/window2.cxx | 4 -
vcl/source/window/winproc.cxx | 2
vcl/source/window/wrkwin.cxx | 4 -
vcl/unx/inc/i18n_status.hxx | 2
vcl/unx/inc/saldata.hxx | 2
vcl/unx/inc/saldisp.hxx | 4 -
vcl/unx/inc/wmadaptor.hxx | 2
vcl/unx/kde/kdedata.cxx | 2
vcl/unx/kde/salnativewidgets-kde.cxx | 4 -
vcl/unx/source/app/i18n_cb.cxx | 2
vcl/unx/source/app/i18n_ic.cxx | 4 -
vcl/unx/source/app/saldata.cxx | 4 -
vcl/unx/source/app/saldisp.cxx | 2
vcl/unx/source/app/soicon.cxx | 2
vcl/unx/source/dtrans/X11_clipboard.hxx | 4 -
vcl/unx/source/dtrans/X11_selection.hxx | 2
vcl/unx/source/dtrans/X11_transferable.hxx | 2
vcl/unx/source/gdi/xlfd_extd.cxx | 2
vcl/unx/source/gdi/xlfd_extd.hxx | 6 --
vcl/unx/source/window/salobj.cxx | 4 -
vcl/win/inc/wincomp.hxx | 2
vcl/win/source/gdi/salgdi.cxx | 2
vcl/win/source/gdi/salgdi2.cxx | 2
vcl/win/source/gdi/salprn.cxx | 2
vcl/win/source/window/salframe.cxx | 8 ---
vcl/win/source/window/salobj.cxx | 2
398 files changed, 3 insertions(+), 1381 deletions(-)
New commits:
commit fd1667f30d471ea81ac42a4075950270b2e4e08e
Author: Petr Mladek <pmladek at suse.cz>
Date: Tue Oct 5 16:06:44 2010 +0200
fixed vcl includes after removing the guards
diff --git a/vcl/unx/source/gdi/xlfd_extd.hxx b/vcl/unx/source/gdi/xlfd_extd.hxx
index 6fb21f5..335da44 100644
--- a/vcl/unx/source/gdi/xlfd_extd.hxx
+++ b/vcl/unx/source/gdi/xlfd_extd.hxx
@@ -28,7 +28,7 @@
#define XLFD_EXTENDED_HXX
#include <salunx.h>
-#include <vcl/enum.hxx>
+#include <vcl/vclenum.hxx>
#include <vcl/outfont.hxx>
#include <vector>
commit ba95b4237674f533c4b7827f27a29e1a3c17f608
Author: Petr Mladek <pmladek at suse.cz>
Date: Tue Oct 5 15:55:19 2010 +0200
more removed include guards using fixguard.py
diff --git a/basebmp/inc/basebmp/compositeiterator.hxx b/basebmp/inc/basebmp/compositeiterator.hxx
old mode 100755
new mode 100644
diff --git a/basegfx/inc/basegfx/tools/canvastools.hxx b/basegfx/inc/basegfx/tools/canvastools.hxx
old mode 100755
new mode 100644
diff --git a/basegfx/inc/basegfx/tools/unopolypolygon.hxx b/basegfx/inc/basegfx/tools/unopolypolygon.hxx
old mode 100755
new mode 100644
diff --git a/canvas/inc/canvas/base/bufferedgraphicdevicebase.hxx b/canvas/inc/canvas/base/bufferedgraphicdevicebase.hxx
index d383dbd..9b8fb75 100644
--- a/canvas/inc/canvas/base/bufferedgraphicdevicebase.hxx
+++ b/canvas/inc/canvas/base/bufferedgraphicdevicebase.hxx
@@ -28,22 +28,12 @@
#ifndef INCLUDED_CANVAS_BUFFEREDGRAPHICDEVICEBASE_HXX
#define INCLUDED_CANVAS_BUFFEREDGRAPHICDEVICEBASE_HXX
-#ifndef _COM_SUN_STAR_AWT_XWINDOW2_HPP_
#include <com/sun/star/awt/XWindow2.hpp>
-#endif
-#ifndef _COM_SUN_STAR_AWT_XTOPWINDOW_HPP_
#include <com/sun/star/awt/XTopWindow.hpp>
-#endif
-#ifndef _COM_SUN_STAR_AWT_XWINDOWLISTENER_HPP_
#include <com/sun/star/awt/XWindowListener.hpp>
-#endif
-#ifndef INCLUDED_CANVAS_CANVASTOOLS_HXX
#include <canvas/canvastools.hxx>
-#endif
-#ifndef INCLUDED_CANVAS_GRAPHICDEVICEBASE_HXX
#include <canvas/base/graphicdevicebase.hxx>
-#endif
/* Definition of BufferedGraphicDeviceBase class */
diff --git a/canvas/inc/canvas/canvastools.hxx b/canvas/inc/canvas/canvastools.hxx
old mode 100755
new mode 100644
diff --git a/canvas/source/cairo/cairo_repainttarget.hxx b/canvas/source/cairo/cairo_repainttarget.hxx
index 315148b..151f0f9 100644
--- a/canvas/source/cairo/cairo_repainttarget.hxx
+++ b/canvas/source/cairo/cairo_repainttarget.hxx
@@ -28,9 +28,7 @@
#ifndef _CAIROCANVAS_REPAINTTARGET_HXX
#define _CAIROCANVAS_REPAINTTARGET_HXX
-#ifndef _RTL_REF_HXX_
#include <rtl/ref.hxx>
-#endif
#include "cairo_cairo.hxx"
diff --git a/canvas/source/directx/dx_bitmap.hxx b/canvas/source/directx/dx_bitmap.hxx
old mode 100755
new mode 100644
diff --git a/canvas/source/directx/dx_bitmapcanvashelper.hxx b/canvas/source/directx/dx_bitmapcanvashelper.hxx
old mode 100755
new mode 100644
diff --git a/canvas/source/directx/dx_canvasbitmap.hxx b/canvas/source/directx/dx_canvasbitmap.hxx
old mode 100755
new mode 100644
diff --git a/canvas/source/directx/dx_canvascustomsprite.hxx b/canvas/source/directx/dx_canvascustomsprite.hxx
old mode 100755
new mode 100644
diff --git a/canvas/source/directx/dx_canvasfont.hxx b/canvas/source/directx/dx_canvasfont.hxx
old mode 100755
new mode 100644
diff --git a/canvas/source/directx/dx_canvashelper.hxx b/canvas/source/directx/dx_canvashelper.hxx
old mode 100755
new mode 100644
diff --git a/canvas/source/directx/dx_devicehelper.hxx b/canvas/source/directx/dx_devicehelper.hxx
old mode 100755
new mode 100644
diff --git a/canvas/source/directx/dx_gdiplususer.hxx b/canvas/source/directx/dx_gdiplususer.hxx
old mode 100755
new mode 100644
diff --git a/canvas/source/directx/dx_impltools.hxx b/canvas/source/directx/dx_impltools.hxx
old mode 100755
new mode 100644
diff --git a/canvas/source/directx/dx_linepolypolygon.hxx b/canvas/source/directx/dx_linepolypolygon.hxx
old mode 100755
new mode 100644
diff --git a/canvas/source/directx/dx_rendermodule.hxx b/canvas/source/directx/dx_rendermodule.hxx
old mode 100755
new mode 100644
diff --git a/canvas/source/directx/dx_sprite.hxx b/canvas/source/directx/dx_sprite.hxx
old mode 100755
new mode 100644
diff --git a/canvas/source/directx/dx_spritecanvas.hxx b/canvas/source/directx/dx_spritecanvas.hxx
old mode 100755
new mode 100644
diff --git a/canvas/source/directx/dx_spritecanvashelper.hxx b/canvas/source/directx/dx_spritecanvashelper.hxx
old mode 100755
new mode 100644
diff --git a/canvas/source/directx/dx_spritehelper.hxx b/canvas/source/directx/dx_spritehelper.hxx
old mode 100755
new mode 100644
diff --git a/canvas/source/directx/dx_surfacegraphics.hxx b/canvas/source/directx/dx_surfacegraphics.hxx
old mode 100755
new mode 100644
diff --git a/canvas/source/directx/dx_textlayout.hxx b/canvas/source/directx/dx_textlayout.hxx
old mode 100755
new mode 100644
diff --git a/canvas/source/directx/dx_textlayout_drawhelper.hxx b/canvas/source/directx/dx_textlayout_drawhelper.hxx
old mode 100755
new mode 100644
diff --git a/canvas/source/directx/dx_vcltools.hxx b/canvas/source/directx/dx_vcltools.hxx
old mode 100755
new mode 100644
diff --git a/canvas/source/directx/dx_winstuff.hxx b/canvas/source/directx/dx_winstuff.hxx
old mode 100755
new mode 100644
diff --git a/comphelper/inc/comphelper/accessibleselectionhelper.hxx b/comphelper/inc/comphelper/accessibleselectionhelper.hxx
index 1b3c827..5a1e644 100644
--- a/comphelper/inc/comphelper/accessibleselectionhelper.hxx
+++ b/comphelper/inc/comphelper/accessibleselectionhelper.hxx
@@ -29,9 +29,7 @@
#define COMPHELPER_ACCESSIBLE_SELECTION_HELPER_HXX
#include <comphelper/uno3.hxx>
-#ifndef COMPHELPER_ACCESSIBLE_CONTEXT_HELPER_HXX
#include <comphelper/accessiblecomponenthelper.hxx>
-#endif
#include <cppuhelper/implbase1.hxx>
#include <comphelper/uno3.hxx>
#include <com/sun/star/accessibility/XAccessibleSelection.hpp>
diff --git a/comphelper/inc/comphelper/docpasswordrequest.hxx b/comphelper/inc/comphelper/docpasswordrequest.hxx
old mode 100755
new mode 100644
diff --git a/comphelper/inc/comphelper/evtmethodhelper.hxx b/comphelper/inc/comphelper/evtmethodhelper.hxx
old mode 100755
new mode 100644
diff --git a/comphelper/inc/comphelper/ihwrapnofilter.hxx b/comphelper/inc/comphelper/ihwrapnofilter.hxx
index a448701..4ab4bb1 100644
--- a/comphelper/inc/comphelper/ihwrapnofilter.hxx
+++ b/comphelper/inc/comphelper/ihwrapnofilter.hxx
@@ -44,12 +44,8 @@
#include <com/sun/star/frame/DoubleInitializationException.hpp>
#endif
-#ifndef _CPPUHELPER_IMPLBASE3_HXX_
#include <cppuhelper/implbase3.hxx>
-#endif
-#ifndef INCLUDED_COMPHELPERDLLAPI_H
#include "comphelper/comphelperdllapi.h"
-#endif
namespace comphelper {
diff --git a/comphelper/inc/comphelper/ofopxmlhelper.hxx b/comphelper/inc/comphelper/ofopxmlhelper.hxx
index 034a96e..2e677bb 100644
--- a/comphelper/inc/comphelper/ofopxmlhelper.hxx
+++ b/comphelper/inc/comphelper/ofopxmlhelper.hxx
@@ -28,9 +28,7 @@
#ifndef _COMPHELPER_OFOPXMLHELPER_HXX
#define _COMPHELPER_OFOPXMLHELPER_HXX
-#ifndef _COM_SUN_STAR_XML_SAX_XDUCUMENTHANDLER_HPP_
#include <com/sun/star/xml/sax/XDocumentHandler.hpp>
-#endif
#include <com/sun/star/beans/StringPair.hpp>
#include <com/sun/star/io/XInputStream.hpp>
#include <com/sun/star/io/XOutputStream.hpp>
diff --git a/comphelper/inc/comphelper/sequenceashashmap.hxx b/comphelper/inc/comphelper/sequenceashashmap.hxx
index 6910324..bbe6b88 100644
--- a/comphelper/inc/comphelper/sequenceashashmap.hxx
+++ b/comphelper/inc/comphelper/sequenceashashmap.hxx
@@ -44,9 +44,7 @@
#include <com/sun/star/beans/PropertyValue.hpp>
#include <com/sun/star/beans/NamedValue.hpp>
-#ifndef _COM_SUN_STAR_BEANS_IllegalTypeException_HPP_
#include <com/sun/star/beans/IllegalTypeException.hpp>
-#endif
#include "comphelper/comphelperdllapi.h"
// see method dbg_dumpToFile() below!
diff --git a/comphelper/inc/comphelper/sequenceasvector.hxx b/comphelper/inc/comphelper/sequenceasvector.hxx
index 4bc039b..522fc55 100644
--- a/comphelper/inc/comphelper/sequenceasvector.hxx
+++ b/comphelper/inc/comphelper/sequenceasvector.hxx
@@ -35,9 +35,7 @@
#include <algorithm>
#include <com/sun/star/uno/Sequence.hxx>
-#ifndef _COM_SUN_STAR_BEANS_IllegalTypeException_HPP_
#include <com/sun/star/beans/IllegalTypeException.hpp>
-#endif
//_______________________________________________
// namespace
diff --git a/comphelper/inc/comphelper/stillreadwriteinteraction.hxx b/comphelper/inc/comphelper/stillreadwriteinteraction.hxx
index a794021..7d405ae 100644
--- a/comphelper/inc/comphelper/stillreadwriteinteraction.hxx
+++ b/comphelper/inc/comphelper/stillreadwriteinteraction.hxx
@@ -32,9 +32,7 @@
// includes
#include <ucbhelper/interceptedinteraction.hxx>
-#ifndef __COM_SUN_STAR_TASK_XINTERACTIONHANDLER_HPP__
#include <com/sun/star/task/XInteractionHandler.hpp>
-#endif
#include <ucbhelper/interceptedinteraction.hxx>
#include "comphelper/comphelperdllapi.h"
diff --git a/comphelper/source/processfactory/componentfactory.cxx b/comphelper/source/processfactory/componentfactory.cxx
index 88f3655..f0f5606 100644
--- a/comphelper/source/processfactory/componentfactory.cxx
+++ b/comphelper/source/processfactory/componentfactory.cxx
@@ -31,9 +31,7 @@
#include <comphelper/processfactory.hxx>
#include <com/sun/star/lang/XMultiServiceFactory.hpp>
-#ifndef _COM_SUN_STAR_REGISTRY_XREGISTRYKEY_HDL_
#include <com/sun/star/registry/XRegistryKey.hpp>
-#endif
#include <cppuhelper/shlib.hxx>
diff --git a/cppcanvas/source/inc/action.hxx b/cppcanvas/source/inc/action.hxx
index 2825361..2efa2d5 100644
--- a/cppcanvas/source/inc/action.hxx
+++ b/cppcanvas/source/inc/action.hxx
@@ -30,9 +30,7 @@
#include <sal/types.h>
-#ifndef BOOST_SHARED_PTR_HPP_INCLUDED
#include <boost/shared_ptr.hpp>
-#endif
namespace basegfx
{
diff --git a/cppcanvas/source/inc/implrenderer.hxx b/cppcanvas/source/inc/implrenderer.hxx
index 4e5f3e8..c21cc0a 100644
--- a/cppcanvas/source/inc/implrenderer.hxx
+++ b/cppcanvas/source/inc/implrenderer.hxx
@@ -30,9 +30,7 @@
#include <sal/types.h>
-#ifndef BOOST_SHARED_PTR_HPP_INCLUDED
#include <boost/shared_ptr.hpp>
-#endif
#include <cppcanvas/renderer.hxx>
#include <cppcanvas/canvas.hxx>
diff --git a/cppcanvas/source/mtfrenderer/outdevstate.hxx b/cppcanvas/source/mtfrenderer/outdevstate.hxx
index 2935caa..a4cff94 100644
--- a/cppcanvas/source/mtfrenderer/outdevstate.hxx
+++ b/cppcanvas/source/mtfrenderer/outdevstate.hxx
@@ -31,25 +31,13 @@
#include <com/sun/star/uno/Reference.hxx>
#include <com/sun/star/uno/Sequence.hxx>
-#ifndef _COM_SUN_STAR_RENDERING_STRINGCONTEXT_HPP__
#include <com/sun/star/rendering/StringContext.hpp>
-#endif
-#ifndef _COM_SUN_STAR_RENDERING_RENDERSTATE_HPP__
#include <com/sun/star/rendering/RenderState.hpp>
-#endif
-#ifndef _COM_SUN_STAR_RENDERING_XPOLYPOLYGON2D_HPP__
#include <com/sun/star/rendering/XPolyPolygon2D.hpp>
-#endif
-#ifndef _COM_SUN_STAR_RENDERING_XCANVASFONT_HPP__
#include <com/sun/star/rendering/XCanvasFont.hpp>
-#endif
-#ifndef _COM_SUN_STAR_RENDERING_TEXTDIRECTION_HPP__
#include <com/sun/star/rendering/TextDirection.hpp>
-#endif
#include <basegfx/matrix/b2dhommatrix.hxx>
-#ifndef _BGFX_POLYGON_B2DPOLYPOLGON_HXX
#include <basegfx/polygon/b2dpolypolygon.hxx>
-#endif
#include <vcl/fntstyle.hxx>
#include <vcl/vclenum.hxx>
#include <vcl/outdev.hxx>
diff --git a/cppcanvas/source/wrapper/implbitmap.hxx b/cppcanvas/source/wrapper/implbitmap.hxx
index 7d0d5e9..1c92497 100644
--- a/cppcanvas/source/wrapper/implbitmap.hxx
+++ b/cppcanvas/source/wrapper/implbitmap.hxx
@@ -29,12 +29,8 @@
#define _CPPCANVAS_IMPLBITMAP_HXX
#include <com/sun/star/uno/Reference.hxx>
-#ifndef _COM_SUN_STAR_RENDERING_XBITMAP_HPP__
#include <com/sun/star/rendering/XBitmap.hpp>
-#endif
-#ifndef _COM_SUN_STAR_RENDERING_XGRAPHICDEVICE_HPP__
#include <com/sun/star/rendering/XGraphicDevice.hpp>
-#endif
#include <cppcanvas/bitmap.hxx>
#include <canvasgraphichelper.hxx>
diff --git a/cppcanvas/source/wrapper/implbitmapcanvas.hxx b/cppcanvas/source/wrapper/implbitmapcanvas.hxx
index 5d97f91..bed6507 100644
--- a/cppcanvas/source/wrapper/implbitmapcanvas.hxx
+++ b/cppcanvas/source/wrapper/implbitmapcanvas.hxx
@@ -28,16 +28,10 @@
#ifndef _CPPCANVAS_IMPLBITMAPCANVAS_HXX
#define _CPPCANVAS_IMPLBITMAPCANVAS_HXX
-#ifndef _COM_SUN_STAR_RENDERING_XBITMAPCANVAS_HPP__
#include <com/sun/star/rendering/XBitmapCanvas.hpp>
-#endif
-#ifndef _COM_SUN_STAR_RENDERING_XBITMAP_HPP__
#include <com/sun/star/rendering/XBitmap.hpp>
-#endif
-#ifndef BOOST_SHARED_PTR_HPP_INCLUDED
#include <boost/shared_ptr.hpp>
-#endif
#include <basegfx/vector/b2dsize.hxx>
#include <cppcanvas/bitmapcanvas.hxx>
diff --git a/cppcanvas/source/wrapper/implcolor.hxx b/cppcanvas/source/wrapper/implcolor.hxx
index 16440f3..5178a58 100644
--- a/cppcanvas/source/wrapper/implcolor.hxx
+++ b/cppcanvas/source/wrapper/implcolor.hxx
@@ -30,13 +30,9 @@
#include <com/sun/star/uno/Sequence.hxx>
-#ifndef BOOST_SHARED_PTR_HPP_INCLUDED
#include <boost/shared_ptr.hpp>
-#endif
-#ifndef _COM_SUN_STAR_RENDERING_XGRAPHICDEVICE_HPP__
#include <com/sun/star/rendering/XGraphicDevice.hpp>
-#endif
#include <cppcanvas/color.hxx>
diff --git a/cppcanvas/source/wrapper/implcustomsprite.hxx b/cppcanvas/source/wrapper/implcustomsprite.hxx
index 5498d7d..b6cac0e 100644
--- a/cppcanvas/source/wrapper/implcustomsprite.hxx
+++ b/cppcanvas/source/wrapper/implcustomsprite.hxx
@@ -30,9 +30,7 @@
#include <sal/types.h>
-#ifndef BOOST_SHARED_PTR_HPP_INCLUDED
#include <boost/shared_ptr.hpp>
-#endif
#include <cppcanvas/canvas.hxx>
#include <cppcanvas/customsprite.hxx>
diff --git a/cppcanvas/source/wrapper/implfont.hxx b/cppcanvas/source/wrapper/implfont.hxx
index e20a4d4..90264db 100644
--- a/cppcanvas/source/wrapper/implfont.hxx
+++ b/cppcanvas/source/wrapper/implfont.hxx
@@ -30,13 +30,9 @@
#include <com/sun/star/uno/Reference.hxx>
-#ifndef BOOST_SHARED_PTR_HPP_INCLUDED
#include <boost/shared_ptr.hpp>
-#endif
-#ifndef _COM_SUN_STAR_RENDERING_XCANVAS_HPP__
#include <com/sun/star/rendering/XCanvas.hpp>
-#endif
#include <cppcanvas/font.hxx>
namespace rtl
diff --git a/cppcanvas/source/wrapper/implpolypolygon.hxx b/cppcanvas/source/wrapper/implpolypolygon.hxx
index 85f68c9..6d1367d 100644
--- a/cppcanvas/source/wrapper/implpolypolygon.hxx
+++ b/cppcanvas/source/wrapper/implpolypolygon.hxx
@@ -29,15 +29,9 @@
#define _CANVAS_IMPLPOLYPOLYGON_HXX
#include <com/sun/star/uno/Reference.hxx>
-#ifndef _COM_SUN_STAR_RENDERING_XPOLYPOLYGON2D_HPP__
#include <com/sun/star/rendering/XPolyPolygon2D.hpp>
-#endif
-#ifndef _COM_SUN_STAR_RENDERING_XGRAPHICDEVICE_HPP__
#include <com/sun/star/rendering/XGraphicDevice.hpp>
-#endif
-#ifndef _COM_SUN_STAR_RENDERING_STROKEATTRIBUTES_HPP__
#include <com/sun/star/rendering/StrokeAttributes.hpp>
-#endif
#include <cppcanvas/polypolygon.hxx>
#include <canvasgraphichelper.hxx>
diff --git a/cppcanvas/source/wrapper/implsprite.hxx b/cppcanvas/source/wrapper/implsprite.hxx
index ec556fb..c10de90 100644
--- a/cppcanvas/source/wrapper/implsprite.hxx
+++ b/cppcanvas/source/wrapper/implsprite.hxx
@@ -32,9 +32,7 @@
#include <com/sun/star/rendering/XSpriteCanvas.hpp>
#include <com/sun/star/rendering/XSprite.hpp>
-#ifndef BOOST_SHARED_PTR_HPP_INCLUDED
#include <boost/shared_ptr.hpp>
-#endif
#include <cppcanvas/sprite.hxx>
#include <implspritecanvas.hxx>
diff --git a/cppcanvas/source/wrapper/implspritecanvas.hxx b/cppcanvas/source/wrapper/implspritecanvas.hxx
index 9c43fcc..f9a4ef0 100644
--- a/cppcanvas/source/wrapper/implspritecanvas.hxx
+++ b/cppcanvas/source/wrapper/implspritecanvas.hxx
@@ -28,15 +28,11 @@
#ifndef _CPPCANVAS_IMPLSPRITECANVAS_HXX
#define _CPPCANVAS_IMPLSPRITECANVAS_HXX
-#ifndef _COM_SUN_STAR_RENDERING_XSPRITECANVAS_HPP__
#include <com/sun/star/rendering/XSpriteCanvas.hpp>
-#endif
#include <basegfx/vector/b2dsize.hxx>
#include <basegfx/matrix/b2dhommatrix.hxx>
-#ifndef BOOST_SHARED_PTR_HPP_INCLUDED
#include <boost/shared_ptr.hpp>
-#endif
#include <cppcanvas/spritecanvas.hxx>
diff --git a/cppcanvas/source/wrapper/impltext.hxx b/cppcanvas/source/wrapper/impltext.hxx
index 296dca5..4601620 100644
--- a/cppcanvas/source/wrapper/impltext.hxx
+++ b/cppcanvas/source/wrapper/impltext.hxx
@@ -28,18 +28,10 @@
#ifndef _CANVAS_IMPLTEXT_HXX
#define _CANVAS_IMPLTEXT_HXX
-#ifndef _COM_SUN_STAR_RENDERING_RENDERSTATE_HPP__
#include <com/sun/star/rendering/RenderState.hpp>
-#endif
-#ifndef _COM_SUN_STAR_RENDERING_STRINGCONTEXT_HPP__
#include <com/sun/star/rendering/StringContext.hpp>
-#endif
-#ifndef _COM_SUN_STAR_RENDERING_XCANVAS_HPP__
#include <com/sun/star/rendering/XCanvas.hpp>
-#endif
-#ifndef _COM_SUN_STAR_RENDERING_XCANVASFONT_HPP__
#include <com/sun/star/rendering/XCanvasFont.hpp>
-#endif
#include <cppcanvas/text.hxx>
#include <canvasgraphichelper.hxx>
diff --git a/dtrans/source/generic/clipboardmanager.hxx b/dtrans/source/generic/clipboardmanager.hxx
index ee03c52..fb3bdac 100644
--- a/dtrans/source/generic/clipboardmanager.hxx
+++ b/dtrans/source/generic/clipboardmanager.hxx
@@ -30,9 +30,7 @@
#include <cppuhelper/compbase3.hxx>
-#ifndef _COM_SUN_STAR_DATATRANSFER_CLIPBAORD_XCLIPBOARDMANAGER_HPP_
#include <com/sun/star/datatransfer/clipboard/XClipboardManager.hpp>
-#endif
#include <com/sun/star/lang/XServiceInfo.hpp>
#include <map>
diff --git a/dtrans/source/generic/generic_clipboard.hxx b/dtrans/source/generic/generic_clipboard.hxx
index 659a323..ca17517 100644
--- a/dtrans/source/generic/generic_clipboard.hxx
+++ b/dtrans/source/generic/generic_clipboard.hxx
@@ -30,13 +30,9 @@
#include <cppuhelper/compbase4.hxx>
-#ifndef _COM_SUN_STAR_DATATRANSFER_CLIPBAORD_XCLIPBOARDEX_HPP_
#include <com/sun/star/datatransfer/clipboard/XClipboardEx.hpp>
-#endif
-#ifndef _COM_SUN_STAR_DATATRANSFER_CLIPBAORD_XCLIPBOARDNOTIFIER_HPP_
#include <com/sun/star/datatransfer/clipboard/XClipboardNotifier.hpp>
-#endif
#include <com/sun/star/lang/XServiceInfo.hpp>
#include <com/sun/star/lang/XInitialization.hpp>
diff --git a/dtrans/source/os2/clipb/Os2Transferable.hxx b/dtrans/source/os2/clipb/Os2Transferable.hxx
index 0bdd6d4..1985b10 100644
--- a/dtrans/source/os2/clipb/Os2Transferable.hxx
+++ b/dtrans/source/os2/clipb/Os2Transferable.hxx
@@ -30,9 +30,7 @@
#include <com/sun/star/datatransfer/XTransferable.hpp>
-#ifndef _COM_SUN_STAR_LANG_XEVENTLISTENER_HDL_
#include <com/sun/star/lang/XEventListener.hpp>
-#endif
#include <cppuhelper/implbase1.hxx>
#include <osl/thread.h>
diff --git a/dtrans/source/win32/dnd/globals.hxx b/dtrans/source/win32/dnd/globals.hxx
index 089d489..608f2f8 100644
--- a/dtrans/source/win32/dnd/globals.hxx
+++ b/dtrans/source/win32/dnd/globals.hxx
@@ -27,9 +27,7 @@
#ifndef _GLOBALS_HXX_
#define _GLOBALS_HXX_
-#ifndef _OSL_MUTEX_H_
#include <osl/mutex.hxx>
-#endif
#if defined _MSC_VER
#pragma warning(push,1)
diff --git a/dtrans/source/win32/dnd/source.hxx b/dtrans/source/win32/dnd/source.hxx
index b1e197f..ff56b93 100644
--- a/dtrans/source/win32/dnd/source.hxx
+++ b/dtrans/source/win32/dnd/source.hxx
@@ -31,12 +31,8 @@
#include <com/sun/star/datatransfer/dnd/XDragSource.hpp>
#include <com/sun/star/datatransfer/dnd/XDragSourceContext.hpp>
#include <com/sun/star/lang/XInitialization.hpp>
-#ifndef _OSL_MUTEX_H_
#include <osl/mutex.hxx>
-#endif
-#ifndef _CPPUHELPER_COMPBASE2_HXX_
#include <cppuhelper/compbase3.hxx>
-#endif
#include <com/sun/star/lang/XServiceInfo.hpp>
#include "../../inc/DtObjFactory.hxx"
#include "globals.hxx"
diff --git a/dtrans/source/win32/dnd/target.hxx b/dtrans/source/win32/dnd/target.hxx
index 923facb..b501061 100644
--- a/dtrans/source/win32/dnd/target.hxx
+++ b/dtrans/source/win32/dnd/target.hxx
@@ -32,13 +32,9 @@
#include <com/sun/star/datatransfer/dnd/DropTargetDragEnterEvent.hpp>
#include <com/sun/star/lang/XServiceInfo.hpp>
-#ifndef _CPPUHELPER_COMPBASE2_HXX_
#include <cppuhelper/compbase3.hxx>
-#endif
#include <cppuhelper/interfacecontainer.hxx>
-#ifndef _OSL_MUTEX_H_
#include <osl/mutex.hxx>
-#endif
#if defined _MSC_VER
#pragma warning(push,1)
diff --git a/dtrans/source/win32/dtobj/DOTransferable.hxx b/dtrans/source/win32/dtobj/DOTransferable.hxx
index 6694af6..6cdf1bc 100644
--- a/dtrans/source/win32/dtobj/DOTransferable.hxx
+++ b/dtrans/source/win32/dtobj/DOTransferable.hxx
@@ -35,9 +35,7 @@
#include <com/sun/star/datatransfer/XTransferable.hpp>
-#ifndef _CPPUHELPER_IMPLBASE1_HXX_
#include <cppuhelper/implbase2.hxx>
-#endif
#include "DataFmtTransl.hxx"
#include <com/sun/star/datatransfer/XMimeContentTypeFactory.hpp>
#include <com/sun/star/datatransfer/XMimeContentType.hpp>
diff --git a/dtrans/source/win32/dtobj/FmtFilter.hxx b/dtrans/source/win32/dtobj/FmtFilter.hxx
index 59c9993..e176c82 100644
--- a/dtrans/source/win32/dtobj/FmtFilter.hxx
+++ b/dtrans/source/win32/dtobj/FmtFilter.hxx
@@ -31,9 +31,7 @@
#include <sal/types.h>
-#ifndef _COM_SUN_STAR_UNO_SEQUENCE_H_
#include <com/sun/star/uno/Sequence.hxx>
-#endif
#if defined _MSC_VER
#pragma warning(push,1)
diff --git a/dtrans/source/win32/dtobj/TxtCnvtHlp.hxx b/dtrans/source/win32/dtobj/TxtCnvtHlp.hxx
index c8b209b..27415e5 100644
--- a/dtrans/source/win32/dtobj/TxtCnvtHlp.hxx
+++ b/dtrans/source/win32/dtobj/TxtCnvtHlp.hxx
@@ -31,9 +31,7 @@
#include <com/sun/star/datatransfer/DataFlavor.hpp>
-#ifndef _COM_SUN_STAR_UNO_SEQUENCE_HPP_
#include <com/sun/star/uno/Sequence.h>
-#endif
#include "DTransHelper.hxx"
#if defined _MSC_VER
diff --git a/dtrans/source/win32/dtobj/XTDataObject.hxx b/dtrans/source/win32/dtobj/XTDataObject.hxx
index 530e8a8..1e904ef 100644
--- a/dtrans/source/win32/dtobj/XTDataObject.hxx
+++ b/dtrans/source/win32/dtobj/XTDataObject.hxx
@@ -37,13 +37,9 @@
#include <com/sun/star/datatransfer/XTransferable.hpp>
#include <com/sun/star/datatransfer/clipboard/XClipboardOwner.hpp>
-#ifndef _DATAFORMATTRANSLATOR_HXX_
#include "DataFmtTransl.hxx"
-#endif
-#ifndef _FETCLIST_HXX_
#include "FEtcList.hxx"
-#endif
#if defined _MSC_VER
#pragma warning(push,1)
diff --git a/i18npool/inc/i18npool/mslangid.hxx b/i18npool/inc/i18npool/mslangid.hxx
index 03350e1..5ddc2e1 100644
--- a/i18npool/inc/i18npool/mslangid.hxx
+++ b/i18npool/inc/i18npool/mslangid.hxx
@@ -30,9 +30,7 @@
#include <sal/config.h>
-#ifndef INCLUDED_I18NPOOL_DLLAPI_H
#include "i18npool/i18npooldllapi.h"
-#endif
#include "i18npool/lang.h"
#include <com/sun/star/lang/Locale.hpp>
diff --git a/padmin/source/cmddlg.hxx b/padmin/source/cmddlg.hxx
index c5257ec..8a82a03 100644
--- a/padmin/source/cmddlg.hxx
+++ b/padmin/source/cmddlg.hxx
@@ -30,9 +30,7 @@
#include <vcl/dialog.hxx>
#include <tools/config.hxx>
-#ifndef _SV_BUTTON_HXX
#include <vcl/button.hxx>
-#endif
#include <vcl/fixed.hxx>
#include <vcl/group.hxx>
#include <vcl/combobox.hxx>
diff --git a/padmin/source/helper.hxx b/padmin/source/helper.hxx
index 381c436..42b79e7 100644
--- a/padmin/source/helper.hxx
+++ b/padmin/source/helper.hxx
@@ -32,18 +32,12 @@
#include <list>
#endif
#include <tools/string.hxx>
-#ifndef _RESID_HXX
#include <tools/resid.hxx>
-#endif
#include <vcl/dialog.hxx>
-#ifndef _SV_BUTTON_HXX
#include <vcl/button.hxx>
-#endif
#include <vcl/edit.hxx>
#include <vcl/fixed.hxx>
-#ifndef _SV_LISTBOX_HXX
#include <vcl/lstbox.hxx>
-#endif
#include <vcl/combobox.hxx>
class Config;
diff --git a/padmin/source/newppdlg.hxx b/padmin/source/newppdlg.hxx
index d1cbe13..0c42f31 100644
--- a/padmin/source/newppdlg.hxx
+++ b/padmin/source/newppdlg.hxx
@@ -29,9 +29,7 @@
#define _PAD_NEWPPDLG_HXX_
#include <vcl/dialog.hxx>
-#ifndef _SV_BUTTON_HXX
#include <vcl/button.hxx>
-#endif
#include <vcl/combobox.hxx>
#include <vcl/lstbox.hxx>
#include <vcl/fixed.hxx>
diff --git a/padmin/source/padialog.hxx b/padmin/source/padialog.hxx
index a3064ed..367e1bd 100644
--- a/padmin/source/padialog.hxx
+++ b/padmin/source/padialog.hxx
@@ -36,9 +36,7 @@
#include <vcl/dialog.hxx>
#include <tools/config.hxx>
#include <vcl/lstbox.hxx>
-#ifndef _SV_BUTTON_HXX
#include <vcl/button.hxx>
-#endif
#include <vcl/fixed.hxx>
#include <vcl/group.hxx>
#include <vcl/edit.hxx>
diff --git a/regexp/source/reclass.hxx b/regexp/source/reclass.hxx
index 510429c..dd8d2eb 100644
--- a/regexp/source/reclass.hxx
+++ b/regexp/source/reclass.hxx
@@ -27,21 +27,11 @@
#ifndef INCLUDED_REGEXP_RECLASS_HXX
#define INCLUDED_REGEXP_RECLASS_HXX
-#ifndef INCLUDED_I18NUTIL_UNICODE_HXX
#include <i18nutil/unicode.hxx>
-#endif
-#ifndef _COM_SUN_STAR_UTIL_SEARCHFLAGS_HPP_
#include <com/sun/star/util/SearchFlags.hpp>
-#endif
-#ifndef _COM_SUN_STAR_UTIL_SEARCHOPTIONS_HPP_
#include <com/sun/star/util/SearchOptions.hpp>
-#endif
-#ifndef _SAL_TYPES_H_
#include <sal/types.h>
-#endif
-#ifndef _COM_SUN_STAR_I18N_XEXTENDEDTRANSLITERATION_HPP_
#include <com/sun/star/i18n/XExtendedTransliteration.hpp>
-#endif
/* If any error codes are removed, changed, or added, update the
`re_error_msg' table in regex.c. */
diff --git a/rsc/inc/rscdef.hxx b/rsc/inc/rscdef.hxx
index 717bff0..469739a 100644
--- a/rsc/inc/rscdef.hxx
+++ b/rsc/inc/rscdef.hxx
@@ -27,9 +27,7 @@
#ifndef _RSCDEF_HXX
#define _RSCDEF_HXX
-#ifndef _TOOLS_UNQIDX_HXX
#include <tools/unqidx.hxx>
-#endif
#include <rsctree.hxx>
/****************** C L A S S E S ****************************************/
diff --git a/rsc/inc/rsclst.hxx b/rsc/inc/rsclst.hxx
index f6e436f..6ba9c91 100644
--- a/rsc/inc/rsclst.hxx
+++ b/rsc/inc/rsclst.hxx
@@ -28,9 +28,7 @@
#ifndef _RSCLST_HXX
#define _RSCLST_HXX
-#ifndef _TOOLS_LIST_HXX
#include <tools/list.hxx>
-#endif
#include <rscall.h>
class REResourceList;
diff --git a/rsc/inc/rscrsc.hxx b/rsc/inc/rscrsc.hxx
index 7e81909..f5b7d0b 100644
--- a/rsc/inc/rscrsc.hxx
+++ b/rsc/inc/rscrsc.hxx
@@ -27,15 +27,9 @@
#ifndef _RSCRSC_HXX
#define _RSCRSC_HXX
-#ifndef RSCALL_H
#include <rscall.h>
-#endif
-#ifndef RSCERROR_H
#include <rscerror.h>
-#endif
-#ifndef RSCTOOLS_HXX
#include <rsctools.hxx>
-#endif
#include <list>
diff --git a/sax/inc/sax/parser/saxparser.hxx b/sax/inc/sax/parser/saxparser.hxx
index 8a2b3d0..b0c314d 100644
--- a/sax/inc/sax/parser/saxparser.hxx
+++ b/sax/inc/sax/parser/saxparser.hxx
@@ -33,9 +33,7 @@
#include <com/sun/star/xml/sax/SAXException.hpp>
#include <rtl/ref.hxx>
-#ifndef BOOST_SHARED_PTR_HPP_INCLUDED
#include <boost/shared_ptr.hpp>
-#endif
#include <map>
#include <memory>
diff --git a/sot/inc/absdev.hxx b/sot/inc/absdev.hxx
index 9e52ccd..a58936b 100644
--- a/sot/inc/absdev.hxx
+++ b/sot/inc/absdev.hxx
@@ -28,9 +28,7 @@
#ifndef _SOT_ABSDEV_HXX
#define _SOT_ABSDEV_HXX
-#ifndef _TOOLS_SOLAR_H
#include <tools/solar.h>
-#endif
class JobSetup;
class AbstractDeviceData
diff --git a/sot/inc/sot/exchange.hxx b/sot/inc/sot/exchange.hxx
index b6c1ac9..c3891e1 100644
--- a/sot/inc/sot/exchange.hxx
+++ b/sot/inc/sot/exchange.hxx
@@ -37,9 +37,7 @@
#include <tools/string.hxx>
#include <com/sun/star/uno/Reference.hxx>
#include <com/sun/star/datatransfer/DataFlavor.hpp>
-#ifndef _COM_SUN_STAR_DATATRANSFER_DND_DNDCONSTANTS_HDL_
#include <com/sun/star/datatransfer/dnd/DNDConstants.hdl>
-#endif
#include "sot/sotdllapi.h"
class SotDataObject;
diff --git a/sot/inc/sot/factory.hxx b/sot/inc/sot/factory.hxx
index 0720a39..cc5ef3a 100644
--- a/sot/inc/sot/factory.hxx
+++ b/sot/inc/sot/factory.hxx
@@ -28,12 +28,8 @@
#ifndef _SOT_FACTORY_HXX
#define _SOT_FACTORY_HXX
-#ifndef _TOOLS_GLOBNAME_HXX
#include <tools/globname.hxx>
-#endif
-#ifndef _TOOLS_RTTI_HXX
#include <tools/rtti.hxx>
-#endif
#include "sot/sotdllapi.h"
/*************************************************************************
diff --git a/sot/inc/sot/object.hxx b/sot/inc/sot/object.hxx
index 9803ae6..d954843 100644
--- a/sot/inc/sot/object.hxx
+++ b/sot/inc/sot/object.hxx
@@ -29,12 +29,8 @@
#define _SOT_OBJECT_HXX
#include <sot/sotref.hxx>
-#ifndef _SOT_SOTDATA_HXX
#include <sot/sotdata.hxx>
-#endif
-#ifndef _TOOLS_GLOBNAME_HXX
#include <tools/globname.hxx>
-#endif
#include "sot/sotdllapi.h"
/*************************************************************************
diff --git a/sot/inc/sot/sotdata.hxx b/sot/inc/sot/sotdata.hxx
index c09fa0c..23eb161 100644
--- a/sot/inc/sot/sotdata.hxx
+++ b/sot/inc/sot/sotdata.hxx
@@ -31,9 +31,7 @@
/*************************************************************************
*************************************************************************/
-#ifndef _TOOLS_SOLAR_H
#include <tools/solar.h>
-#endif
#include "sot/sotdllapi.h"
//==================class SotData_Impl====================================
diff --git a/sot/inc/sot/sotref.hxx b/sot/inc/sot/sotref.hxx
index 7f59066..7ee1277 100644
--- a/sot/inc/sot/sotref.hxx
+++ b/sot/inc/sot/sotref.hxx
@@ -28,9 +28,7 @@
#ifndef _SOT_SOTREF_HXX
#define _SOT_SOTREF_HXX
-#ifndef _TOOLS_REF_HXX
#include <tools/ref.hxx>
-#endif
//========================================================================
enum SvCastEnum { SV_AGGREGATION_CAST };
diff --git a/sot/inc/sot/storage.hxx b/sot/inc/sot/storage.hxx
index aa24c62..16176c4 100644
--- a/sot/inc/sot/storage.hxx
+++ b/sot/inc/sot/storage.hxx
@@ -31,18 +31,12 @@
#include <com/sun/star/uno/Any.hxx>
#include <com/sun/star/uno/Reference.h>
-#ifndef _COM_SUN_STAR_IO_XINPUTSTREAM_H_
#include <com/sun/star/io/XInputStream.hpp>
-#endif
#include <com/sun/star/embed/XStorage.hpp>
#include <sot/object.hxx>
#include <sot/factory.hxx>
-#ifndef _TOOLS_STREAM_HXX
#include <tools/stream.hxx>
-#endif
-#ifndef _TOOLS_ERRCODE_HXX
#include <tools/errcode.hxx>
-#endif
#include "sot/sotdllapi.h"
#define STORAGE_FAILIFTHERE 0x02
diff --git a/sot/inc/stg.hxx b/sot/inc/stg.hxx
index 9caccbd..efbbfe0 100644
--- a/sot/inc/stg.hxx
+++ b/sot/inc/stg.hxx
@@ -31,26 +31,16 @@
#include <com/sun/star/uno/Any.h>
#include <com/sun/star/uno/Reference.h>
-#ifndef _COM_SUN_STAR_IO_XINPUTSTREAM_H_
#include <com/sun/star/io/XInputStream.hpp>
-#endif
-#ifndef _COM_SUN_STAR_UCB_XCOMMANDENVIRONMENT_H_
#include <com/sun/star/ucb/XCommandEnvironment.hpp>
-#endif
-#ifndef _COM_SUN_STAR_EMBED_XSTORAGE_H_
#include <com/sun/star/embed/XStorage.hpp>
-#endif
#include <tools/rtti.hxx>
-#ifndef _TOOLS_STREAM_HXX //autogen
#include <tools/stream.hxx>
-#endif
-#ifndef _TOOLS_GLOBNAME_HXX //autogen
#include <tools/globname.hxx>
-#endif
#include "sot/sotdllapi.h"
#include <list>
diff --git a/sot/source/sdstor/stgavl.hxx b/sot/source/sdstor/stgavl.hxx
index bc81816..63f9c6c 100644
--- a/sot/source/sdstor/stgavl.hxx
+++ b/sot/source/sdstor/stgavl.hxx
@@ -28,9 +28,7 @@
#ifndef _STGAVL_HXX
#define _STGAVL_HXX
-#ifndef _TOOLS_SOLAR_H
#include <tools/solar.h>
-#endif
// This class must be overloaded to define real, living nodes.
// Especially, the compare function must be implemented.
diff --git a/sot/source/sdstor/stgcache.hxx b/sot/source/sdstor/stgcache.hxx
index 503dcc2..0a939a1 100644
--- a/sot/source/sdstor/stgcache.hxx
+++ b/sot/source/sdstor/stgcache.hxx
@@ -29,12 +29,8 @@
#define _STGCACHE_HXX
#include <osl/endian.h>
-#ifndef _TOOLS_SOLAR_H
#include <tools/solar.h>
-#endif
-#ifndef _TOOLS_STREAM_HXX
#include <tools/stream.hxx>
-#endif
#include <stgelem.hxx>
class UCBStorageStream;
diff --git a/sot/source/sdstor/stgelem.hxx b/sot/source/sdstor/stgelem.hxx
index 430377f..af42015 100644
--- a/sot/source/sdstor/stgelem.hxx
+++ b/sot/source/sdstor/stgelem.hxx
@@ -31,9 +31,7 @@
#ifndef _STGELEM_HXX
#define _STGELEM_HXX
-#ifndef _TOOLS_SOLAR_H
#include <tools/solar.h>
-#endif
#include <stg.hxx>
diff --git a/sot/source/sdstor/stgstrms.hxx b/sot/source/sdstor/stgstrms.hxx
index a53d08b..fc95e72 100644
--- a/sot/source/sdstor/stgstrms.hxx
+++ b/sot/source/sdstor/stgstrms.hxx
@@ -28,9 +28,7 @@
#ifndef _STGSTRMS_HXX
#define _STGSTRMS_HXX
-#ifndef _TOOLS_STREAM_HXX
#include <tools/stream.hxx>
-#endif
class StgIo;
class StgStrm;
diff --git a/svl/inc/pickerhistoryaccess.hxx b/svl/inc/pickerhistoryaccess.hxx
index 9f4bcea..7a3c4ed 100644
--- a/svl/inc/pickerhistoryaccess.hxx
+++ b/svl/inc/pickerhistoryaccess.hxx
@@ -30,9 +30,7 @@
#include "svl/svldllapi.h"
-#ifndef _COM_SUN_STAR_UNO_REFERENX_HXX_
#include <com/sun/star/uno/Reference.hxx>
-#endif
//.........................................................................
namespace svt
diff --git a/svl/inc/svl/cntwall.hxx b/svl/inc/svl/cntwall.hxx
index 11c1cdd..709819c 100644
--- a/svl/inc/svl/cntwall.hxx
+++ b/svl/inc/svl/cntwall.hxx
@@ -29,9 +29,7 @@
#include "svl/svldllapi.h"
-#ifndef SHL_HXX
#include <tools/shl.hxx>
-#endif
#include <tools/rtti.hxx>
#include <tools/color.hxx>
#include <svl/poolitem.hxx>
diff --git a/svl/inc/svl/isethint.hxx b/svl/inc/svl/isethint.hxx
index 4422819..3be02a9 100644
--- a/svl/inc/svl/isethint.hxx
+++ b/svl/inc/svl/isethint.hxx
@@ -29,9 +29,7 @@
#include "svl/svldllapi.h"
-#ifndef _HINT_HXX
#include <svl/hint.hxx>
-#endif
class SfxItemSet;
diff --git a/svl/inc/svl/macitem.hxx b/svl/inc/svl/macitem.hxx
index e7f6811..69ec38d 100644
--- a/svl/inc/svl/macitem.hxx
+++ b/svl/inc/svl/macitem.hxx
@@ -35,9 +35,7 @@
#include <tools/debug.hxx>
#include <tools/string.hxx>
-#ifndef _TABLE_HXX
#include <tools/table.hxx>
-#endif
class SvStream;
diff --git a/svl/inc/svl/style.hxx b/svl/inc/svl/style.hxx
index 45b3cf5..1d6ffae 100644
--- a/svl/inc/svl/style.hxx
+++ b/svl/inc/svl/style.hxx
@@ -43,9 +43,7 @@
#include <svl/brdcst.hxx>
#include <svl/poolitem.hxx>
-#ifndef _SFX_STYLE_HRC
#include <svl/style.hrc>
-#endif
class SfxItemSet;
class SfxItemPool;
diff --git a/svl/inc/svl/zforlist.hxx b/svl/inc/svl/zforlist.hxx
index fc63aa0..e4e38d0 100644
--- a/svl/inc/svl/zforlist.hxx
+++ b/svl/inc/svl/zforlist.hxx
@@ -29,9 +29,7 @@
#include "svl/svldllapi.h"
#include <tools/string.hxx>
-#ifndef _TABLE_HXX //autogen
#include <tools/table.hxx>
-#endif
#include <i18npool/lang.h>
#include <svl/svarray.hxx>
#include <com/sun/star/uno/Reference.hxx>
diff --git a/svl/inc/xmlement.hxx b/svl/inc/xmlement.hxx
index aa7d78d..5180a98 100644
--- a/svl/inc/xmlement.hxx
+++ b/svl/inc/xmlement.hxx
@@ -28,9 +28,7 @@
#ifndef _SVTOOLS_XMLEMENT_HXX
#define _SVTOOLS_XMLEMENT_HXX
-#ifndef _SAL_TYPES_H
#include <sal/types.h>
-#endif
struct SvXMLEnumMapEntry
{
diff --git a/svtools/inc/QueryFolderName.hxx b/svtools/inc/QueryFolderName.hxx
index 8892ad3..bc0fffd 100644
--- a/svtools/inc/QueryFolderName.hxx
+++ b/svtools/inc/QueryFolderName.hxx
@@ -28,9 +28,7 @@
#define SVT_QUERYFOLDER_HXX
#include <vcl/fixed.hxx>
-#ifndef _SV_BUTTON_HXX
#include <vcl/button.hxx>
-#endif
#include <vcl/edit.hxx>
#include <vcl/dialog.hxx>
diff --git a/svtools/inc/acceleratorexecute.hxx b/svtools/inc/acceleratorexecute.hxx
index c8f0349..feeb403 100644
--- a/svtools/inc/acceleratorexecute.hxx
+++ b/svtools/inc/acceleratorexecute.hxx
@@ -38,30 +38,18 @@
#define INCLUDED_VECTOR
#endif
-#ifndef __COM_SUN_STAR_LANG_XMULTISERVICEFACTORY_HPP_
#include <com/sun/star/lang/XMultiServiceFactory.hpp>
-#endif
-#ifndef __COM_SUN_STAR_FRAME_XFRAME_HPP_
#include <com/sun/star/frame/XFrame.hpp>
-#endif
-#ifndef __COM_SUN_STAR_FRAME_XDISPATCHPROVIDER_HPP_
#include <com/sun/star/frame/XDispatchProvider.hpp>
-#endif
-#ifndef __com_SUN_STAR_UI_XACCELERATORCONFIGURATION_HPP_
#include <com/sun/star/ui/XAcceleratorConfiguration.hpp>
-#endif
-#ifndef __COM_SUN_STAR_UTIL_XURLTRANSFORMER_HPP_
#include <com/sun/star/util/XURLTransformer.hpp>
-#endif
#include <com/sun/star/util/URL.hpp>
-#ifndef __COM_SUN_STAR_AWT_KEYEVENT_HPP_
#include <com/sun/star/awt/KeyEvent.hpp>
-#endif
#include <vcl/keycod.hxx>
#include <vcl/evntpost.hxx>
#include <osl/mutex.h>
diff --git a/svtools/inc/addresstemplate.hxx b/svtools/inc/addresstemplate.hxx
index efe9456..92ee5ec 100644
--- a/svtools/inc/addresstemplate.hxx
+++ b/svtools/inc/addresstemplate.hxx
@@ -37,9 +37,7 @@
#include <vcl/lstbox.hxx>
#include <vcl/scrbar.hxx>
#include <com/sun/star/container/XNameAccess.hpp>
-#ifndef _COM_SUN_STAR_LANG_XSINGLESERVICEFACTORY_HPP_
#include <com/sun/star/lang/XMultiServiceFactory.hpp>
-#endif
#include <com/sun/star/util/AliasProgrammaticPair.hpp>
#include <com/sun/star/sdbc/XDataSource.hpp>
#include <unotools/configitem.hxx>
diff --git a/svtools/inc/calendar.hxx b/svtools/inc/calendar.hxx
index a43981a..b19e04b 100644
--- a/svtools/inc/calendar.hxx
+++ b/svtools/inc/calendar.hxx
@@ -30,17 +30,11 @@
#include "svtools/svtdllapi.h"
#include <unotools/calendarwrapper.hxx>
-#ifndef _COM_SUN_STAR_I18N_WEEKDAYS_HPP
#include <com/sun/star/i18n/Weekdays.hpp>
-#endif
-#ifndef _CTRL_HXX
#include <vcl/ctrl.hxx>
-#endif
#include <vcl/timer.hxx>
-#ifndef _FIELD_HXX
#include <vcl/field.hxx>
-#endif
class Table;
class MouseEvent;
diff --git a/svtools/inc/ctrlbox.hxx b/svtools/inc/ctrlbox.hxx
index c53e36a..20bc75c 100644
--- a/svtools/inc/ctrlbox.hxx
+++ b/svtools/inc/ctrlbox.hxx
@@ -30,24 +30,12 @@
#include "svtools/svtdllapi.h"
-#ifndef _LSTBOX_HXX
#include <vcl/lstbox.hxx>
-#endif
-#ifndef _COMBOBOX_HXX
#include <vcl/combobox.hxx>
-#endif
-#ifndef _IMAGE_HXX
#include <vcl/image.hxx>
-#endif
-#ifndef _VIRDEV_HXX
#include <vcl/virdev.hxx>
-#endif
-#ifndef _METRIC_HXX
#include <vcl/metric.hxx>
-#endif
-#ifndef _FIELD_HXX
#include <vcl/field.hxx>
-#endif
class ImplFontList;
class ImpColorList;
diff --git a/svtools/inc/ctrltool.hxx b/svtools/inc/ctrltool.hxx
index 64d92d7..55a7497 100644
--- a/svtools/inc/ctrltool.hxx
+++ b/svtools/inc/ctrltool.hxx
@@ -30,13 +30,9 @@
#include "svtools/svtdllapi.h"
-#ifndef _SAL_TYPES_H
#include <sal/types.h>
-#endif
#include <tools/list.hxx>
-#ifndef _METRIC_HXX
#include <vcl/metric.hxx>
-#endif
class ImplFontListNameInfo;
class OutputDevice;
diff --git a/svtools/inc/filectrl.hxx b/svtools/inc/filectrl.hxx
index 47dd230..ced2665 100644
--- a/svtools/inc/filectrl.hxx
+++ b/svtools/inc/filectrl.hxx
@@ -31,9 +31,7 @@
#include "svtools/svtdllapi.h"
#include <vcl/window.hxx>
#include <vcl/edit.hxx>
-#ifndef _SV_BUTTON_HXX
#include <vcl/button.hxx>
-#endif
#define STR_FILECTRL_BUTTONTEXT 333 // ID-Range?!
diff --git a/svtools/inc/filedlg.hxx b/svtools/inc/filedlg.hxx
index f484006..159fe59 100644
--- a/svtools/inc/filedlg.hxx
+++ b/svtools/inc/filedlg.hxx
@@ -30,9 +30,7 @@
#include "svtools/svtdllapi.h"
-#ifndef _DIALOG_HXX
#include <vcl/dialog.hxx>
-#endif
class Edit;
class ImpSvFileDlg;
diff --git a/svtools/inc/fileview.hxx b/svtools/inc/fileview.hxx
index 94276c7..4035568 100644
--- a/svtools/inc/fileview.hxx
+++ b/svtools/inc/fileview.hxx
@@ -33,9 +33,7 @@
#include <vcl/ctrl.hxx>
#include <vcl/image.hxx>
#include <vcl/fixed.hxx>
-#ifndef _SV_BUTTON_HXX
#include <vcl/button.hxx>
-#endif
#include <vcl/dialog.hxx>
#include <rtl/ustring.hxx>
diff --git a/svtools/inc/roadmap.hxx b/svtools/inc/roadmap.hxx
index a9a81d2..972fe9c 100644
--- a/svtools/inc/roadmap.hxx
+++ b/svtools/inc/roadmap.hxx
@@ -31,9 +31,7 @@
#include <vcl/ctrl.hxx>
#include <vcl/imgctrl.hxx>
-#ifndef _SVTOOLS_HYPERLABEL_HXX
#include "svtools/hyperlabel.hxx"
-#endif
diff --git a/svtools/inc/rtfout.hxx b/svtools/inc/rtfout.hxx
index 4dc9a95..a8da0e2 100644
--- a/svtools/inc/rtfout.hxx
+++ b/svtools/inc/rtfout.hxx
@@ -31,9 +31,7 @@
#include "svtools/svtdllapi.h"
#include <tools/solar.h>
-#ifndef _RTL_TEXTENC_H_
#include <rtl/textenc.h>
-#endif
class String;
class SvStream;
diff --git a/svtools/inc/ruler.hxx b/svtools/inc/ruler.hxx
index 22eec9f..f15bd6b 100644
--- a/svtools/inc/ruler.hxx
+++ b/svtools/inc/ruler.hxx
@@ -31,9 +31,7 @@
#include "svtools/svtdllapi.h"
#include <tools/link.hxx>
#include <vcl/window.hxx>
-#ifndef _VIRDEV_HXX
#include <vcl/virdev.hxx>
-#endif
#include <vcl/field.hxx>
class MouseEvent;
diff --git a/svtools/inc/scrwin.hxx b/svtools/inc/scrwin.hxx
index 2283d7f..2d34381 100644
--- a/svtools/inc/scrwin.hxx
+++ b/svtools/inc/scrwin.hxx
@@ -30,9 +30,7 @@
#include "svtools/svtdllapi.h"
-#ifndef _SCRBAR_HXX //autogen
#include <vcl/scrbar.hxx>
-#endif
class DataChangedEvent;
diff --git a/svtools/inc/stdmenu.hxx b/svtools/inc/stdmenu.hxx
index 73c79ee..c4c3b3c 100644
--- a/svtools/inc/stdmenu.hxx
+++ b/svtools/inc/stdmenu.hxx
@@ -30,9 +30,7 @@
#include "svtools/svtdllapi.h"
#include <tools/link.hxx>
-#ifndef _MENU_HXX
#include <vcl/menu.hxx>
-#endif
class FontList;
class FontInfo;
diff --git a/svtools/inc/svtools/accessiblefactory.hxx b/svtools/inc/svtools/accessiblefactory.hxx
old mode 100755
new mode 100644
index d653c6c..cca56de
--- a/svtools/inc/svtools/accessiblefactory.hxx
+++ b/svtools/inc/svtools/accessiblefactory.hxx
@@ -28,13 +28,9 @@
#ifndef SVTOOLS_ACCESSIBLE_FACTORY_HXX
#define SVTOOLS_ACCESSIBLE_FACTORY_HXX
-#ifndef _COM_SUN_STAR_UNO_REFERENCE_HXX
#include <com/sun/star/uno/Reference.hxx>
-#endif
-#ifndef _RTL_REF_HXX
#include <rtl/ref.hxx>
-#endif
#include "AccessibleBrowseBoxObjType.hxx"
#include "accessibletableprovider.hxx"
#include "accessibletable.hxx"
diff --git a/svtools/inc/svtools/accessibletable.hxx b/svtools/inc/svtools/accessibletable.hxx
old mode 100755
new mode 100644
diff --git a/svtools/inc/svtools/chartprettypainter.hxx b/svtools/inc/svtools/chartprettypainter.hxx
index 22ea16f..68b4579 100644
--- a/svtools/inc/svtools/chartprettypainter.hxx
+++ b/svtools/inc/svtools/chartprettypainter.hxx
@@ -28,9 +28,7 @@
#ifndef CHARTPRETTYPAINTER_HXX
#define CHARTPRETTYPAINTER_HXX
-#ifndef INCLUDED_SVTDLLAPI_H
#include "svtools/svtdllapi.h"
-#endif
//#include <svtools/embedhlp.hxx>
#include <vcl/outdev.hxx>
diff --git a/svtools/inc/svtools/colrdlg.hxx b/svtools/inc/svtools/colrdlg.hxx
index 8f1093e..9c4136b 100644
--- a/svtools/inc/svtools/colrdlg.hxx
+++ b/svtools/inc/svtools/colrdlg.hxx
@@ -30,9 +30,7 @@
#include "svtools/svtdllapi.h"
#include <vcl/dialog.hxx>
-#ifndef _SV_BUTTON_HXX //autogen
#include <vcl/button.hxx>
-#endif
#include <vcl/fixed.hxx>
#include <vcl/field.hxx>
#include <svtools/colctrl.hxx>
diff --git a/svtools/inc/svtools/editbrowsebox.hxx b/svtools/inc/svtools/editbrowsebox.hxx
index 09ceeac..17ae4fe 100644
--- a/svtools/inc/svtools/editbrowsebox.hxx
+++ b/svtools/inc/svtools/editbrowsebox.hxx
@@ -36,9 +36,7 @@
#include <vcl/combobox.hxx>
#include <vcl/lstbox.hxx>
-#ifndef _IMAGEBTN_HXX
#include <vcl/imagebtn.hxx>
-#endif
#include <svtools/brwbox.hxx>
#include <vcl/timer.hxx>
#include <svtools/brwhead.hxx>
diff --git a/svtools/inc/svtools/ehdl.hxx b/svtools/inc/svtools/ehdl.hxx
index 3386666..962e1ad 100644
--- a/svtools/inc/svtools/ehdl.hxx
+++ b/svtools/inc/svtools/ehdl.hxx
@@ -32,9 +32,7 @@
#include "svtools/svtdllapi.h"
-#ifndef _EINF_HXX
#include <tools/errinf.hxx>
-#endif
class Window;
class ResMgr;
diff --git a/svtools/inc/svtools/embedhlp.hxx b/svtools/inc/svtools/embedhlp.hxx
index bc3511b..f612bbf 100644
--- a/svtools/inc/svtools/embedhlp.hxx
+++ b/svtools/inc/svtools/embedhlp.hxx
@@ -34,9 +34,7 @@
#include <com/sun/star/embed/Aspects.hpp>
#include <com/sun/star/io/XInputStream.hpp>
#include <vcl/graph.hxx>
-#ifndef _SV_MAPUNIT_HXX
#include <vcl/mapunit.hxx>
-#endif
#include <rtl/ustring.hxx>
#define NS_UNO ::com::sun::star::uno
diff --git a/svtools/inc/svtools/inettbc.hxx b/svtools/inc/svtools/inettbc.hxx
index 1e0467d..b1d8665 100644
--- a/svtools/inc/svtools/inettbc.hxx
+++ b/svtools/inc/svtools/inettbc.hxx
@@ -34,9 +34,7 @@
#include <tools/string.hxx>
#include <tools/urlobj.hxx>
-#ifndef _COMBOBOX_HXX //autogen
#include <vcl/combobox.hxx>
-#endif
class IUrlFilter;
class SvtMatchContext_Impl;
diff --git a/svtools/inc/svtools/insdlg.hxx b/svtools/inc/svtools/insdlg.hxx
index c2dbd1a..e4d39f3 100644
--- a/svtools/inc/svtools/insdlg.hxx
+++ b/svtools/inc/svtools/insdlg.hxx
@@ -34,9 +34,7 @@
#include <tools/globname.hxx>
#include <sot/formats.hxx>
-#ifndef _OWNCONT_HXX
#include <svl/ownlist.hxx>
-#endif
#include <svtools/transfer.hxx>
class SvObjectServer
diff --git a/svtools/inc/svtools/printdlg.hxx b/svtools/inc/svtools/printdlg.hxx
index b4ac79a..31d2a8e 100644
--- a/svtools/inc/svtools/printdlg.hxx
+++ b/svtools/inc/svtools/printdlg.hxx
@@ -30,27 +30,13 @@
#include "svtools/svtdllapi.h"
-#ifndef _VCL_DIALOG_HXX
#include <vcl/dialog.hxx>
-#endif
-#ifndef _VCL_FIXED_HXX
#include <vcl/fixed.hxx>
-#endif
-#ifndef _VCL_BUTTON_HXX
#include <vcl/button.hxx>
-#endif
-#ifndef _VCL_GROUP_HXX
#include <vcl/group.hxx>
-#endif
-#ifndef _VCL_FIELD_HXX
#include <vcl/field.hxx>
-#endif
-#ifndef _VCL_EDIT_HXX
#include <vcl/edit.hxx>
-#endif
-#ifndef _VCL_LSTBOX_HXX
#include <vcl/lstbox.hxx>
-#endif
#include <svtools/stdctrl.hxx>
class Printer;
diff --git a/svtools/inc/svtools/prnsetup.hxx b/svtools/inc/svtools/prnsetup.hxx
index 87bdf30..1f001a7 100644
--- a/svtools/inc/svtools/prnsetup.hxx
+++ b/svtools/inc/svtools/prnsetup.hxx
@@ -30,24 +30,12 @@
#include "svtools/svtdllapi.h"
-#ifndef _VCL_DIALOG_HXX
#include <vcl/dialog.hxx>
-#endif
-#ifndef _VCL_FIXED_HXX
#include <vcl/fixed.hxx>
-#endif
-#ifndef _VCL_BUTTON_HXX
#include <vcl/button.hxx>
-#endif
-#ifndef _VCL_GROUP_HXX
#include <vcl/group.hxx>
-#endif
-#ifndef _VCL_LSTBOX_HXX
#include <vcl/lstbox.hxx>
-#endif
-#ifndef _VCL_TIMER_HXX
#include <vcl/timer.hxx>
-#endif
#include <svtools/stdctrl.hxx>
class Printer;
diff --git a/svtools/inc/svtools/stdctrl.hxx b/svtools/inc/svtools/stdctrl.hxx
index e3210ac..09f8d05 100644
--- a/svtools/inc/svtools/stdctrl.hxx
+++ b/svtools/inc/svtools/stdctrl.hxx
@@ -30,12 +30,8 @@
#include "svtools/svtdllapi.h"
-#ifndef _EDIT_HXX
#include <vcl/edit.hxx>
-#endif
-#ifndef _FIXED_HXX
#include <vcl/fixed.hxx>
-#endif
// -------------
// - FixedInfo -
diff --git a/svtools/inc/svtools/svicnvw.hxx b/svtools/inc/svtools/svicnvw.hxx
index 790ecf2..124f6c8 100644
--- a/svtools/inc/svtools/svicnvw.hxx
+++ b/svtools/inc/svtools/svicnvw.hxx
@@ -28,9 +28,7 @@
#ifndef _SVICNVW_HXX
#define _SVICNVW_HXX
-#ifndef _IMAGE_HXX
#include <vcl/image.hxx>
-#endif
#include <svtools/svlbox.hxx>
class SvImpIconView;
diff --git a/svtools/inc/svtools/svlbitm.hxx b/svtools/inc/svtools/svlbitm.hxx
index a3dc9a3..5134789 100644
--- a/svtools/inc/svtools/svlbitm.hxx
+++ b/svtools/inc/svtools/svlbitm.hxx
@@ -31,13 +31,9 @@
#include "svtools/svtdllapi.h"
-#ifndef LINK_HXX
#include <tools/link.hxx>
-#endif
-#ifndef _IMAGE_HXX
#include <vcl/image.hxx>
-#endif
#include <svtools/svlbox.hxx>
class SvLBoxEntry;
diff --git a/svtools/inc/svtools/svlbox.hxx b/svtools/inc/svtools/svlbox.hxx
index e0c1e2a..272b1b0 100644
--- a/svtools/inc/svtools/svlbox.hxx
+++ b/svtools/inc/svtools/svlbox.hxx
@@ -35,17 +35,11 @@
#define INCLUDED_DEQUE
#endif
-#ifndef _CTRL_HXX
#include <vcl/ctrl.hxx>
-#endif
#include <vcl/seleng.hxx>
-#ifndef _EDIT_HXX
#include <vcl/edit.hxx>
-#endif
#include <vcl/timer.hxx>
-#ifndef _ACCEL_HXX
#include <vcl/accel.hxx>
-#endif
#include <vcl/mnemonicengine.hxx>
#include <tools/gen.hxx>
#include <svtools/treelist.hxx>
diff --git a/svtools/inc/svtools/table/tabledatawindow.hxx b/svtools/inc/svtools/table/tabledatawindow.hxx
index 8594652..868f5e3 100644
--- a/svtools/inc/svtools/table/tabledatawindow.hxx
+++ b/svtools/inc/svtools/table/tabledatawindow.hxx
@@ -27,9 +27,7 @@
#ifndef SVTOOLS_SOURCE_TABLE_TABLEDATAWINDOW_HXX
#define SVTOOLS_SOURCE_TABLE_TABLEDATAWINDOW_HXX
-#ifndef _SV_WINDOW_HXX
#include <vcl/window.hxx>
-#endif
#include <vcl/seleng.hxx>
//........................................................................
diff --git a/svtools/inc/svtools/texteng.hxx b/svtools/inc/svtools/texteng.hxx
index 610bcaa..06769b5 100644
--- a/svtools/inc/svtools/texteng.hxx
+++ b/svtools/inc/svtools/texteng.hxx
@@ -57,9 +57,7 @@ class TETextPortion;
#include <tools/string.hxx>
#include <tools/gen.hxx>
-#ifndef _COM_SUN_STAR_LOCALE_LOCALE_HPP_
#include <com/sun/star/lang/Locale.hpp>
-#endif
#include <com/sun/star/uno/Reference.hxx>
struct TEIMEInfos;
diff --git a/svtools/inc/svtools/toolpanel/decklayouter.hxx b/svtools/inc/svtools/toolpanel/decklayouter.hxx
old mode 100755
new mode 100644
diff --git a/svtools/inc/svtools/toolpanel/tablayouter.hxx b/svtools/inc/svtools/toolpanel/tablayouter.hxx
old mode 100755
new mode 100644
diff --git a/svtools/inc/svtools/toolpanel/toolpaneldeck.hxx b/svtools/inc/svtools/toolpanel/toolpaneldeck.hxx
old mode 100755
new mode 100644
diff --git a/svtools/inc/svtools/transfer.hxx b/svtools/inc/svtools/transfer.hxx
index 305019e..e3584b0 100644
--- a/svtools/inc/svtools/transfer.hxx
+++ b/svtools/inc/svtools/transfer.hxx
@@ -44,9 +44,7 @@
#include <com/sun/star/datatransfer/dnd/DropTargetDragEvent.hpp>
#include <com/sun/star/datatransfer/dnd/DropTargetDropEvent.hpp>
#include <com/sun/star/datatransfer/dnd/XDragSourceListener.hpp>
-#ifndef _COM_SUN_STAR_DATATRANSFER_DND_XDROPTARGETELISTENER_HPP_
#include <com/sun/star/datatransfer/dnd/XDropTargetListener.hpp>
-#endif
#include <com/sun/star/io/XInputStream.hpp>
// ------------------------
diff --git a/svtools/inc/svtools/treelist.hxx b/svtools/inc/svtools/treelist.hxx
index 23fc3e1..b8a7faf 100644
--- a/svtools/inc/svtools/treelist.hxx
+++ b/svtools/inc/svtools/treelist.hxx
@@ -32,9 +32,7 @@
#include <tools/solar.h>
#include <tools/list.hxx>
-#ifndef _TABLE_HXX
#include <tools/table.hxx>
-#endif
#include <tools/link.hxx>
#include <tools/string.hxx>
#include <tools/debug.hxx>
diff --git a/svtools/inc/svtools/valueset.hxx b/svtools/inc/svtools/valueset.hxx
index 57f7133..2d66930 100644
--- a/svtools/inc/svtools/valueset.hxx
+++ b/svtools/inc/svtools/valueset.hxx
@@ -30,12 +30,8 @@
#include "svtools/svtdllapi.h"
-#ifndef _CTRL_HXX
#include <vcl/ctrl.hxx>
-#endif
-#ifndef _VIRDEV_HXX
#include <vcl/virdev.hxx>
-#endif
#include <vcl/timer.hxx>
class MouseEvent;
diff --git a/svtools/inc/svtools/wizardmachine.hxx b/svtools/inc/svtools/wizardmachine.hxx
index eb2e981..5a3ef04 100644
--- a/svtools/inc/svtools/wizardmachine.hxx
+++ b/svtools/inc/svtools/wizardmachine.hxx
@@ -29,9 +29,7 @@
#include "svtools/svtdllapi.h"
#include <svtools/wizdlg.hxx>
-#ifndef _SV_BUTTON_HXX
#include <vcl/button.hxx>
-#endif
#include <vcl/tabpage.hxx>
#include <comphelper/stl_types.hxx>
diff --git a/svtools/inc/svtools/wizdlg.hxx b/svtools/inc/svtools/wizdlg.hxx
index c610540..8281c00 100644
--- a/svtools/inc/svtools/wizdlg.hxx
+++ b/svtools/inc/svtools/wizdlg.hxx
@@ -30,9 +30,7 @@
#include "svtools/svtdllapi.h"
-#ifndef _VCL_DIALOG_HXX
#include <vcl/dialog.hxx>
-#endif
class TabPage;
class Button;
diff --git a/svtools/inc/svtools/xwindowitem.hxx b/svtools/inc/svtools/xwindowitem.hxx
old mode 100755
new mode 100644
diff --git a/svtools/inc/taskbar.hxx b/svtools/inc/taskbar.hxx
index 65ed156..8183506 100644
--- a/svtools/inc/taskbar.hxx
+++ b/svtools/inc/taskbar.hxx
@@ -30,9 +30,7 @@
#include "svtools/svtdllapi.h"
#include <tools/time.hxx>
-#ifndef _TOOLS_LIST_HXX
#include <tools/list.hxx>
-#endif
#include <vcl/timer.hxx>
#include <vcl/toolbox.hxx>
#include <vcl/status.hxx>
diff --git a/svtools/inc/wallitem.hxx b/svtools/inc/wallitem.hxx
index 27f137b..17320d1 100644
--- a/svtools/inc/wallitem.hxx
+++ b/svtools/inc/wallitem.hxx
@@ -27,9 +27,7 @@
#ifndef _WALLITEM_HXX
#define _WALLITEM_HXX
-#ifndef SHL_HXX
#include <tools/shl.hxx>
-#endif
// -----------------------------------------------------------------------------------------
// Hilfsklasse, um die Download-Funktionalitaet des SvxBrushItems unterhalb
diff --git a/svtools/source/brwbox/datwin.hxx b/svtools/source/brwbox/datwin.hxx
index cad4115..68d97e8 100644
--- a/svtools/source/brwbox/datwin.hxx
+++ b/svtools/source/brwbox/datwin.hxx
@@ -28,14 +28,10 @@
#ifndef _SFXDATWIN_HXX
#define _SFXDATWIN_HXX
-#ifndef _BRWBOX_HXX
#include <svtools/brwbox.hxx>
-#endif
#include <svtools/brwhead.hxx>
#include <vcl/timer.hxx>
-#ifndef _IMAGE_HXX //autogen
#include <vcl/image.hxx>
-#endif
#include <tools/list.hxx>
#include <svtools/transfer.hxx>
diff --git a/svtools/source/contnr/imivctl.hxx b/svtools/source/contnr/imivctl.hxx
index 39fae2e..49c3ddc 100644
--- a/svtools/source/contnr/imivctl.hxx
+++ b/svtools/source/contnr/imivctl.hxx
@@ -28,12 +28,8 @@
#ifndef _IMPICNVW_HXX
#define _IMPICNVW_HXX
-#ifndef _VIRDEV_HXX
#include <vcl/virdev.hxx>
-#endif
-#ifndef _SCRBAR_HXX
#include <vcl/scrbar.hxx>
-#endif
#include <vcl/timer.hxx>
#include <vcl/seleng.hxx>
#include <tools/debug.hxx>
diff --git a/svtools/source/control/inettbc.cxx b/svtools/source/control/inettbc.cxx
index 0b51932..ce4baee 100644
--- a/svtools/source/control/inettbc.cxx
+++ b/svtools/source/control/inettbc.cxx
@@ -42,9 +42,7 @@
#include <com/sun/star/sdbc/XResultSet.hpp>
#include <com/sun/star/sdbc/XRow.hpp>
-#ifndef _COM_SUN_STAR_TASK_XINTERACTIONHANDLER_HDL_
#include <com/sun/star/task/XInteractionHandler.hdl>
-#endif
#include <com/sun/star/ucb/NumberedSortingInfo.hpp>
#include <com/sun/star/ucb/XAnyCompareFactory.hpp>
#include <com/sun/star/ucb/XProgressHandler.hpp>
diff --git a/svtools/source/control/valueimp.hxx b/svtools/source/control/valueimp.hxx
old mode 100755
new mode 100644
index a2e3826..ed09b83
--- a/svtools/source/control/valueimp.hxx
+++ b/svtools/source/control/valueimp.hxx
@@ -29,9 +29,7 @@
#include <tools/list.hxx>
#include <tools/color.hxx>
#include <tools/string.hxx>
-#ifndef _IMAGE_HXX
#include <vcl/image.hxx>
-#endif
#include <rtl/uuid.h>
#include <cppuhelper/implbase5.hxx>
#include <cppuhelper/compbase6.hxx>
diff --git a/svtools/source/dialogs/filedlg2.hxx b/svtools/source/dialogs/filedlg2.hxx
index c39f904..eac43c1 100644
--- a/svtools/source/dialogs/filedlg2.hxx
+++ b/svtools/source/dialogs/filedlg2.hxx
@@ -30,9 +30,7 @@
#include <tools/debug.hxx>
#include <tools/fsys.hxx>
-#ifndef _SV_BUTTON_HXX //autogen wg. PushButton
#include <vcl/button.hxx>
-#endif
#include <vcl/unohelp.hxx>
class FixedText;
diff --git a/svtools/source/dialogs/propctrl.hxx b/svtools/source/dialogs/propctrl.hxx
index 41d4147..4343ce6 100644
--- a/svtools/source/dialogs/propctrl.hxx
+++ b/svtools/source/dialogs/propctrl.hxx
@@ -35,18 +35,10 @@
*/
-#ifndef __PROPED_HXX__
#include <proped.hxx>
-#endif
-#ifndef _UNO_HXX
#include <usr/uno.hxx>
-#endif
-#ifndef _USR_SEQU_HXX
#include <usr/sequ.hxx>
-#endif
-#ifndef __TOOLSIDL_HXX__
#include <usr/toolsidl.hxx>
-#endif
/*
class XPropertyEditor
diff --git a/svtools/source/edit/texteng.cxx b/svtools/source/edit/texteng.cxx
index 8586c5a..35ebc5d 100644
--- a/svtools/source/edit/texteng.cxx
+++ b/svtools/source/edit/texteng.cxx
@@ -50,9 +50,7 @@
#include <com/sun/star/i18n/WordType.hpp>
-#ifndef _COM_SUN_STAR_I18N_XEXTENDEDINPUTSEQUENCECHECKER_HDL_
#include <com/sun/star/i18n/XExtendedInputSequenceChecker.hpp>
-#endif
#include <com/sun/star/i18n/InputSequenceCheckMode.hpp>
#include <com/sun/star/i18n/ScriptType.hpp>
diff --git a/svtools/source/filter.vcl/igif/decode.hxx b/svtools/source/filter.vcl/igif/decode.hxx
index 739e7ae..c1e124b 100644
--- a/svtools/source/filter.vcl/igif/decode.hxx
+++ b/svtools/source/filter.vcl/igif/decode.hxx
@@ -28,9 +28,7 @@
#ifndef _DECODE_HXX
#define _DECODE_HXX
-#ifndef _BMPACC_HXX
#include <vcl/bmpacc.hxx>
-#endif
struct GIFLZWTableEntry;
diff --git a/svtools/source/filter.vcl/wmf/winmtf.hxx b/svtools/source/filter.vcl/wmf/winmtf.hxx
index 5545da3..33a315c 100644
--- a/svtools/source/filter.vcl/wmf/winmtf.hxx
+++ b/svtools/source/filter.vcl/wmf/winmtf.hxx
@@ -33,12 +33,8 @@
#endif
#include <sot/object.hxx>
-#ifndef BOOST_SHARED_PTR_HPP_INCLUDED
#include <boost/shared_ptr.hpp>
-#endif
-#ifndef _TOOL_DEBUG_HXX
#include <tools/debug.hxx>
-#endif
#include <tools/stack.hxx>
#include <tools/table.hxx>
#include <tools/dynary.hxx>
diff --git a/svtools/source/hatchwindow/hatchwindowfactory.hxx b/svtools/source/hatchwindow/hatchwindowfactory.hxx
index e1bdb3f..04ba1dc 100644
--- a/svtools/source/hatchwindow/hatchwindowfactory.hxx
+++ b/svtools/source/hatchwindow/hatchwindowfactory.hxx
@@ -32,9 +32,7 @@
#include <com/sun/star/lang/XServiceInfo.hpp>
-#ifndef _CPPUHELPER_IMPLBASE5_HXX_
#include <cppuhelper/implbase2.hxx>
-#endif
class OHatchWindowFactory : public ::cppu::WeakImplHelper2<
diff --git a/svtools/source/inc/gifread.hxx b/svtools/source/inc/gifread.hxx
index 5e6bf2d..3b59d11 100644
--- a/svtools/source/inc/gifread.hxx
+++ b/svtools/source/inc/gifread.hxx
@@ -28,12 +28,8 @@
#ifndef _GIFREAD_HXX
#define _GIFREAD_HXX
-#ifndef _GRAPH_HXX
#include <vcl/graph.hxx>
-#endif
-#ifndef _BMPACC_HXX
#include <vcl/bmpacc.hxx>
-#endif
#ifdef _GIFPRIVATE
diff --git a/svtools/source/inc/gradwrap.hxx b/svtools/source/inc/gradwrap.hxx
index 18383e5..a39af05 100644
--- a/svtools/source/inc/gradwrap.hxx
+++ b/svtools/source/inc/gradwrap.hxx
@@ -26,9 +26,7 @@
************************************************************************/
-#ifndef _SVGEN_HXX
#include <svgen.hxx>
-#endif
/******************************************************************************
diff --git a/svtools/source/inc/jpeg.hxx b/svtools/source/inc/jpeg.hxx
index b2431ce..493f115 100644
--- a/svtools/source/inc/jpeg.hxx
+++ b/svtools/source/inc/jpeg.hxx
@@ -28,9 +28,7 @@
#ifndef _JPEG_HXX
#define _JPEG_HXX
-#ifndef _GRAPH_HXX
#include <vcl/graph.hxx>
-#endif
#include <svtools/fltcall.hxx>
#include <com/sun/star/uno/Sequence.h>
#include <com/sun/star/beans/PropertyValue.hpp>
diff --git a/svtools/source/inc/property.hxx b/svtools/source/inc/property.hxx
index b1e4f9a..f0e2b37 100644
--- a/svtools/source/inc/property.hxx
+++ b/svtools/source/inc/property.hxx
@@ -28,27 +28,13 @@
#ifndef SV_PROPERTY_HXX
#define SV_PROPERTY_HXX
-#ifndef _VIRDEV_HXX //autogen
#include <vcl/virdev.hxx>
-#endif
-#ifndef SV_FIXED_HXX
#include <vcl/fixed.hxx>
-#endif
-#ifndef SV_LSTBOX_HXX
#include <vcl/lstbox.hxx>
-#endif
-#ifndef SV_GROUP_HXX
#include <vcl/group.hxx>
-#endif
-#ifndef SV_BUTTON_HXX
#include <vcl/button.hxx>
-#endif
-#ifndef SV_MOREBTN_HXX
#include <vcl/morebtn.hxx>
-#endif
-#ifndef _DIALOG_HXX //autogen
#include <vcl/dialog.hxx>
-#endif
#include <vcl/combobox.hxx>
#include <vcl/field.hxx>
#include <svl/svarray.hxx>
diff --git a/svtools/source/inc/svimpbox.hxx b/svtools/source/inc/svimpbox.hxx
index 27cfd21..dd54e27 100644
--- a/svtools/source/inc/svimpbox.hxx
+++ b/svtools/source/inc/svimpbox.hxx
@@ -28,12 +28,8 @@
#ifndef _SVIMPLBOX_HXX
#define _SVIMPLBOX_HXX
-#ifndef _SELENG_HXX
#include <vcl/seleng.hxx>
-#endif
-#ifndef _SCRBAR_HXX
#include <vcl/scrbar.hxx>
-#endif
#include <vcl/vclevent.hxx>
// #102891# ----------------
#include <unotools/intlwrapper.hxx>
diff --git a/svtools/source/inc/svimpicn.hxx b/svtools/source/inc/svimpicn.hxx
index 738153b..b252732 100644
--- a/svtools/source/inc/svimpicn.hxx
+++ b/svtools/source/inc/svimpicn.hxx
@@ -27,13 +27,9 @@
#ifndef _SVIMPICN_HXX
#define _SVIMPICN_HXX
-#ifndef _VIRDEV_HXX
#include <vcl/virdev.hxx>
-#endif
-#ifndef _SCRBAR_HXX
#include <vcl/scrbar.hxx>
-#endif
#include <limits.h>
class SvLBoxEntry;
diff --git a/svtools/source/inc/xbmread.hxx b/svtools/source/inc/xbmread.hxx
index 9456817..5207c56 100644
--- a/svtools/source/inc/xbmread.hxx
+++ b/svtools/source/inc/xbmread.hxx
@@ -28,12 +28,8 @@
#ifndef _XBMREAD_HXX
#define _XBMREAD_HXX
-#ifndef _GRAPH_HXX
#include <vcl/graph.hxx>
-#endif
-#ifndef _BMPACC_HXX
#include <vcl/bmpacc.hxx>
-#endif
#ifdef _XBMPRIVATE
diff --git a/svtools/source/inc/xpmread.hxx b/svtools/source/inc/xpmread.hxx
index 32973f9..3e7198e 100644
--- a/svtools/source/inc/xpmread.hxx
+++ b/svtools/source/inc/xpmread.hxx
@@ -28,9 +28,7 @@
#ifndef _XPMREAD_HXX
#define _XPMREAD_HXX
-#ifndef _BITMAP_HXX
#include <vcl/bitmap.hxx>
-#endif
#ifdef _XPMPRIVATE
diff --git a/svtools/source/productregistration/registrationdlg.hxx b/svtools/source/productregistration/registrationdlg.hxx
index 9f83e00..cf7378a 100644
--- a/svtools/source/productregistration/registrationdlg.hxx
+++ b/svtools/source/productregistration/registrationdlg.hxx
@@ -29,9 +29,7 @@
#define SVTOOLS_REGISTRATIONDLG_HXX
#include <vcl/fixed.hxx>
-#ifndef _SV_BUTTON_HXX
#include <vcl/button.hxx>
-#endif
#include <vcl/dialog.hxx>
//........................................................................
diff --git a/svtools/source/table/tablecontrol_impl.hxx b/svtools/source/table/tablecontrol_impl.hxx
index 89965aa..0b5c1f0 100644
--- a/svtools/source/table/tablecontrol_impl.hxx
+++ b/svtools/source/table/tablecontrol_impl.hxx
@@ -27,13 +27,9 @@
#ifndef SVTOOLS_TABLECONTROL_IMPL_HXX
#define SVTOOLS_TABLECONTROL_IMPL_HXX
-#ifndef SVTOOLS_INC_TABLE_TABLEMODEL_HXX
#include <svtools/table/tablemodel.hxx>
-#endif
-#ifndef SVTOOLS_INC_TABLE_ABSTRACTTABLECONTROL_HXX
#include <svtools/table/abstracttablecontrol.hxx>
-#endif
#include <svtools/table/tablemodel.hxx>
#include <vector>
diff --git a/svtools/source/table/tablegeometry.hxx b/svtools/source/table/tablegeometry.hxx
index 32f2c08..1105c5e 100644
--- a/svtools/source/table/tablegeometry.hxx
+++ b/svtools/source/table/tablegeometry.hxx
@@ -27,13 +27,9 @@
#ifndef SVTOOLS_TABLEGEOMETRY_HXX
#define SVTOOLS_TABLEGEOMETRY_HXX
-#ifndef SVTOOLS_INC_TABLE_TABLETYPES_HXX
#include <svtools/table/tabletypes.hxx>
-#endif
-#ifndef _SV_GEN_HXX
#include <tools/gen.hxx>
-#endif
//........................................................................
namespace svt { namespace table
diff --git a/svtools/source/toolpanel/paneldecklisteners.hxx b/svtools/source/toolpanel/paneldecklisteners.hxx
old mode 100755
new mode 100644
diff --git a/svtools/source/toolpanel/toolpaneldeckpeer.hxx b/svtools/source/toolpanel/toolpaneldeckpeer.hxx
old mode 100755
new mode 100644
diff --git a/svtools/source/uno/svtxgridcontrol.hxx b/svtools/source/uno/svtxgridcontrol.hxx
old mode 100755
new mode 100644
diff --git a/toolkit/inc/toolkit/awt/vclxwindows.hxx b/toolkit/inc/toolkit/awt/vclxwindows.hxx
index bbb4100..657cc19 100644
--- a/toolkit/inc/toolkit/awt/vclxwindows.hxx
+++ b/toolkit/inc/toolkit/awt/vclxwindows.hxx
@@ -64,9 +64,7 @@
#include <com/sun/star/awt/XUnoControlContainer.hpp>
#include <com/sun/star/awt/XTextLayoutConstrains.hpp>
#include <com/sun/star/awt/XNumericField.hpp>
-#ifndef _COM_SUN_STAR_AWT_XMetricFIELD_HPP_
#include <com/sun/star/awt/XMetricField.hpp>
-#endif
#include <com/sun/star/awt/XButton.hpp>
#include <com/sun/star/awt/XToggleButton.hpp>
#include <com/sun/star/awt/XPointer.hpp>
diff --git a/toolkit/inc/toolkit/controls/eventcontainer.hxx b/toolkit/inc/toolkit/controls/eventcontainer.hxx
index a01fa97..96374f5 100644
--- a/toolkit/inc/toolkit/controls/eventcontainer.hxx
+++ b/toolkit/inc/toolkit/controls/eventcontainer.hxx
@@ -27,12 +27,8 @@
#include <osl/diagnose.h>
-#ifndef _COM_SUN_STAR_XNAMECONTAINER_HPP_
#include <com/sun/star/container/XNameContainer.hpp>
-#endif
-#ifndef _COM_SUN_STAR_XCONTAINER_HPP_
#include <com/sun/star/container/XContainer.hpp>
-#endif
#include <toolkit/helper/listenermultiplexer.hxx>
diff --git a/toolkit/inc/toolkit/controls/unocontrol.hxx b/toolkit/inc/toolkit/controls/unocontrol.hxx
index 679b5a3..5ce9ef3 100644
--- a/toolkit/inc/toolkit/controls/unocontrol.hxx
+++ b/toolkit/inc/toolkit/controls/unocontrol.hxx
@@ -31,9 +31,7 @@
#include <toolkit/dllapi.h>
#include <com/sun/star/awt/XControl.hpp>
#include <com/sun/star/awt/XWindow2.hpp>
-#ifndef _COM_SUN_STAR_AWT_XView_HPP_
#include <com/sun/star/awt/XView.hpp>
-#endif
#include <com/sun/star/beans/XPropertiesChangeListener.hpp>
#include <com/sun/star/lang/XServiceInfo.hpp>
#include <com/sun/star/lang/XTypeProvider.hpp>
diff --git a/toolkit/inc/toolkit/helper/accessiblefactory.hxx b/toolkit/inc/toolkit/helper/accessiblefactory.hxx
index e39aaae..c668906 100644
--- a/toolkit/inc/toolkit/helper/accessiblefactory.hxx
+++ b/toolkit/inc/toolkit/helper/accessiblefactory.hxx
@@ -28,13 +28,9 @@
#ifndef TOOLKIT_HELPER_ACCESSIBLE_FACTORY_HXX
#define TOOLKIT_HELPER_ACCESSIBLE_FACTORY_HXX
-#ifndef _COM_SUN_STAR_UNO_REFERENCE_HXX
#include <com/sun/star/uno/Reference.hxx>
-#endif
-#ifndef _RTL_REF_HXX
#include <rtl/ref.hxx>
-#endif
namespace com { namespace sun { namespace star { namespace accessibility {
class XAccessible;
diff --git a/toolkit/inc/toolkit/helper/formpdfexport.hxx b/toolkit/inc/toolkit/helper/formpdfexport.hxx
index 18aea0f..289d9a0 100644
--- a/toolkit/inc/toolkit/helper/formpdfexport.hxx
+++ b/toolkit/inc/toolkit/helper/formpdfexport.hxx
@@ -28,19 +28,13 @@
#ifndef _TOOLKIT_HELPER_FORM_FORMPDFEXPORT_HXX
#define _TOOLKIT_HELPER_FORM_FORMPDFEXPORT_HXX
-#ifndef TOOLKIT_DLLAPI_H
#include <toolkit/dllapi.h>
-#endif
/** === begin UNO includes === **/
-#ifndef _COM_SUN_STAR_AWT_XCONTROL_HPP_
#include <com/sun/star/awt/XControl.hpp>
-#endif
/** === end UNO includes === **/
-#ifndef _VCL_PDFWRITER_HXX
#include <vcl/pdfwriter.hxx>
-#endif
#include <memory>
diff --git a/toolkit/workben/layout/wordcountdialog.hxx b/toolkit/workben/layout/wordcountdialog.hxx
index d3d7a7d..1102500 100644
--- a/toolkit/workben/layout/wordcountdialog.hxx
+++ b/toolkit/workben/layout/wordcountdialog.hxx
@@ -28,9 +28,7 @@
#define SW_WORDCOUNTDIALOG_HXX
#include <sfx2/basedlgs.hxx>
#include <svtools/stdctrl.hxx>
-#ifndef _SV_BUTTON_HXX
#include <vcl/button.hxx>
-#endif
#include <layout/layout.hxx>
#include <layout/layout-pre.hxx>
struct SwDocStat;
diff --git a/toolkit/workben/layout/zoom.hxx b/toolkit/workben/layout/zoom.hxx
index 2553fff..2833e73 100644
--- a/toolkit/workben/layout/zoom.hxx
+++ b/toolkit/workben/layout/zoom.hxx
@@ -31,9 +31,7 @@
#include <layout/layout.hxx>
#include <sfx2/basedlgs.hxx>
-#ifndef _SV_BUTTON_HXX //autogen wg. Radio-/OK-/Cancel-/HelpButton
#include <vcl/button.hxx>
-#endif
#include <vcl/field.hxx>
#include <vcl/fixed.hxx>
@@ -43,9 +41,7 @@
#define ZOOMBTN_PAGEWIDTH ((USHORT)0x0002)
#define ZOOMBTN_WHOLEPAGE ((USHORT)0x0004)
*/
-#ifndef _SVX_ZOOM_HXX
#include "zoom_def.hxx"
-#endif
// class SvxZoomDialog ---------------------------------------------------
/*
{k:\svx\prototyp\dialog\zoom.bmp}
diff --git a/tools/inc/tools/color.hxx b/tools/inc/tools/color.hxx
index aca8f95..824f2a7 100644
--- a/tools/inc/tools/color.hxx
+++ b/tools/inc/tools/color.hxx
@@ -33,9 +33,7 @@ class SvStream;
class ResId;
#include <tools/solar.h>
-#ifndef _BGFX_COLOR_BCOLOR_HXX
#include <basegfx/color/bcolor.hxx>
-#endif
// --------------------
// - ColorCount-Types -
diff --git a/tools/inc/tools/debug.hxx b/tools/inc/tools/debug.hxx
index 5dff4f3..c6f0b13 100644
--- a/tools/inc/tools/debug.hxx
+++ b/tools/inc/tools/debug.hxx
@@ -30,9 +30,7 @@
#include "tools/toolsdllapi.h"
-#ifndef _SAL_TYPES_H
#include <sal/types.h>
-#endif
#include <tools/solar.h>
// ------------
diff --git a/tools/inc/tools/errcode.hxx b/tools/inc/tools/errcode.hxx
index ced3b3a..f5ababb 100644
--- a/tools/inc/tools/errcode.hxx
+++ b/tools/inc/tools/errcode.hxx
@@ -29,10 +29,8 @@
#define _ERRCODE_HXX
#ifndef __RSC
-#ifndef _SOLAR_H
#include <tools/solar.h>
#endif
-#endif
/*
diff --git a/tools/inc/tools/fsys.hxx b/tools/inc/tools/fsys.hxx
index 1ff0048..b9f0e41 100644
--- a/tools/inc/tools/fsys.hxx
+++ b/tools/inc/tools/fsys.hxx
@@ -32,9 +32,7 @@
#include <tools/string.hxx>
#include <tools/link.hxx>
#include <tools/wldcrd.hxx>
-#ifndef __ERRCODE_HXX
#include <tools/errcode.hxx>
-#endif
#include "tools/toolsdllapi.h"
#include <cstdarg>
diff --git a/tools/inc/tools/inetmsg.hxx b/tools/inc/tools/inetmsg.hxx
index be58350..90eab30 100644
--- a/tools/inc/tools/inetmsg.hxx
+++ b/tools/inc/tools/inetmsg.hxx
@@ -30,13 +30,9 @@
#include "tools/toolsdllapi.h"
#include <sal/types.h>
-#ifndef _RTL_TEXTENC_H_
#include <rtl/textenc.h>
-#endif
-#ifndef _TOOLS_INETMIME_HXX
#include <tools/inetmime.hxx>
-#endif
#include <tools/list.hxx>
#include <tools/stream.hxx>
#include <tools/string.hxx>
diff --git a/tools/inc/tools/ownlist.hxx b/tools/inc/tools/ownlist.hxx
index d84ad1b..a77fed3 100644
--- a/tools/inc/tools/ownlist.hxx
+++ b/tools/inc/tools/ownlist.hxx
@@ -28,9 +28,7 @@
#ifndef _TOOLS_OWNLIST_HXX
#define _TOOLS_OWNLIST_HXX
-#ifndef _TOOLS_LIST_HXX //autogen
#include <tools/list.hxx>
-#endif
/*************************************************************************
*************************************************************************/
diff --git a/tools/inc/tools/pstm.hxx b/tools/inc/tools/pstm.hxx
index 4fc00cf..fa4975f 100644
--- a/tools/inc/tools/pstm.hxx
+++ b/tools/inc/tools/pstm.hxx
@@ -30,13 +30,9 @@
#include <hash_map>
#include "tools/toolsdllapi.h"
-#ifndef _TABLE_HXX
#include <tools/table.hxx>
-#endif
-#ifndef _INQIDX_HXX
#include <tools/unqidx.hxx>
-#endif
#include <tools/ref.hxx>
#include <tools/rtti.hxx>
#include <tools/stream.hxx>
diff --git a/tools/inc/tools/stream.hxx b/tools/inc/tools/stream.hxx
index 0ce15bc..d8502b1 100644
--- a/tools/inc/tools/stream.hxx
+++ b/tools/inc/tools/stream.hxx
@@ -30,9 +30,7 @@
#include "tools/toolsdllapi.h"
#include <tools/solar.h>
#include <tools/string.hxx>
-#ifndef _EINF_HXX
#include <tools/errinf.hxx>
-#endif
#include <tools/ref.hxx>
#include <tools/rtti.hxx>
diff --git a/tools/inc/tools/string.hxx b/tools/inc/tools/string.hxx
index cd4b822..6b5896f 100644
--- a/tools/inc/tools/string.hxx
+++ b/tools/inc/tools/string.hxx
@@ -32,12 +32,8 @@
#include <osl/thread.h>
#include <rtl/textenc.h>
#include <rtl/textcvt.h>
-#ifndef _RTL_STRING_HXX
#include <rtl/string.hxx>
-#endif
-#ifndef _RTL_USTRING_HXX
#include <rtl/ustring.hxx>
-#endif
#include "tools/toolsdllapi.h"
/*******************************************************************************
diff --git a/tools/inc/tools/tenccvt.hxx b/tools/inc/tools/tenccvt.hxx
index 98db631..5d8b118 100644
--- a/tools/inc/tools/tenccvt.hxx
+++ b/tools/inc/tools/tenccvt.hxx
@@ -28,9 +28,7 @@
#define _TOOLS_TENCCVT_HXX
#include <rtl/textenc.h>
-#ifndef _TOOLS_SOLAR_H
#include <tools/solar.h>
-#endif
#include "tools/toolsdllapi.h"
// ----------------------------------------
diff --git a/tools/win/inc/toolsdll.hxx b/tools/win/inc/toolsdll.hxx
index 1e8671e..fd60206 100644
--- a/tools/win/inc/toolsdll.hxx
+++ b/tools/win/inc/toolsdll.hxx
@@ -30,9 +30,7 @@
#ifdef WIN
-#ifndef _STRING_H
#include <string.h>
-#endif
#include <tools/svwin.h>
#include <tools/solar.h>
#include <tools/shl.hxx>
diff --git a/ucbhelper/inc/ucbhelper/commandenvironment.hxx b/ucbhelper/inc/ucbhelper/commandenvironment.hxx
index 3ef385f..8b4ba7e 100644
--- a/ucbhelper/inc/ucbhelper/commandenvironment.hxx
+++ b/ucbhelper/inc/ucbhelper/commandenvironment.hxx
@@ -29,9 +29,7 @@
#define _UCBHELPER_COMMANDENVIRONMENT_HXX
#include <com/sun/star/lang/XTypeProvider.hpp>
-#ifndef _COM_SUN_STAR_UCB_XCOMMMANDENVIRONMENT_HPP_
#include <com/sun/star/ucb/XCommandEnvironment.hpp>
-#endif
#include <cppuhelper/weak.hxx>
#include <ucbhelper/macros.hxx>
#include "ucbhelper/ucbhelperdllapi.h"
diff --git a/ucbhelper/inc/ucbhelper/commandenvironmentproxy.hxx b/ucbhelper/inc/ucbhelper/commandenvironmentproxy.hxx
index 9632b7a..0122e9d 100644
--- a/ucbhelper/inc/ucbhelper/commandenvironmentproxy.hxx
+++ b/ucbhelper/inc/ucbhelper/commandenvironmentproxy.hxx
@@ -29,9 +29,7 @@
#define _UCBHELPER_COMMANDENVIRONMENTPROXY_HXX
#include <com/sun/star/lang/XTypeProvider.hpp>
-#ifndef _COM_SUN_STAR_UCB_XCOMMMANDENVIRONMENT_HPP_
#include <com/sun/star/ucb/XCommandEnvironment.hpp>
-#endif
#include <cppuhelper/weak.hxx>
#include <ucbhelper/macros.hxx>
diff --git a/ucbhelper/inc/ucbhelper/interceptedinteraction.hxx b/ucbhelper/inc/ucbhelper/interceptedinteraction.hxx
index 47a4f38..0302842 100644
--- a/ucbhelper/inc/ucbhelper/interceptedinteraction.hxx
+++ b/ucbhelper/inc/ucbhelper/interceptedinteraction.hxx
@@ -33,13 +33,9 @@
#include <vector>
-#ifndef __COM_SUN_STAR_TASK_XINTERACTIONHANDLER_HPP__
#include <com/sun/star/task/XInteractionHandler.hpp>
-#endif
-#ifndef __COM_SUN_STAR_TASK_XINTERACTIONREQUEST_HPP__
#include <com/sun/star/task/XInteractionRequest.hpp>
-#endif
#include <cppuhelper/implbase1.hxx>
#include "ucbhelper/ucbhelperdllapi.h"
diff --git a/ucbhelper/inc/ucbhelper/simplecertificatevalidationrequest.hxx b/ucbhelper/inc/ucbhelper/simplecertificatevalidationrequest.hxx
old mode 100755
new mode 100644
diff --git a/unotools/inc/unotools/accessiblerelationsethelper.hxx b/unotools/inc/unotools/accessiblerelationsethelper.hxx
index 1726b16..d65b800 100644
--- a/unotools/inc/unotools/accessiblerelationsethelper.hxx
+++ b/unotools/inc/unotools/accessiblerelationsethelper.hxx
@@ -30,9 +30,7 @@
#include "unotools/unotoolsdllapi.h"
-#ifndef _COM_SUN_STAR_ACCESSIBILITY_XACCESSIBLESSTATESET_HPP_
#include <com/sun/star/accessibility/XAccessibleRelationSet.hpp>
-#endif
#include <com/sun/star/uno/Reference.hxx>
#include <cppuhelper/weak.hxx>
#include <com/sun/star/lang/XServiceInfo.hpp>
diff --git a/unotools/inc/unotools/accessiblestatesethelper.hxx b/unotools/inc/unotools/accessiblestatesethelper.hxx
index 40e4b4a..cf2e56a 100644
--- a/unotools/inc/unotools/accessiblestatesethelper.hxx
+++ b/unotools/inc/unotools/accessiblestatesethelper.hxx
@@ -29,9 +29,7 @@
#include "unotools/unotoolsdllapi.h"
-#ifndef _COM_SUN_STAR_ACCESSIBILITY_XACCESSIBLESSTATESET_HPP_
#include <com/sun/star/accessibility/XAccessibleStateSet.hpp>
-#endif
#include <com/sun/star/uno/Reference.hxx>
#include <cppuhelper/weak.hxx>
#include <com/sun/star/lang/XServiceInfo.hpp>
diff --git a/unotools/inc/unotools/collatorwrapper.hxx b/unotools/inc/unotools/collatorwrapper.hxx
index edcdec5..916621f 100644
--- a/unotools/inc/unotools/collatorwrapper.hxx
+++ b/unotools/inc/unotools/collatorwrapper.hxx
@@ -29,9 +29,7 @@
#ifndef _UNOTOOLS_COLLATORWRAPPER_HXX
#define _UNOTOOLS_COLLATORWRAPPER_HXX
-#ifndef _COM_SUN_STAR_UTIL_XCOLLATOR_HPP_
#include <com/sun/star/i18n/XCollator.hpp>
-#endif
namespace com { namespace sun { namespace star { namespace lang {
class XMultiServiceFactory;
diff --git a/unotools/inc/unotools/lingucfg.hxx b/unotools/inc/unotools/lingucfg.hxx
old mode 100755
new mode 100644
diff --git a/unotools/inc/unotools/localedatawrapper.hxx b/unotools/inc/unotools/localedatawrapper.hxx
index a72fb91..54a292b 100644
--- a/unotools/inc/unotools/localedatawrapper.hxx
+++ b/unotools/inc/unotools/localedatawrapper.hxx
@@ -35,9 +35,7 @@
#include <unotools/readwritemutexguard.hxx>
#include "unotools/unotoolsdllapi.h"
-#ifndef BOOST_SHARED_PTR_HPP_INCLUDED
#include <boost/shared_ptr.hpp>
-#endif
namespace com { namespace sun { namespace star {
diff --git a/unotools/inc/unotools/optionsdlg.hxx b/unotools/inc/unotools/optionsdlg.hxx
index 293040a..22d3ad3 100644
--- a/unotools/inc/unotools/optionsdlg.hxx
+++ b/unotools/inc/unotools/optionsdlg.hxx
@@ -27,9 +27,7 @@
#ifndef INCLUDED_unotools_OPTIONSDLG_HXX
#define INCLUDED_unotools_OPTIONSDLG_HXX
-#ifndef INCLUDED_unotoolsdllapi_H
#include "unotools/unotoolsdllapi.h"
-#endif
#include <tools/string.hxx>
#include <unotools/options.hxx>
diff --git a/unotools/inc/unotools/unotunnelhelper.hxx b/unotools/inc/unotools/unotunnelhelper.hxx
index 862b6df..153ac1a 100644
--- a/unotools/inc/unotools/unotunnelhelper.hxx
+++ b/unotools/inc/unotools/unotunnelhelper.hxx
@@ -34,9 +34,7 @@
#include <rtl/uuid.h>
#include <rtl/memory.h>
-#ifndef _CPPUHELPER_EXTRACT_HXX_
#include <cppuhelper/extract.hxx>
-#endif
namespace utl
{
diff --git a/unotools/inc/unotools/xmlaccelcfg.hxx b/unotools/inc/unotools/xmlaccelcfg.hxx
index 66c4e37..465c7ab 100644
--- a/unotools/inc/unotools/xmlaccelcfg.hxx
+++ b/unotools/inc/unotools/xmlaccelcfg.hxx
@@ -28,9 +28,7 @@
#ifndef INCLUDED_unotools_XMLACCELCFG_HXX
#define INCLUDED_unotools_XMLACCELCFG_HXX
-#ifndef __COM_SUN_STAR_XML_SAX_XDOCUMENTHANDLER_HPP_
#include <com/sun/star/xml/sax/XDocumentHandler.hpp>
-#endif
#include <cppuhelper/weak.hxx>
#include <unotools/accelcfg.hxx>
diff --git a/unotools/source/config/eventcfg.cxx b/unotools/source/config/eventcfg.cxx
index 2c35715..599a62b 100644
--- a/unotools/source/config/eventcfg.cxx
+++ b/unotools/source/config/eventcfg.cxx
@@ -37,9 +37,7 @@
#include <com/sun/star/beans/PropertyValue.hpp>
#include <cppuhelper/weakref.hxx>
-#ifndef __SGI_STL_HASH_MAP
#include <hash_map>
-#endif
#include <tools/urlobj.hxx>
#include <rtl/ustrbuf.hxx>
diff --git a/unotools/source/i18n/textsearch.cxx b/unotools/source/i18n/textsearch.cxx
index 814816e..9a6b6ee 100644
--- a/unotools/source/i18n/textsearch.cxx
+++ b/unotools/source/i18n/textsearch.cxx
@@ -33,9 +33,7 @@
//#include <tools/intn.hxx>
#endif
#include <com/sun/star/lang/XMultiServiceFactory.hpp>
-#ifndef _COM_SUN_STAR_UTIL_SEARCHFLAGS_HDL_
#include <com/sun/star/util/SearchFlags.hdl>
-#endif
#include <com/sun/star/i18n/TransliterationModules.hpp>
#include <unotools/charclass.hxx>
#include <comphelper/processfactory.hxx>
diff --git a/unotools/source/processfactory/componentfactory.cxx b/unotools/source/processfactory/componentfactory.cxx
index dc8efaa..f022237 100644
--- a/unotools/source/processfactory/componentfactory.cxx
+++ b/unotools/source/processfactory/componentfactory.cxx
@@ -33,9 +33,7 @@
#include <com/sun/star/lang/XSingleServiceFactory.hpp>
#include <com/sun/star/lang/XMultiServiceFactory.hpp>
-#ifndef _COM_SUN_STAR_REGISTRY_XREGISTRYKEY_HDL_
#include <com/sun/star/registry/XRegistryKey.hpp>
-#endif
#include <cppuhelper/factory.hxx>
diff --git a/unotools/source/ucbhelper/XTempFile.hxx b/unotools/source/ucbhelper/XTempFile.hxx
index af921ac..af31ccf 100644
--- a/unotools/source/ucbhelper/XTempFile.hxx
+++ b/unotools/source/ucbhelper/XTempFile.hxx
@@ -37,9 +37,7 @@
#include <com/sun/star/lang/XMultiServiceFactory.hpp>
#include <com/sun/star/lang/XServiceInfo.hpp>
#include <cppuhelper/implbase5.hxx>
-#ifndef _CPPUHELPER_PROPERTYSETMIXIN_HXX_
#include <cppuhelper/propertysetmixin.hxx>
-#endif
#include <osl/mutex.hxx>
class SvStream;
diff --git a/unotools/source/ucbhelper/ucbstreamhelper.cxx b/unotools/source/ucbhelper/ucbstreamhelper.cxx
index 93d020a..a132132 100644
--- a/unotools/source/ucbhelper/ucbstreamhelper.cxx
+++ b/unotools/source/ucbhelper/ucbstreamhelper.cxx
@@ -33,9 +33,7 @@
#include <comphelper/processfactory.hxx>
#include <com/sun/star/ucb/CommandAbortedException.hpp>
-#ifndef _COM_SUN_STAR_UCB_XCOMMANDENVIRONMENT_HDL_
#include <com/sun/star/ucb/XCommandEnvironment.hdl>
-#endif
#include <com/sun/star/ucb/InsertCommandArgument.hpp>
#include <com/sun/star/io/XActiveDataStreamer.hpp>
diff --git a/vcl/aqua/inc/aqua11yfocustracker.hxx b/vcl/aqua/inc/aqua11yfocustracker.hxx
index 6b8e2f8..01b77ac 100644
--- a/vcl/aqua/inc/aqua11yfocustracker.hxx
+++ b/vcl/aqua/inc/aqua11yfocustracker.hxx
@@ -28,9 +28,7 @@
#ifndef _AQUA11YFOCUSTRACKER_HXX_
#define _AQUA11YFOCUSTRACKER_HXX_
-#ifndef _COM_SUN_STAR_ACCESSIBILITY_XACCESSIBLE_HPP_
#include <com/sun/star/accessibility/XAccessible.hpp>
-#endif
#include "keyboardfocuslistener.hxx"
diff --git a/vcl/aqua/inc/keyboardfocuslistener.hxx b/vcl/aqua/inc/keyboardfocuslistener.hxx
index 899a6ca..a0d52a5 100644
--- a/vcl/aqua/inc/keyboardfocuslistener.hxx
+++ b/vcl/aqua/inc/keyboardfocuslistener.hxx
@@ -28,9 +28,7 @@
#ifndef _KEYBOARDFOCUSLISTENER_HXX_
#define _KEYBOARDFOCUSLISTENER_HXX_
-#ifndef _COM_SUN_STAR_ACCESSIBILITY_XACCESSIBLE_HPP_
#include <com/sun/star/accessibility/XAccessible.hpp>
-#endif
#include <rtl/ref.hxx>
diff --git a/vcl/aqua/inc/salcolorutils.hxx b/vcl/aqua/inc/salcolorutils.hxx
old mode 100755
new mode 100644
diff --git a/vcl/aqua/inc/salmathutils.hxx b/vcl/aqua/inc/salmathutils.hxx
old mode 100755
new mode 100644
diff --git a/vcl/aqua/source/a11y/documentfocuslistener.hxx b/vcl/aqua/source/a11y/documentfocuslistener.hxx
index cf32314..5039aaa 100644
--- a/vcl/aqua/source/a11y/documentfocuslistener.hxx
+++ b/vcl/aqua/source/a11y/documentfocuslistener.hxx
@@ -28,13 +28,9 @@
#ifndef _DOCUMENTFOCUSLISTENER_HXX_
#define _DOCUMENTFOCUSLISTENER_HXX_
-#ifndef _COM_SUN_STAR_ACCESSIBILITY_XACCESSIBLEEVENTLISTENER_HPP_
#include <com/sun/star/accessibility/XAccessibleEventListener.hpp>
-#endif
-#ifndef _CPPUHELPER_IMPLBASE1_HXX_
#include <cppuhelper/implbase1.hxx>
-#endif
#include "aqua11yfocustracker.hxx"
#include <set>
diff --git a/vcl/aqua/source/dtrans/DropTarget.hxx b/vcl/aqua/source/dtrans/DropTarget.hxx
index 9492e63..a68b955 100644
--- a/vcl/aqua/source/dtrans/DropTarget.hxx
+++ b/vcl/aqua/source/dtrans/DropTarget.hxx
@@ -33,9 +33,7 @@
#include <com/sun/star/lang/XInitialization.hpp>
#include <com/sun/star/datatransfer/dnd/XDropTarget.hpp>
-#ifndef _COM_SUN_STAR_DATATRANSFER_DND_XDROPTARGETLISTENR_HPP_
#include <com/sun/star/datatransfer/dnd/XDropTargetListener.hpp>
-#endif
#include <com/sun/star/datatransfer/dnd/DropTargetDragEnterEvent.hpp>
#include <com/sun/star/datatransfer/dnd/XDropTargetDragContext.hpp>
#include <com/sun/star/datatransfer/dnd/XDropTargetDropContext.hpp>
diff --git a/vcl/inc/vcl/abstdlg.hxx b/vcl/inc/vcl/abstdlg.hxx
old mode 100755
new mode 100644
diff --git a/vcl/inc/vcl/dndevdis.hxx b/vcl/inc/vcl/dndevdis.hxx
index b5560cc..e5263ab 100644
--- a/vcl/inc/vcl/dndevdis.hxx
+++ b/vcl/inc/vcl/dndevdis.hxx
@@ -31,9 +31,7 @@
#include <com/sun/star/datatransfer/dnd/XDropTargetListener.hpp>
#include <com/sun/star/datatransfer/dnd/XDropTargetDragContext.hpp>
-#ifndef _COM_SUN_STAR_DATATRANSFER_DND_XDRAGESTURERECOGNIZER_HPP_
#include <com/sun/star/datatransfer/dnd/XDragGestureRecognizer.hpp>
-#endif
#include <cppuhelper/implbase3.hxx>
#include <vcl/window.hxx>
diff --git a/vcl/inc/vcl/graphite_adaptors.hxx b/vcl/inc/vcl/graphite_adaptors.hxx
index 0e722b2..0f88658 100644
--- a/vcl/inc/vcl/graphite_adaptors.hxx
+++ b/vcl/inc/vcl/graphite_adaptors.hxx
@@ -35,21 +35,13 @@
#include <stdexcept>
// Platform
-#ifndef _SVWIN_H
#include <tools/svwin.h>
-#endif
-#ifndef _SV_SVSYS_HXX
#include <svsys.h>
-#endif
-#ifndef _SV_SALGDI_HXX
#include <vcl/salgdi.hxx>
-#endif
-#ifndef _SV_SALLAYOUT_HXX
#include <vcl/sallayout.hxx>
-#endif
// Module
#include "vcl/dllapi.h"
diff --git a/vcl/inc/vcl/impprn.hxx b/vcl/inc/vcl/impprn.hxx
index 59cebc6..d11bf51 100644
--- a/vcl/inc/vcl/impprn.hxx
+++ b/vcl/inc/vcl/impprn.hxx
@@ -30,9 +30,7 @@
#include <vcl/print.hxx>
#include <vcl/timer.hxx>
-#ifndef _VCL_IMPDEL_HXX
#include <vcl/impdel.hxx>
-#endif
#include <vector>
diff --git a/vcl/inc/vcl/longcurr.hxx b/vcl/inc/vcl/longcurr.hxx
index ef234fe..a1938a0 100644
--- a/vcl/inc/vcl/longcurr.hxx
+++ b/vcl/inc/vcl/longcurr.hxx
@@ -30,9 +30,7 @@
#include <vcl/dllapi.h>
#include <tools/bigint.hxx>
-#ifndef _FIELD_HXX
#include <vcl/field.hxx>
-#endif
class LocaleDataWrapper;
diff --git a/vcl/inc/vcl/salbmp.hxx b/vcl/inc/vcl/salbmp.hxx
index e48a434..3bae57f 100644
--- a/vcl/inc/vcl/salbmp.hxx
+++ b/vcl/inc/vcl/salbmp.hxx
@@ -28,9 +28,7 @@
#ifndef _SV_SALBMP_HXX
#define _SV_SALBMP_HXX
-#ifndef _TL_GEN_HXX
#include <tools/gen.hxx>
-#endif
#include <vcl/dllapi.h>
#include <com/sun/star/rendering/XBitmapCanvas.hpp>
diff --git a/vcl/inc/vcl/salframe.hxx b/vcl/inc/vcl/salframe.hxx
index 4e40b3e..b51f078 100644
--- a/vcl/inc/vcl/salframe.hxx
+++ b/vcl/inc/vcl/salframe.hxx
@@ -33,9 +33,7 @@
#ifdef __cplusplus
-#ifndef _SV_PTRSTYLE_HXX
#include <vcl/ptrstyle.hxx>
-#endif
#include <vcl/sndstyle.hxx>
#endif // __cplusplus
@@ -44,9 +42,7 @@
#include <tools/gen.hxx>
#include <vcl/region.hxx>
-#ifndef _VCL_IMPDEL_HXX
#include <vcl/impdel.hxx>
-#endif
#include <rtl/ustring.hxx>
#include <vcl/keycod.hxx>
diff --git a/vcl/inc/vcl/sallayout.hxx b/vcl/inc/vcl/sallayout.hxx
old mode 100755
new mode 100644
diff --git a/vcl/inc/vcl/smartid.hxx b/vcl/inc/vcl/smartid.hxx
old mode 100755
new mode 100644
diff --git a/vcl/inc/vcl/svapp.hxx b/vcl/inc/vcl/svapp.hxx
index 62af3d0..c36bb77 100644
--- a/vcl/inc/vcl/svapp.hxx
+++ b/vcl/inc/vcl/svapp.hxx
@@ -28,18 +28,14 @@
#ifndef _SV_SVAPP_HXX
#define _SV_SVAPP_HXX
-#ifndef _VOS_THREAD_HXX
#include <vos/thread.hxx>
-#endif
#include <tools/string.hxx>
#include <tools/link.hxx>
#include <tools/unqid.hxx>
#include <vcl/sv.h>
#include <vcl/dllapi.h>
#include <vcl/apptypes.hxx>
-#ifndef _VCL_SETTINGS_HXX
#include <vcl/settings.hxx>
-#endif
#include <vcl/vclevent.hxx>
class Link;
class AllSettings;
diff --git a/vcl/inc/vcl/svdata.hxx b/vcl/inc/vcl/svdata.hxx
index 6619494..9856465 100644
--- a/vcl/inc/vcl/svdata.hxx
+++ b/vcl/inc/vcl/svdata.hxx
@@ -28,9 +28,7 @@
#ifndef _SV_SVDATA_HXX
#define _SV_SVDATA_HXX
-#ifndef _VOS_THREAD_HXX
#include <vos/thread.hxx>
-#endif
#include <tools/string.hxx>
#include <tools/gen.hxx>
#include <tools/shl.hxx>
diff --git a/vcl/inc/vcl/window.hxx b/vcl/inc/vcl/window.hxx
index b7b5ad4..705b0d5 100644
--- a/vcl/inc/vcl/window.hxx
+++ b/vcl/inc/vcl/window.hxx
@@ -32,19 +32,13 @@
#include <vcl/dllapi.h>
#include <vcl/outdev.hxx>
#include <tools/resid.hxx>
-#ifndef _SV_POINTR_HXX
#include <vcl/pointr.hxx>
-#endif
#include <vcl/wintypes.hxx>
-#ifndef _SV_APPTYPES_HXX
#include <vcl/apptypes.hxx>
-#endif
#include <vcl/inputctx.hxx>
#include <vcl/vclevent.hxx>
// Only for compatibility - because many people outside haven't included event.hxx
-#ifndef _VCL_EVENT_HXX
#include <vcl/event.hxx>
-#endif
#include <vcl/region.hxx>
#include <vcl/salnativewidgets.hxx>
#include <rtl/ustring.hxx>
diff --git a/vcl/os2/inc/salsound.hxx b/vcl/os2/inc/salsound.hxx
index 4d1c43b..681df68 100644
--- a/vcl/os2/inc/salsound.hxx
+++ b/vcl/os2/inc/salsound.hxx
@@ -32,9 +32,7 @@
#include <sv.h>
#include <tools/string.hxx>
#include <salframe.hxx>
-#ifndef _SV_SALSTYPE_HXX
#include <salstype.hxx>
-#endif
#include <salsound.hxx>
// ------------
diff --git a/vcl/source/control/edit.cxx b/vcl/source/control/edit.cxx
index 0061998..6e0da86 100644
--- a/vcl/source/control/edit.cxx
+++ b/vcl/source/control/edit.cxx
@@ -59,9 +59,7 @@
#include <com/sun/star/datatransfer/dnd/XDragGestureRecognizer.hpp>
#include <com/sun/star/datatransfer/dnd/XDropTarget.hpp>
-#ifndef _COM_SUN_STAR_I18N_XEXTENDEDINPUTSEQUENCECHECKER_HDL_
#include <com/sun/star/i18n/XExtendedInputSequenceChecker.hpp>
-#endif
#include <com/sun/star/i18n/InputSequenceCheckMode.hpp>
#include <com/sun/star/i18n/ScriptType.hpp>
#include <com/sun/star/container/XNameAccess.hpp>
diff --git a/vcl/source/control/ilstbox.cxx b/vcl/source/control/ilstbox.cxx
index be0873a..9de1b70 100644
--- a/vcl/source/control/ilstbox.cxx
+++ b/vcl/source/control/ilstbox.cxx
@@ -41,9 +41,7 @@
#include <vcl/unohelp.hxx>
#include <com/sun/star/i18n/XCollator.hpp>
-#ifndef _COM_SUN_STAR_ACCESSIBILITY_XACCESSIBLE_HDL_
#include <com/sun/star/accessibility/XAccessible.hpp>
-#endif
#include <com/sun/star/accessibility/AccessibleRole.hpp>
diff --git a/vcl/source/gdi/outdev3.cxx b/vcl/source/gdi/outdev3.cxx
index ae6a384..01357d4 100644
--- a/vcl/source/gdi/outdev3.cxx
+++ b/vcl/source/gdi/outdev3.cxx
@@ -73,9 +73,7 @@
#include <vcl/controllayout.hxx>
#include <rtl/logfile.hxx>
-#ifndef _COM_SUN_STAR_BEANS_PROPERTYVALUES_HDL_
#include <com/sun/star/beans/PropertyValues.hdl>
-#endif
#include <com/sun/star/i18n/XBreakIterator.hpp>
#include <com/sun/star/i18n/WordType.hpp>
#include <com/sun/star/linguistic2/XLinguServiceManager.hpp>
diff --git a/vcl/source/glyphs/graphite_textsrc.hxx b/vcl/source/glyphs/graphite_textsrc.hxx
index b8f6ff3..43f8df9 100644
--- a/vcl/source/glyphs/graphite_textsrc.hxx
+++ b/vcl/source/glyphs/graphite_textsrc.hxx
@@ -39,21 +39,13 @@
#include <stdexcept>
// Platform
-#ifndef _SVWIN_H
#include <tools/svwin.h>
-#endif
-#ifndef _SV_SVSYS_HXX
#include <svsys.h>
-#endif
-#ifndef _SV_SALGDI_HXX
#include <vcl/salgdi.hxx>
-#endif
-#ifndef _SV_SALLAYOUT_HXX
#include <vcl/sallayout.hxx>
-#endif
// Module
#include "vcl/dllapi.h"
diff --git a/vcl/unx/inc/i18n_status.hxx b/vcl/unx/inc/i18n_status.hxx
index 40f08ac..82f2bb7 100644
--- a/vcl/unx/inc/i18n_status.hxx
+++ b/vcl/unx/inc/i18n_status.hxx
@@ -32,9 +32,7 @@
#include <tools/link.hxx>
#include <tools/gen.hxx>
-#ifndef _RTL_USTRING_HXX
#include <rtl/ustring.hxx>
-#endif
#include <vcl/salimestatus.hxx>
#include <vector>
diff --git a/vcl/unx/inc/saldata.hxx b/vcl/unx/inc/saldata.hxx
index c31cd48..abb412c 100644
--- a/vcl/unx/inc/saldata.hxx
+++ b/vcl/unx/inc/saldata.hxx
@@ -34,9 +34,7 @@
#include <vcl/salframe.hxx>
#include <salinst.h>
#include <vcl/saldatabasic.hxx>
-#ifndef _OSL_MODULE_H
#include <osl/module.h>
-#endif
#include <vcl/dllapi.h>
// -=-= forwards -=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=
diff --git a/vcl/unx/inc/saldisp.hxx b/vcl/unx/inc/saldisp.hxx
index a3bd771..313785d 100644
--- a/vcl/unx/inc/saldisp.hxx
+++ b/vcl/unx/inc/saldisp.hxx
@@ -37,13 +37,9 @@ class SalXLib;
// -=-= #includes =-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=
#include <salunx.h>
#include <vcl/salgtype.hxx>
-#ifndef _SV_PTRSTYLE_HXX
#include <vcl/ptrstyle.hxx>
-#endif
#include <sal/types.h>
-#ifndef _OSL_MUTEX_H
#include <osl/mutex.h>
-#endif
#include <vector>
#include <list>
#include <hash_map>
diff --git a/vcl/unx/inc/wmadaptor.hxx b/vcl/unx/inc/wmadaptor.hxx
index 18c96ae..0ecf78b 100644
--- a/vcl/unx/inc/wmadaptor.hxx
+++ b/vcl/unx/inc/wmadaptor.hxx
@@ -28,9 +28,7 @@
#ifndef _VCL_WMADAPTOR_HXX_
#define _VCL_WMADAPTOR_HXX_
-#ifndef _TL_STRING_HXX
#include <tools/string.hxx>
-#endif
#include <tools/gen.hxx>
#include <vcl/dllapi.h>
#ifndef _PREX_H
diff --git a/vcl/unx/source/dtrans/X11_clipboard.hxx b/vcl/unx/source/dtrans/X11_clipboard.hxx
index 77e5692..b6465f0 100644
--- a/vcl/unx/source/dtrans/X11_clipboard.hxx
+++ b/vcl/unx/source/dtrans/X11_clipboard.hxx
@@ -30,13 +30,9 @@
#include <X11_selection.hxx>
-#ifndef _COM_SUN_STAR_DATATRANSFER_CLIPBAORD_XCLIPBOARDEX_HPP_
#include <com/sun/star/datatransfer/clipboard/XClipboardEx.hpp>
-#endif
-#ifndef _COM_SUN_STAR_DATATRANSFER_CLIPBAORD_XCLIPBOARDNOTIFIER_HPP_
#include <com/sun/star/datatransfer/clipboard/XClipboardNotifier.hpp>
-#endif
#include <cppuhelper/compbase4.hxx>
// ------------------------------------------------------------------------
diff --git a/vcl/unx/source/dtrans/X11_selection.hxx b/vcl/unx/source/dtrans/X11_selection.hxx
index ba037e1..97576ee 100644
--- a/vcl/unx/source/dtrans/X11_selection.hxx
+++ b/vcl/unx/source/dtrans/X11_selection.hxx
@@ -40,9 +40,7 @@
#include <com/sun/star/frame/XDesktop.hpp>
#include <osl/thread.h>
-#ifndef _OSL_CONDITION_HXX_
#include <osl/conditn.hxx>
-#endif
#include <hash_map>
#include <list>
diff --git a/vcl/unx/source/dtrans/X11_transferable.hxx b/vcl/unx/source/dtrans/X11_transferable.hxx
index ffa6a5c..932bc51 100644
--- a/vcl/unx/source/dtrans/X11_transferable.hxx
+++ b/vcl/unx/source/dtrans/X11_transferable.hxx
@@ -31,9 +31,7 @@
#include <X11_selection.hxx>
#include <com/sun/star/datatransfer/XTransferable.hpp>
-#ifndef _COM_SUN_STAR_LANG_XEVENTLISTENER_HDL_
#include <com/sun/star/lang/XEventListener.hpp>
-#endif
#include <cppuhelper/implbase1.hxx>
namespace x11 {
diff --git a/vcl/unx/source/gdi/xlfd_extd.hxx b/vcl/unx/source/gdi/xlfd_extd.hxx
index a18a29b..6fb21f5 100644
--- a/vcl/unx/source/gdi/xlfd_extd.hxx
+++ b/vcl/unx/source/gdi/xlfd_extd.hxx
@@ -28,12 +28,8 @@
#define XLFD_EXTENDED_HXX
#include <salunx.h>
-#ifndef _VCL_VCLENUM_HXX
#include <vcl/enum.hxx>
-#endif
-#ifndef _VCL_OUTFONT_HXX
#include <vcl/outfont.hxx>
-#endif
#include <vector>
diff --git a/vcl/win/inc/wincomp.hxx b/vcl/win/inc/wincomp.hxx
index e25668f..fd336ae 100644
--- a/vcl/win/inc/wincomp.hxx
+++ b/vcl/win/inc/wincomp.hxx
@@ -28,9 +28,7 @@
#ifndef _SV_WINCOMP_HXX
#define _SV_WINCOMP_HXX
-#ifndef _STRING_H
#include <string.h>
-#endif
#include <vcl/sv.h>
// ----------
commit c5ed39e2a6d897116e87a9afa027a93be4c577b5
Author: Petr Mladek <pmladek at suse.cz>
Date: Tue Oct 5 11:21:51 2010 +0200
include rtl/ustring.hxx instead of non-existing rtl/OUString.hxx
the wrong include file was newer included because of include guards
diff --git a/svtools/source/control/roadmap.cxx b/svtools/source/control/roadmap.cxx
index 18a135d..96c3bf6 100644
--- a/svtools/source/control/roadmap.cxx
+++ b/svtools/source/control/roadmap.cxx
@@ -40,8 +40,7 @@
#include <algorithm>
#include <vcl/bitmap.hxx>
#include <tools/color.hxx>
-
-#include <rtl/OUString.hxx>
+#include <rtl/ustring.hxx>
#include <memory>
#define ROADMAP_INDENT_X 4
diff --git a/toolkit/source/controls/roadmapentry.cxx b/toolkit/source/controls/roadmapentry.cxx
index d686a7e..1845112 100644
--- a/toolkit/source/controls/roadmapentry.cxx
+++ b/toolkit/source/controls/roadmapentry.cxx
@@ -29,8 +29,7 @@
#include "precompiled_toolkit.hxx"
#include <toolkit/controls/roadmapentry.hxx>
-#include <rtl/OUString.hxx>
-
+#include <rtl/ustring.hxx>
#include <com/sun/star/beans/PropertyAttribute.hpp>
commit 00b06052243f8f0cd93974db9b3ab98af12ada93
Author: Petr Mladek <pmladek at suse.cz>
Date: Mon Oct 4 16:59:51 2010 +0200
remove include guards using fixguard.py
diff --git a/basegfx/source/tools/canvastools.cxx b/basegfx/source/tools/canvastools.cxx
old mode 100755
new mode 100644
diff --git a/basegfx/source/tools/debugplotter.cxx b/basegfx/source/tools/debugplotter.cxx
old mode 100755
new mode 100644
diff --git a/basegfx/source/tools/unopolypolygon.cxx b/basegfx/source/tools/unopolypolygon.cxx
old mode 100755
new mode 100644
diff --git a/canvas/source/directx/dx_5rm.cxx b/canvas/source/directx/dx_5rm.cxx
old mode 100755
new mode 100644
diff --git a/canvas/source/directx/dx_9rm.cxx b/canvas/source/directx/dx_9rm.cxx
old mode 100755
new mode 100644
diff --git a/canvas/source/directx/dx_bitmap.cxx b/canvas/source/directx/dx_bitmap.cxx
old mode 100755
new mode 100644
diff --git a/canvas/source/directx/dx_bitmapcanvashelper.cxx b/canvas/source/directx/dx_bitmapcanvashelper.cxx
old mode 100755
new mode 100644
diff --git a/canvas/source/directx/dx_canvasbitmap.cxx b/canvas/source/directx/dx_canvasbitmap.cxx
old mode 100755
new mode 100644
diff --git a/canvas/source/directx/dx_canvascustomsprite.cxx b/canvas/source/directx/dx_canvascustomsprite.cxx
old mode 100755
new mode 100644
diff --git a/canvas/source/directx/dx_canvasfont.cxx b/canvas/source/directx/dx_canvasfont.cxx
old mode 100755
new mode 100644
diff --git a/canvas/source/directx/dx_canvashelper.cxx b/canvas/source/directx/dx_canvashelper.cxx
old mode 100755
new mode 100644
diff --git a/canvas/source/directx/dx_canvashelper_texturefill.cxx b/canvas/source/directx/dx_canvashelper_texturefill.cxx
old mode 100755
new mode 100644
diff --git a/canvas/source/directx/dx_config.cxx b/canvas/source/directx/dx_config.cxx
old mode 100755
new mode 100644
diff --git a/canvas/source/directx/dx_devicehelper.cxx b/canvas/source/directx/dx_devicehelper.cxx
old mode 100755
new mode 100644
diff --git a/canvas/source/directx/dx_gdiplususer.cxx b/canvas/source/directx/dx_gdiplususer.cxx
old mode 100755
new mode 100644
diff --git a/canvas/source/directx/dx_impltools.cxx b/canvas/source/directx/dx_impltools.cxx
old mode 100755
new mode 100644
diff --git a/canvas/source/directx/dx_linepolypolygon.cxx b/canvas/source/directx/dx_linepolypolygon.cxx
old mode 100755
new mode 100644
diff --git a/canvas/source/directx/dx_spritecanvas.cxx b/canvas/source/directx/dx_spritecanvas.cxx
old mode 100755
new mode 100644
diff --git a/canvas/source/directx/dx_spritecanvashelper.cxx b/canvas/source/directx/dx_spritecanvashelper.cxx
old mode 100755
new mode 100644
diff --git a/canvas/source/directx/dx_spritehelper.cxx b/canvas/source/directx/dx_spritehelper.cxx
old mode 100755
new mode 100644
diff --git a/canvas/source/directx/dx_surfacegraphics.cxx b/canvas/source/directx/dx_surfacegraphics.cxx
old mode 100755
new mode 100644
diff --git a/canvas/source/directx/dx_textlayout.cxx b/canvas/source/directx/dx_textlayout.cxx
old mode 100755
new mode 100644
diff --git a/canvas/source/directx/dx_vcltools.cxx b/canvas/source/directx/dx_vcltools.cxx
old mode 100755
new mode 100644
diff --git a/canvas/source/tools/canvastools.cxx b/canvas/source/tools/canvastools.cxx
old mode 100755
new mode 100644
diff --git a/comphelper/source/eventattachermgr/eventattachermgr.cxx b/comphelper/source/eventattachermgr/eventattachermgr.cxx
index c76166e..8f66cce 100644
--- a/comphelper/source/eventattachermgr/eventattachermgr.cxx
+++ b/comphelper/source/eventattachermgr/eventattachermgr.cxx
@@ -34,9 +34,7 @@
#include <wchar.h>
#endif
#include <osl/mutex.hxx>
-#ifndef _VOS_DIAGNOSE_HXX_
#include <vos/diagnose.hxx>
-#endif
#include <vos/macros.hxx>
#include <comphelper/eventattachermgr.hxx>
#include <com/sun/star/beans/XIntrospection.hpp>
diff --git a/comphelper/source/misc/accessibletexthelper.cxx b/comphelper/source/misc/accessibletexthelper.cxx
index a2ede83..1dfd37f 100644
--- a/comphelper/source/misc/accessibletexthelper.cxx
+++ b/comphelper/source/misc/accessibletexthelper.cxx
@@ -32,9 +32,7 @@
#include <comphelper/accessibletexthelper.hxx>
#include <com/sun/star/accessibility/AccessibleTextType.hpp>
#include <com/sun/star/i18n/CharacterIteratorMode.hpp>
-#ifndef _COM_SUN_STAR_TEXT_WORDTYPE_HPP_
#include <com/sun/star/i18n/WordType.hpp>
-#endif
#include <com/sun/star/i18n/KCharacterType.hpp>
#include <comphelper/processfactory.hxx>
#include <com/sun/star/accessibility/TextSegment.hpp>
diff --git a/comphelper/source/misc/evtmethodhelper.cxx b/comphelper/source/misc/evtmethodhelper.cxx
old mode 100755
new mode 100644
diff --git a/comphelper/source/misc/stillreadwriteinteraction.cxx b/comphelper/source/misc/stillreadwriteinteraction.cxx
index f5b2cdd..02ece13 100644
--- a/comphelper/source/misc/stillreadwriteinteraction.cxx
+++ b/comphelper/source/misc/stillreadwriteinteraction.cxx
@@ -29,17 +29,11 @@
#include "precompiled_comphelper.hxx"
#include <comphelper/stillreadwriteinteraction.hxx>
-#ifndef __COM_SUN_STAR_UCB_INTERACTIVEIOEXCEPTION_HPP__
#include <com/sun/star/ucb/InteractiveIOException.hpp>
-#endif
-#ifndef __COM_SUN_STAR_TASK_XINTERACTIONABORT_HPP__
#include <com/sun/star/task/XInteractionAbort.hpp>
-#endif
-#ifndef __COM_SUN_STAR_UCB_UNSUPPORTEDDATASINKEXCEPTION_HPP__
#include <com/sun/star/ucb/UnsupportedDataSinkException.hpp>
-#endif
namespace comphelper{
diff --git a/comphelper/source/property/MasterPropertySet.cxx b/comphelper/source/property/MasterPropertySet.cxx
index 1e32140..e687aef 100644
--- a/comphelper/source/property/MasterPropertySet.cxx
+++ b/comphelper/source/property/MasterPropertySet.cxx
@@ -28,9 +28,7 @@
// MARKER(update_precomp.py): autogen include statement, do not remove
#include "precompiled_comphelper.hxx"
-#ifndef _COMPHELPER_MASTERPROPERTYSET_HXX_
#include <comphelper/MasterPropertySet.hxx>
-#endif
#include <comphelper/MasterPropertySetInfo.hxx>
#include <comphelper/ChainablePropertySet.hxx>
#include <comphelper/ChainablePropertySetInfo.hxx>
diff --git a/comphelper/source/property/MasterPropertySetInfo.cxx b/comphelper/source/property/MasterPropertySetInfo.cxx
index 67ab45c..7cdf8b9 100644
--- a/comphelper/source/property/MasterPropertySetInfo.cxx
+++ b/comphelper/source/property/MasterPropertySetInfo.cxx
@@ -27,9 +27,7 @@
// MARKER(update_precomp.py): autogen include statement, do not remove
#include "precompiled_comphelper.hxx"
-#ifndef _COMPHELPER_CHAINABLEPROPERTYSETINFO_HXX_
#include <comphelper/MasterPropertySetInfo.hxx>
-#endif
#include <comphelper/TypeGeneration.hxx>
using ::rtl::OUString;
diff --git a/comphelper/source/property/TypeGeneration.cxx b/comphelper/source/property/TypeGeneration.cxx
index 11978ad..b42e615 100644
--- a/comphelper/source/property/TypeGeneration.cxx
+++ b/comphelper/source/property/TypeGeneration.cxx
@@ -27,9 +27,7 @@
// MARKER(update_precomp.py): autogen include statement, do not remove
#include "precompiled_comphelper.hxx"
-#ifndef _COMPHELPER_TYPEGENERATION_HXX
#include <comphelper/TypeGeneration.hxx>
-#endif
#include <com/sun/star/script/XLibraryContainer.hpp>
#include <com/sun/star/style/LineSpacingMode.hpp>
... etc. - the rest is truncated
More information about the ooo-build-commit
mailing list