more removed include guards using fixguard.py

41 files changed, 0 insertions, 120 deletions

diff --git a/filter/source/config/cache/cacheitem.cxx b/filter/source/config/cache/cacheitem.cxx
index c752516df10f..2497158c683f 100644
--- a/filter/source/config/cache/cacheitem.cxx
+++ b/filter/source/config/cache/cacheitem.cxx
@@ -36,9 +36,7 @@
 // includes
 #include <com/sun/star/uno/Sequence.h>
 
-#ifndef _COM_SUN_STAR_BEANS_PROPERTYVALUE_Hpp_
 #include <com/sun/star/beans/PropertyValue.hpp>
-#endif
 
 //_______________________________________________
 // namespace
diff --git a/filter/source/graphicfilter/egif/giflzwc.hxx b/filter/source/graphicfilter/egif/giflzwc.hxx
index 75048b0f8ff5..eb1a5fcaf27e 100644
--- a/filter/source/graphicfilter/egif/giflzwc.hxx
+++ b/filter/source/graphicfilter/egif/giflzwc.hxx
@@ -28,9 +28,7 @@
 #ifndef _GIFLZWC_HXX
 #define _GIFLZWC_HXX
 
-#ifndef _BMPACC_HXX
 #include <vcl/bmpacc.hxx>
-#endif
 
 // --------------------
 // - GIFLZWCompressor -
diff --git a/filter/source/msfilter/msocximex.cxx b/filter/source/msfilter/msocximex.cxx
index 7cf51946fc03..f729bb062c65 100644
--- a/filter/source/msfilter/msocximex.cxx
+++ b/filter/source/msfilter/msocximex.cxx
@@ -32,9 +32,7 @@
 #include <com/sun/star/uno/Any.h>
 #include <com/sun/star/text/VertOrientation.hpp>
 #include <com/sun/star/text/XText.hpp>
-#ifndef _COM_SUN_STAR_LANG_XSERVICEINFO_HDL_
 #include <com/sun/star/lang/XServiceInfo.hpp>
-#endif
 #include <com/sun/star/text/TextContentAnchorType.hpp>
 #include <com/sun/star/drawing/XShape.hpp>
 #include <com/sun/star/beans/XPropertySet.hpp>
diff --git a/filter/source/msfilter/powerpoint/pptimporter.cxx b/filter/source/msfilter/powerpoint/pptimporter.cxx
index 960987700980..0abbe8fffd77 100644
--- a/filter/source/msfilter/powerpoint/pptimporter.cxx
+++ b/filter/source/msfilter/powerpoint/pptimporter.cxx
@@ -30,9 +30,7 @@
 #include "pptimporter.hxx"
 
 #ifdef DBG_DUMP_PPT_IMPORT
-#ifndef _COM_SUN_STAR_IO_XACTIVEDATASOURCE_HDL_
 #include <com/sun/star/io/XActiveDataSource.hpp>
-#endif
 #include <unotools/streamwrap.hxx>
 #include <comphelper/processfactory.hxx>
 #endif
diff --git a/filter/source/svg/svgwriter.hxx b/filter/source/svg/svgwriter.hxx
index 113448a551d5..da99718c5c3f 100644
--- a/filter/source/svg/svgwriter.hxx
+++ b/filter/source/svg/svgwriter.hxx
@@ -35,24 +35,12 @@
 #include <tools/string.hxx>
 #include <tools/urlobj.hxx>
 #include <tools/stack.hxx>
-#ifndef _SALBTYPE_HXX
 #include <vcl/salbtype.hxx>
-#endif
-#ifndef _GDIMTF_HXX
 #include <vcl/gdimtf.hxx>
-#endif
-#ifndef _METAACT_HXX
 #include <vcl/metaact.hxx>
-#endif
-#ifndef _METAACT_HXX
 #include <vcl/metric.hxx>
-#endif
-#ifndef _VIRDEV_HXX
 #include <vcl/virdev.hxx>
-#endif
-#ifndef _CVTGRF_HXX
 #include <vcl/cvtgrf.hxx>
-#endif
 #include <xmloff/xmlexp.hxx>
 #include <xmloff/nmspmap.hxx>
 
diff --git a/filter/source/xmlfilteradaptor/streamwrap.hxx b/filter/source/xmlfilteradaptor/streamwrap.hxx
index dd87dbd13492..dd87dbd13492 100755..100644
--- a/filter/source/xmlfilteradaptor/streamwrap.hxx
+++ b/filter/source/xmlfilteradaptor/streamwrap.hxx
diff --git a/filter/source/xmlfilterdetect/filterdetect.hxx b/filter/source/xmlfilterdetect/filterdetect.hxx
index 965e2ceaa1d7..82327d7a602f 100644
--- a/filter/source/xmlfilterdetect/filterdetect.hxx
+++ b/filter/source/xmlfilterdetect/filterdetect.hxx
@@ -37,9 +37,7 @@
 #include <com/sun/star/lang/XServiceInfo.hpp>
 #include <cppuhelper/implbase5.hxx>
 
-#ifndef _CPPUHELPER_IMPLBASE4_HXX_
 #include <cppuhelper/implbase3.hxx>
-#endif
 
 
 
diff --git a/filter/source/xsltdialog/typedetectionexport.hxx b/filter/source/xsltdialog/typedetectionexport.hxx
index 09dfb5d12d4d..7530147a96b9 100644
--- a/filter/source/xsltdialog/typedetectionexport.hxx
+++ b/filter/source/xsltdialog/typedetectionexport.hxx
@@ -28,9 +28,7 @@
 #ifndef _TYPEDETECTION_EXPORT_HXX
 #define _TYPEDETECTION_EXPORT_HXX
 
-#ifndef _COM_SUN_STAR_XML_SAX_XDOCUMENTHANDLER_HXX
 #include <com/sun/star/xml/sax/XDocumentHandler.hpp>
-#endif
 #include <com/sun/star/lang/XMultiServiceFactory.hpp>
 #include <com/sun/star/io/XOutputStream.hpp>
 
diff --git a/filter/source/xsltdialog/typedetectionimport.hxx b/filter/source/xsltdialog/typedetectionimport.hxx
index b4c13ff44a9c..f12e34a0c536 100644
--- a/filter/source/xsltdialog/typedetectionimport.hxx
+++ b/filter/source/xsltdialog/typedetectionimport.hxx
@@ -31,9 +31,7 @@
 #include <com/sun/star/lang/XMultiServiceFactory.hpp>
 #include <com/sun/star/io/XInputStream.hpp>
 #include <cppuhelper/implbase1.hxx> // helper for implementations
-#ifndef _COM_SUN_STAR_XML_SAX_XDUCUMENTHANDLER_HPP_
 #include <com/sun/star/xml/sax/XDocumentHandler.hpp>
-#endif
 #include <comphelper/stl_types.hxx>
 
 #include "xmlfilterjar.hxx"
diff --git a/filter/source/xsltdialog/xmlfileview.hxx b/filter/source/xsltdialog/xmlfileview.hxx
index 190c52254374..3eb18ac4e839 100644
--- a/filter/source/xsltdialog/xmlfileview.hxx
+++ b/filter/source/xsltdialog/xmlfileview.hxx
@@ -31,19 +31,13 @@
 #include <svl/lstner.hxx>
 #include <vcl/timer.hxx>
 
-#ifndef _TABLE_HXX //autogen
 #include <tools/table.hxx>
-#endif
 #include <svtools/xtextedt.hxx>
 #include <vcl/timer.hxx>
-#ifndef _TABLE_HXX //autogen
 #include <tools/table.hxx>
-#endif
 #include <vcl/wrkwin.hxx>
 #include <vcl/ctrl.hxx>
-#ifndef _SV_BUTTON_HXX
 #include <vcl/button.hxx>
-#endif
 #include <vcl/lstbox.hxx>
 
 class ScrollBar;
diff --git a/filter/source/xsltdialog/xmlfiltersettingsdialog.hxx b/filter/source/xsltdialog/xmlfiltersettingsdialog.hxx
index 5abf2bba0df3..a4f84bec7ca9 100644
--- a/filter/source/xsltdialog/xmlfiltersettingsdialog.hxx
+++ b/filter/source/xsltdialog/xmlfiltersettingsdialog.hxx
@@ -33,9 +33,7 @@
 #include <com/sun/star/container/XNameContainer.hpp>
 #include <vcl/wrkwin.hxx>
 
-#ifndef _SV_BUTTON_HXX
 #include <vcl/button.hxx>
-#endif
 #include <svtools/svtabbx.hxx>
 #include <svl/poolitem.hxx>
 #include <unotools/moduleoptions.hxx>
diff --git a/filter/source/xsltdialog/xmlfiltertestdialog.hxx b/filter/source/xsltdialog/xmlfiltertestdialog.hxx
index a287447937f2..3c039f04ab18 100644
--- a/filter/source/xsltdialog/xmlfiltertestdialog.hxx
+++ b/filter/source/xsltdialog/xmlfiltertestdialog.hxx
@@ -32,9 +32,7 @@
 #include <com/sun/star/document/XEventBroadcaster.hpp>
 #include <vcl/dialog.hxx>
 
-#ifndef _SV_BUTTON_HXX
 #include <vcl/button.hxx>
-#endif
 #include <vcl/fixed.hxx>
 #include <svl/poolitem.hxx>
 
diff --git a/oox/inc/oox/helper/textinputstream.hxx b/oox/inc/oox/helper/textinputstream.hxx
index 1e74825ee713..1e74825ee713 100755..100644
--- a/oox/inc/oox/helper/textinputstream.hxx
+++ b/oox/inc/oox/helper/textinputstream.hxx
diff --git a/oox/inc/oox/ole/axbinaryreader.hxx b/oox/inc/oox/ole/axbinaryreader.hxx
index e3f102716e17..e3f102716e17 100755..100644
--- a/oox/inc/oox/ole/axbinaryreader.hxx
+++ b/oox/inc/oox/ole/axbinaryreader.hxx
diff --git a/oox/inc/oox/ole/olestorage.hxx b/oox/inc/oox/ole/olestorage.hxx
index a84fadfadc92..a84fadfadc92 100755..100644
--- a/oox/inc/oox/ole/olestorage.hxx
+++ b/oox/inc/oox/ole/olestorage.hxx
diff --git a/oox/inc/oox/ole/vbacontrol.hxx b/oox/inc/oox/ole/vbacontrol.hxx
index c2490b3506bf..c2490b3506bf 100755..100644
--- a/oox/inc/oox/ole/vbacontrol.hxx
+++ b/oox/inc/oox/ole/vbacontrol.hxx
diff --git a/oox/inc/oox/ole/vbahelper.hxx b/oox/inc/oox/ole/vbahelper.hxx
index c1e7297d0c5b..c1e7297d0c5b 100755..100644
--- a/oox/inc/oox/ole/vbahelper.hxx
+++ b/oox/inc/oox/ole/vbahelper.hxx
diff --git a/oox/inc/oox/ole/vbamodule.hxx b/oox/inc/oox/ole/vbamodule.hxx
index 3b529ceee129..3b529ceee129 100755..100644
--- a/oox/inc/oox/ole/vbamodule.hxx
+++ b/oox/inc/oox/ole/vbamodule.hxx
diff --git a/oox/inc/oox/ole/vbaproject.hxx b/oox/inc/oox/ole/vbaproject.hxx
index 1d2fca29dbab..1d2fca29dbab 100755..100644
--- a/oox/inc/oox/ole/vbaproject.hxx
+++ b/oox/inc/oox/ole/vbaproject.hxx
diff --git a/writerfilter/inc/doctok/WW8Document.hxx b/writerfilter/inc/doctok/WW8Document.hxx
index e3915c628761..dad638c5b25d 100644
--- a/writerfilter/inc/doctok/WW8Document.hxx
+++ b/writerfilter/inc/doctok/WW8Document.hxx
@@ -33,13 +33,9 @@
 #include <com/sun/star/uno/Reference.hxx>
 #include <resourcemodel/SubSequence.hxx>
 #include <com/sun/star/io/XInputStream.hpp>
-#ifndef _COM_SUN_STAR_UNO_XCOMPONENTCONTEX_HPP_
 #include <com/sun/star/uno/XComponentContext.hpp>
-#endif
 
-#ifndef INCLUDED_WW8_RESOURCE_MODEL_HXX
 #include <resourcemodel/WW8ResourceModel.hxx>
-#endif
 #include <resourcemodel/OutputWithDepth.hxx>
 
 #include <WriterFilterDllApi.hxx>
diff --git a/writerfilter/inc/ooxml/OOXMLDocument.hxx b/writerfilter/inc/ooxml/OOXMLDocument.hxx
index cb5991c00929..8cfbcad6fc2a 100644
--- a/writerfilter/inc/ooxml/OOXMLDocument.hxx
+++ b/writerfilter/inc/ooxml/OOXMLDocument.hxx
@@ -30,15 +30,9 @@
 #include <sal/types.h>
 #include <com/sun/star/uno/Reference.hxx>
 #include <com/sun/star/io/XInputStream.hpp>
-#ifndef _COM_SUN_STAR_UNO_XCOMPONENTCONTEX_HPP_
 #include <com/sun/star/uno/XComponentContext.hpp>
-#endif
-#ifndef INCLUDED_WW8_RESOURCE_MODEL_HXX
 #include <resourcemodel/WW8ResourceModel.hxx>
-#endif
-#ifndef _COM_SUN_STAR_XML_SAX_XPARSER_HOO_
 #include <com/sun/star/xml/sax/XParser.hpp>
-#endif
 #include <com/sun/star/xml/sax/XFastParser.hpp>
 #include <com/sun/star/xml/sax/XFastTokenHandler.hpp>
 #include <com/sun/star/frame/XModel.hpp>
diff --git a/writerfilter/inc/resourcemodel/TableData.hxx b/writerfilter/inc/resourcemodel/TableData.hxx
index aca4fce71064..2965593698da 100644
--- a/writerfilter/inc/resourcemodel/TableData.hxx
+++ b/writerfilter/inc/resourcemodel/TableData.hxx
@@ -28,9 +28,7 @@
 #ifndef INCLUDED_TABLE_DATA
 #define INCLUDED_TABLE_DATA
 
-#ifndef INCLUDED_WW8_RESOURCE_MODEL_HXX
 #include <resourcemodel/WW8ResourceModel.hxx>
-#endif
 
 #include <vector>
 #include <boost/shared_ptr.hpp>
diff --git a/writerfilter/inc/resourcemodel/TableManager.hxx b/writerfilter/inc/resourcemodel/TableManager.hxx
index fe43694d25d2..b19d5dd2517d 100644
--- a/writerfilter/inc/resourcemodel/TableManager.hxx
+++ b/writerfilter/inc/resourcemodel/TableManager.hxx
@@ -28,17 +28,11 @@
 #ifndef INCLUDED_TABLE_MANAGER_HXX
 #define INCLUDED_TABLE_MANAGER_HXX
 
-#ifndef INCLUDED_TABLE_DATA_HXX
 #include <resourcemodel/TableData.hxx>
-#endif
 
-#ifndef INCLUDED_WW8_RESOURCE_MODEL_HXX
 #include <resourcemodel/WW8ResourceModel.hxx>
-#endif
 
-#ifndef INCLUDED_SPRMIDS_HXX
 #include <doctok/sprmids.hxx>
-#endif
 
 #include <boost/shared_ptr.hpp>
 #include <stack>
diff --git a/writerfilter/qa/cppunittests/odiapi/ExternalViewLogger.hxx b/writerfilter/qa/cppunittests/odiapi/ExternalViewLogger.hxx
index dfa5dd736b41..c0b62fd9deee 100644
--- a/writerfilter/qa/cppunittests/odiapi/ExternalViewLogger.hxx
+++ b/writerfilter/qa/cppunittests/odiapi/ExternalViewLogger.hxx
@@ -28,9 +28,7 @@
 #ifndef INCLUDED_EXTERNALVIEWLOGGER_HXX
 #define INCLUDED_EXTERNALVIEWLOGGER_HXX
 
-#ifndef INCLUDED_LOGGER_HXX
 #include <odiapi/props/Logger.hxx>
-#endif
 
 #include <fstream>
 #include <stack>
diff --git a/writerfilter/source/dmapper/CellMarginHandler.hxx b/writerfilter/source/dmapper/CellMarginHandler.hxx
index 5f01df47a347..caffe4011764 100644
--- a/writerfilter/source/dmapper/CellMarginHandler.hxx
+++ b/writerfilter/source/dmapper/CellMarginHandler.hxx
@@ -27,9 +27,7 @@
 #ifndef INCLUDED_CELLMARGINHANDLER_HXX
 #define INCLUDED_CELLMARGINHANDLER_HXX
 
-#ifndef INCLUDED_WRITERFILTERDLLAPI_H
 #include <WriterFilterDllApi.hxx>
-#endif
 #include <resourcemodel/WW8ResourceModel.hxx>
 #include <boost/shared_ptr.hpp>
 
diff --git a/writerfilter/source/dmapper/OLEHandler.hxx b/writerfilter/source/dmapper/OLEHandler.hxx
index f9059fb6a35a..a5a969171fdf 100644
--- a/writerfilter/source/dmapper/OLEHandler.hxx
+++ b/writerfilter/source/dmapper/OLEHandler.hxx
@@ -27,9 +27,7 @@
 #ifndef INCLUDED_OLEHANDLER_HXX
 #define INCLUDED_OLEHANDLER_HXX
 
-#ifndef INCLUDED_WRITERFILTERDLLAPI_H
 #include <WriterFilterDllApi.hxx>
-#endif
 #include <resourcemodel/WW8ResourceModel.hxx>
 #include <boost/shared_ptr.hpp>
 #include <com/sun/star/awt/Size.hpp>
diff --git a/writerfilter/source/dmapper/PropertyMap.hxx b/writerfilter/source/dmapper/PropertyMap.hxx
index 16886530f324..02272d90e827 100644
--- a/writerfilter/source/dmapper/PropertyMap.hxx
+++ b/writerfilter/source/dmapper/PropertyMap.hxx
@@ -29,9 +29,7 @@
 
 #include <rtl/ustring.hxx>
 #include <com/sun/star/uno/Sequence.hxx>
-#ifndef _COM_SUN_STAR_BEANS_PROPERTYVALUE_HXX_
 #include <com/sun/star/beans/PropertyValue.hpp>
-#endif
 #include <com/sun/star/beans/XPropertySet.hpp>
 #include <com/sun/star/uno/Any.h>
 #include <PropertyIds.hxx>
diff --git a/writerfilter/source/dmapper/SettingsTable.hxx b/writerfilter/source/dmapper/SettingsTable.hxx
index cb3e7913c5e7..cb3e7913c5e7 100755..100644
--- a/writerfilter/source/dmapper/SettingsTable.hxx
+++ b/writerfilter/source/dmapper/SettingsTable.hxx
diff --git a/writerfilter/source/doctok/WW8Clx.hxx b/writerfilter/source/doctok/WW8Clx.hxx
index 7085965a689a..5a4afee5c30d 100644
--- a/writerfilter/source/doctok/WW8Clx.hxx
+++ b/writerfilter/source/doctok/WW8Clx.hxx
@@ -30,9 +30,7 @@
 
 #include <resources.hxx>
 
-#ifndef INCLUDED_WW8_OUTPUT_WITH_DEPTH_HXX
 #include <WW8OutputWithDepth.hxx>
-#endif
 
 namespace writerfilter {
 namespace doctok
diff --git a/writerfilter/source/doctok/WW8CpAndFc.hxx b/writerfilter/source/doctok/WW8CpAndFc.hxx
index 86a8b971a7d6..c05363e8c926 100644
--- a/writerfilter/source/doctok/WW8CpAndFc.hxx
+++ b/writerfilter/source/doctok/WW8CpAndFc.hxx
@@ -29,9 +29,7 @@
 #define INCLUDED_WW8_CP_AND_FC_HXX
 
 #include <sal/types.h>
-#ifndef INCLUDED_DOCUMENT_HXX
 #include <doctok/WW8Document.hxx>
-#endif
 #include <set>
 #include <hash_map>
 #include <iostream>
diff --git a/writerfilter/source/doctok/WW8DocumentImpl.hxx b/writerfilter/source/doctok/WW8DocumentImpl.hxx
index a1f7e8abb2b4..fc4fc3207b7c 100644
--- a/writerfilter/source/doctok/WW8DocumentImpl.hxx
+++ b/writerfilter/source/doctok/WW8DocumentImpl.hxx
@@ -32,9 +32,7 @@
 #include <WW8PieceTable.hxx>
 #include <WW8BinTable.hxx>
 #include <resources.hxx>
-#ifndef INCLUDED_WW8_RESOURCE_MODEL_HXX
 #include <resourcemodel/WW8ResourceModel.hxx>
-#endif
 #include <PLCF.hxx>
 #include <WW8Sttbf.hxx>
 #include <XNoteHelper.hxx>
diff --git a/writerfilter/source/doctok/WW8FKP.hxx b/writerfilter/source/doctok/WW8FKP.hxx
index af0af1b8e303..2814ba4de715 100644
--- a/writerfilter/source/doctok/WW8FKP.hxx
+++ b/writerfilter/source/doctok/WW8FKP.hxx
@@ -28,12 +28,8 @@
 #ifndef INCLUDED_WW8_FKP_HXX
 #define INCLUDED_WW8_FKP_HXX
 
-#ifndef INCLUDES_WW8_CP_AND_FC_HXX
 #include <WW8CpAndFc.hxx>
-#endif
-#ifndef INCLUDE_WW8_STRUCT_BASE_HXX
 #include <WW8StructBase.hxx>
-#endif
 
 namespace writerfilter {
 namespace doctok
diff --git a/writerfilter/source/doctok/WW8FKPImpl.hxx b/writerfilter/source/doctok/WW8FKPImpl.hxx
index a7e59a33b1b2..a31c9dc45b58 100644
--- a/writerfilter/source/doctok/WW8FKPImpl.hxx
+++ b/writerfilter/source/doctok/WW8FKPImpl.hxx
@@ -32,9 +32,7 @@
 #include <deque>
 #include <WW8FKP.hxx>
 
-#ifndef INCLUDED_OUTPUT_WITH_DEPTH_HXX
 #include <resourcemodel/OutputWithDepth.hxx>
-#endif
 
 namespace writerfilter {
 namespace doctok
diff --git a/writerfilter/source/doctok/WW8PieceTableImpl.hxx b/writerfilter/source/doctok/WW8PieceTableImpl.hxx
index 3d7a5e9ede79..9712836429ab 100644
--- a/writerfilter/source/doctok/WW8PieceTableImpl.hxx
+++ b/writerfilter/source/doctok/WW8PieceTableImpl.hxx
@@ -30,9 +30,7 @@
 
 #include <vector>
 #include <WW8CpAndFc.hxx>
-#ifndef INCLUDE_WW8_PIECE_TABLE_HXX
 #include <WW8PieceTable.hxx>
-#endif
 
 namespace writerfilter {
 namespace doctok
diff --git a/writerfilter/source/doctok/WW8ResourceModelImpl.hxx b/writerfilter/source/doctok/WW8ResourceModelImpl.hxx
index d7eba5ba67a2..d399956ba33e 100644
--- a/writerfilter/source/doctok/WW8ResourceModelImpl.hxx
+++ b/writerfilter/source/doctok/WW8ResourceModelImpl.hxx
@@ -30,14 +30,10 @@
 
 #include <doctok/WW8Document.hxx>
 
-#ifndef INCLUDED_WW8_RESOURCE_MODEL_HXX
 #include <resourcemodel/WW8ResourceModel.hxx>
-#endif
 #include <WW8StructBase.hxx>
 
-#ifndef INCLUDED_OUTPUT_WITH_DEPTH_HXX
 #include <resourcemodel/OutputWithDepth.hxx>
-#endif
 
 #include <map>
 
diff --git a/writerfilter/source/doctok/WW8StreamImpl.hxx b/writerfilter/source/doctok/WW8StreamImpl.hxx
index 2f1a0b0b234e..493eca9adc2d 100644
--- a/writerfilter/source/doctok/WW8StreamImpl.hxx
+++ b/writerfilter/source/doctok/WW8StreamImpl.hxx
@@ -29,9 +29,7 @@
 #include <com/sun/star/io/XInputStream.hpp>
 #include <com/sun/star/container/XNameContainer.hpp>
 #include <doctok/WW8Document.hxx>
-#ifndef INCLUDED_OUTPUT_WITH_DEPTH_HXX
 #include <resourcemodel/OutputWithDepth.hxx>
-#endif
 
 namespace writerfilter {
 namespace doctok
diff --git a/writerfilter/source/doctok/XNoteHelper.hxx b/writerfilter/source/doctok/XNoteHelper.hxx
index faa7f3bb038d..c855366e01af 100644
--- a/writerfilter/source/doctok/XNoteHelper.hxx
+++ b/writerfilter/source/doctok/XNoteHelper.hxx
@@ -28,9 +28,7 @@
 #ifndef INCLUDED_X_NOTE_HELPER_HXX
 #define INCLUDED_X_NOTE_HELPER_HXX
 
-#ifndef INLCUED_PLCF_HXX
 #include <PLCF.hxx>
-#endif
 #include <WW8DocumentImpl.hxx>
 
 namespace writerfilter {
diff --git a/writerfilter/source/ooxml/OOXMLDocumentImpl.hxx b/writerfilter/source/ooxml/OOXMLDocumentImpl.hxx
index 5da9678c792b..d7aa2d1f94e8 100644
--- a/writerfilter/source/ooxml/OOXMLDocumentImpl.hxx
+++ b/writerfilter/source/ooxml/OOXMLDocumentImpl.hxx
@@ -29,9 +29,7 @@
 
 #include <ooxml/OOXMLDocument.hxx>
 
-#ifndef _COM_SUN_STAR_XML_SAX_XFAST_TOKEN_HANDLER_HPP_
 #include <com/sun/star/xml/sax/XFastTokenHandler.hpp>
-#endif
 
 #include "OOXMLPropertySet.hxx"
 
diff --git a/writerfilter/source/ooxml/OOXMLFactory.hxx b/writerfilter/source/ooxml/OOXMLFactory.hxx
index 0558436ab793..36b083de4742 100755..100644
--- a/writerfilter/source/ooxml/OOXMLFactory.hxx
+++ b/writerfilter/source/ooxml/OOXMLFactory.hxx
@@ -31,17 +31,11 @@
 #include <hash_map>
 #include <boost/shared_ptr.hpp>
 
-#ifndef INCLUDED_WW8_RESOURCE_MODEL_HXX
 #include <resourcemodel/WW8ResourceModel.hxx>
-#endif
 
-#ifndef INCLUDED_OOXML_FAST_TOKENS_HXX
 #include <ooxml/OOXMLFastTokens.hxx>
-#endif
 
-#ifndef INCLUDED_OOXML_FAST_CONTEXT_HANDLER_HXX
 #include "OOXMLFastContextHandler.hxx"
-#endif
 
 namespace writerfilter {
 namespace ooxml {
diff --git a/writerperfect/source/wpgimp/WPGImportFilter.hxx b/writerperfect/source/wpgimp/WPGImportFilter.hxx
index e200b2b1df5d..87c8e625800d 100644
--- a/writerperfect/source/wpgimp/WPGImportFilter.hxx
+++ b/writerperfect/source/wpgimp/WPGImportFilter.hxx
@@ -29,27 +29,13 @@
 #ifndef _WPGIMPORTFILTER_HXX
 #define _WPGIMPORTFILTER_HXX
 
-#ifndef _COM_SUN_STAR_DOCUMENT_XFILTER_HPP_
 #include <com/sun/star/document/XFilter.hpp>
-#endif
-#ifndef _COM_SUN_STAR_DOCUMENT_XIMPORTER_HPP_
 #include <com/sun/star/document/XImporter.hpp>
-#endif
-#ifndef _COM_SUN_STAR_DOCUMENT_XEXTENDEDFILTERDETECTION_HPP_
 #include <com/sun/star/document/XExtendedFilterDetection.hpp>
-#endif
-#ifndef _COM_SUN_STAR_LANG_XINITIALIZATION_HPP_
 #include <com/sun/star/lang/XInitialization.hpp>
-#endif
-#ifndef _COM_SUN_STAR_LANG_XSERVICEINFO_HPP_
 #include <com/sun/star/lang/XServiceInfo.hpp>
-#endif
-#ifndef _COM_SUN_STAR_XML_SAX_XDOCUMENTHANDLER_HPP_
 #include <com/sun/star/xml/sax/XDocumentHandler.hpp>
-#endif
-#ifndef _CPPUHELPER_IMPLBASE5_HXX_
 #include <cppuhelper/implbase5.hxx>
-#endif
 
 #include <stdio.h>
 
diff --git a/writerperfect/source/wpsimp/MSWorksImportFilter.hxx b/writerperfect/source/wpsimp/MSWorksImportFilter.hxx
index aca9b18817da..ce5c271a1c2a 100644
--- a/writerperfect/source/wpsimp/MSWorksImportFilter.hxx
+++ b/writerperfect/source/wpsimp/MSWorksImportFilter.hxx
@@ -29,27 +29,13 @@
 #ifndef _WORDPERFECTIMPORTFILTER_HXX
 #define _WORDPERFECTIMPORTFILTER_HXX
 
-#ifndef _COM_SUN_STAR_DOCUMENT_XFILTER_HPP_
 #include <com/sun/star/document/XFilter.hpp>
-#endif
-#ifndef _COM_SUN_STAR_DOCUMENT_XIMPORTER_HPP_
 #include <com/sun/star/document/XImporter.hpp>
-#endif
-#ifndef _COM_SUN_STAR_DOCUMENT_XEXTENDEDFILTERDETECTION_HPP_
 #include <com/sun/star/document/XExtendedFilterDetection.hpp>
-#endif
-#ifndef _COM_SUN_STAR_LANG_XINITIALIZATION_HPP_
 #include <com/sun/star/lang/XInitialization.hpp>
-#endif
-#ifndef _COM_SUN_STAR_LANG_XSERVICEINFO_HPP_
 #include <com/sun/star/lang/XServiceInfo.hpp>
-#endif
-#ifndef _COM_SUN_STAR_XML_SAX_XDOCUMENTHANDLER_HPP_
 #include <com/sun/star/xml/sax/XDocumentHandler.hpp>
-#endif
-#ifndef _CPPUHELPER_IMPLBASE5_HXX_
 #include <cppuhelper/implbase5.hxx>
-#endif
 
 enum FilterType
 {