more removed include guards using fixguard.py

avmedia/inc/avmedia/mediaitem.hxx

@@ -29,9 +29,7 @@
 #define _AVMEDIA_MEDIAITEM_HXX
 
 #include <tools/rtti.hxx>
-#ifndef _POOLITEM_HXX
 #include <svl/poolitem.hxx>
-#endif
 #include <com/sun/star/media/ZoomLevel.hpp>
 
 #define AVMEDIA_SETMASK_NONE        ((sal_uInt32)(0x00000000))

avmedia/source/gstreamer/gstcommon.hxx

@@ -30,33 +30,15 @@
 
 #include <gst/gst.h>
 
-#ifndef _OSL_MUTEX_HXX_
 #include <osl/mutex.hxx>
-#endif
-#ifndef _DEBUG_HXX
 #include <tools/debug.hxx>
-#endif
-#ifndef _STREAM_HXX
 #include <tools/stream.hxx>
-#endif
-#ifndef _STRING_HXX
 #include <tools/string.hxx>
-#endif
-#ifndef _URLOBJ_HXX
 #include <tools/urlobj.hxx>
-#endif
-#ifndef _CPPUHELPER_IMPLBASE1_HXX_
 #include <cppuhelper/implbase1.hxx>
-#endif
-#ifndef _CPPUHELPER_IMPLBASE2_HXX_
 #include <cppuhelper/implbase2.hxx>
-#endif
-#ifndef _CPPUHELPER_WEAK_HXX_
 #include <cppuhelper/weak.hxx>
-#endif
-#ifndef _CPPUHELPER_FACTORY_HXX_
 #include <cppuhelper/factory.hxx>
-#endif
 
 #include <com/sun/star/uno/Reference.h>
 #include <com/sun/star/uno/RuntimeException.hpp>

avmedia/source/gstreamer/gstframegrabber.hxx

@@ -30,9 +30,7 @@
 
 #include "gstcommon.hxx"
 
-#ifndef _COM_SUN_STAR_MEDIA_XFRAMEGRABBER_HDL_
 #include "com/sun/star/media/XFrameGrabber.hdl"
-#endif
 
 namespace avmedia { namespace gstreamer {
 

avmedia/source/gstreamer/gstmanager.hxx

@@ -30,9 +30,7 @@
 
 #include "gstcommon.hxx"
 
-#ifndef _COM_SUN_STAR_MEDIA_XMANAGER_HDL_
 #include "com/sun/star/media/XManager.hdl"
-#endif
 
 // -----------
 // - Manager -

avmedia/source/gstreamer/gstplayer.hxx

@@ -31,9 +31,7 @@
 #include <osl/conditn.h>
 #include "gstcommon.hxx"
 
-#ifndef _COM_SUN_STAR_MEDIA_XPLAYER_HDL_
 #include "com/sun/star/media/XPlayer.hdl"
-#endif
 
 typedef struct _GstXOverlay GstXOverlay;
 

avmedia/source/gstreamer/gstwindow.hxx

@@ -31,9 +31,7 @@
 #include "gstcommon.hxx"
 #include <cppuhelper/interfacecontainer.h>
 
-#ifndef _COM_SUN_STAR_MEDIA_XPLAYERWINDOW_HDL_
 #include "com/sun/star/media/XPlayerWindow.hdl"
-#endif
 
 namespace avmedia { namespace gstreamer {
 

avmedia/source/quicktime/framegrabber.hxx

@@ -30,9 +30,7 @@
 
 #include "quicktimecommon.hxx"
 
-#ifndef _COM_SUN_STAR_MEDIA_XFRAMEGRABBER_HDL_
 #include "com/sun/star/media/XFrameGrabber.hdl"
-#endif
 
 namespace avmedia { namespace quicktime {
 

avmedia/source/quicktime/manager.hxx

@@ -30,9 +30,7 @@
 
 #include "quicktimecommon.hxx"
 
-#ifndef _COM_SUN_STAR_MEDIA_XMANAGER_HDL_
 #include "com/sun/star/media/XManager.hdl"
-#endif
 
 // -----------
 // - Manager -

avmedia/source/quicktime/player.hxx

@@ -31,9 +31,7 @@
 #include <osl/conditn.h>
 #include "quicktimecommon.hxx"
 
-#ifndef _COM_SUN_STAR_MEDIA_XPLAYER_HDL_
 #include "com/sun/star/media/XPlayer.hdl"
-#endif
 
 namespace avmedia { namespace quicktime {
 

avmedia/source/quicktime/window.hxx

@@ -31,9 +31,7 @@
 #include "quicktimecommon.hxx"
 #include <cppuhelper/interfacecontainer.h>
 
-#ifndef _COM_SUN_STAR_MEDIA_XPLAYERWINDOW_HDL_
 #include "com/sun/star/media/XPlayerWindow.hdl"
-#endif
 
 namespace avmedia { namespace quicktime {
 

avmedia/source/viewer/mediawindow_impl.cxx

@@ -40,12 +40,8 @@
 #include <vcl/sysdata.hxx>
 #endif
 
-#ifndef _COM_SUN_STAR_AWT_SYSTEMPOINTER_HDL_
 #include <com/sun/star/awt/SystemPointer.hdl>
-#endif
-#ifndef _COM_SUN_STAR_LANG_XCOMPONENT_HDL_
 #include <com/sun/star/lang/XComponent.hdl>
-#endif
 
 #define AVMEDIA_TOOLBOXITEM_PREV    0x0001
 #define AVMEDIA_TOOLBOXITEM_PLAY    0x0002

avmedia/source/viewer/mediawindowbase_impl.cxx

@@ -33,9 +33,7 @@
 #include <comphelper/processfactory.hxx>
 #include <com/sun/star/lang/XMultiServiceFactory.hpp>
 #include <com/sun/star/media/XManager.hpp>
-#ifndef _COM_SUN_STAR_LANG_XCOMPONENT_HDL_
 #include <com/sun/star/lang/XComponent.hdl>
-#endif
 
 #define MEDIA_TIMER_TIMEOUT 100
 

avmedia/source/win/framegrabber.hxx

@@ -30,9 +30,7 @@
 
 #include "wincommon.hxx"
 
-#ifndef _COM_SUN_STAR_MEDIA_XFRAMEGRABBER_HDL_
 #include "com/sun/star/media/XFrameGrabber.hdl"
-#endif
 
 struct IMediaDet;
 

avmedia/source/win/manager.hxx

@@ -30,9 +30,7 @@
 
 #include "wincommon.hxx"
 
-#ifndef _COM_SUN_STAR_MEDIA_XMANAGER_HDL_
 #include "com/sun/star/media/XManager.hdl"
-#endif
 
 // -----------
 // - Manager -

avmedia/source/win/player.hxx

@@ -30,9 +30,7 @@
 
 #include "wincommon.hxx"
 
-#ifndef _COM_SUN_STAR_MEDIA_XPLAYER_HDL_
 #include "com/sun/star/media/XPlayer.hdl"
-#endif
 
 struct IGraphBuilder;
 struct IBaseFilter;

avmedia/source/win/window.hxx

@@ -31,9 +31,7 @@
 #include "wincommon.hxx"
 #include <cppuhelper/interfacecontainer.h>
 
-#ifndef _COM_SUN_STAR_MEDIA_XPLAYERWINDOW_HDL_
 #include "com/sun/star/media/XPlayerWindow.hdl"
-#endif
 
 struct IVideoWindow;
 

avmedia/source/xine/manager.hxx

@@ -30,9 +30,7 @@
 
 #include "xinecommon.hxx"
 
-#ifndef _COM_SUN_STAR_MEDIA_XMANAGER_HDL_
 #include "com/sun/star/media/XManager.hdl"
-#endif
 
 // -----------
 // - Manager -

avmedia/source/xine/player.hxx

@@ -30,9 +30,7 @@
 
 #include "xinecommon.hxx"
 
-#ifndef _COM_SUN_STAR_MEDIA_XPLAYER_HDL_
 #include "com/sun/star/media/XPlayer.hdl"
-#endif
 
 namespace avmedia { namespace xine {
 

avmedia/source/xine/window.hxx

@@ -31,9 +31,7 @@
 #include "xinecommon.hxx"
 #include <cppuhelper/interfacecontainer.h>
 
-#ifndef _COM_SUN_STAR_MEDIA_XPLAYERWINDOW_HDL_
 #include "com/sun/star/media/XPlayerWindow.hdl"
-#endif
 
 namespace avmedia { namespace xine {
 

basic/inc/basic/sbstar.hxx

@@ -30,9 +30,7 @@
 
 #include <basic/sbx.hxx>
 #include <basic/sbxobj.hxx>
-#ifndef _RTL_USTRING_HXX
 #include <rtl/ustring.hxx>
-#endif
 #include <osl/mutex.hxx>
 
 #include <basic/sbdef.hxx>

basic/inc/basic/sbstdobj.hxx

@@ -29,9 +29,7 @@
 #define _SBSTDOBJ1_HXX
 
 #include <basic/sbxobj.hxx>
-#ifndef _GRAPH_HXX //autogen
 #include <vcl/graph.hxx>
-#endif
 #include <basic/sbxfac.hxx>
 class StarBASIC;
 class SbStdFactory;

basic/inc/basic/sbx.hxx

@@ -35,9 +35,7 @@
 #include <basic/sbxdef.hxx>
 #include <basic/sbxform.hxx>
 
-#ifndef __SBX_SBXOBJECT_HXX
 #include <basic/sbxobj.hxx>
-#endif
 #include <basic/sbxprop.hxx>
 #include <basic/sbxmeth.hxx>
 

basic/inc/basic/sbxdef.hxx

@@ -31,9 +31,7 @@
 
 
 #ifndef __RSC
-#ifndef _SOLAR_H
 #include <tools/solar.h>
-#endif
 #include "tools/errcode.hxx"
 
 #ifndef _SBX_CLASS_TYPE

basic/source/app/app.hxx

@@ -29,15 +29,9 @@
 #define _BASICAPP_HXX
 
 #include <vcl/svapp.hxx>
-#ifndef _HELP_HXX //autogen
 #include <vcl/help.hxx>
-#endif
-#ifndef _MENU_HXX //autogen
 #include <vcl/menu.hxx>
-#endif
-#ifndef _WRKWIN_HXX //autogen
 #include <vcl/wrkwin.hxx>
-#endif
 #include <vcl/timer.hxx>
 #include <svl/brdcst.hxx>
 #include <svl/lstner.hxx>

basic/source/app/appbased.hxx

@@ -29,12 +29,8 @@
 #define _APPBASED_HXX
 
 #include <basic/sbmod.hxx>
-#ifndef _SB_APPEDIT_HXX
 #include "appedit.hxx"
-#endif
-#ifndef _SB_TEXTEDIT_HXX
 #include "textedit.hxx"
-#endif
 
 class BasicFrame;
 class BreakpointWindow;

basic/source/app/appedit.hxx

@@ -28,9 +28,7 @@
 #ifndef _APPEDIT_HXX
 #define _APPEDIT_HXX
 
-#ifndef _SCRBAR_HXX //autogen
 #include <vcl/scrbar.hxx>
-#endif
 
 #include "appwin.hxx"
 #include "textedit.hxx"

basic/source/app/dialogs.hxx

@@ -28,26 +28,16 @@
 #ifndef _DIALOGS_HXX
 #define _DIALOGS_HXX
 
-#ifndef _DIALOG_HXX //autogen
 #include <vcl/dialog.hxx>
-#endif
-#ifndef _BUTTON_HXX //autogen
 #include <vcl/button.hxx>
-#endif
-#ifndef _EDIT_HXX //autogen
 #include <vcl/edit.hxx>
-#endif
-#ifndef _FIELD_HXX //autogen
 #include <vcl/field.hxx>
-#endif
 #include <vcl/fixed.hxx>
 #include <vcl/tabdlg.hxx>
 #include <vcl/tabctrl.hxx>
 #include <vcl/tabpage.hxx>
 #include <tools/config.hxx>
-#ifndef _TOOLS_LIST_HXX
 #include <tools/list.hxx>
-#endif
 #include <vcl/lstbox.hxx>
 #include <vcl/floatwin.hxx>
 #include <vcl/toolbox.hxx>
@@ -56,9 +46,7 @@
 
 class SbxVariable;
 
-#ifndef _BASIC_TTRESHLP_HXX
 #include <basic/ttstrhlp.hxx>
-#endif
 
 class AboutDialog : public ModalDialog {
     FixedText a1,a4,aVersionString;

basic/source/app/processw.hxx

@@ -29,9 +29,7 @@
 #define _PROCESSW_HXX
 
 #include <basic/sbxfac.hxx>
-#ifndef __SBX_SBXVARIABLE_HXX //autogen
 #include <basic/sbxvar.hxx>
-#endif
 #include <basic/sbxobj.hxx>
 #include <basic/process.hxx>
 

basic/source/inc/dlgcont.hxx

@@ -30,9 +30,7 @@
 
 #include "namecont.hxx"
 
-#ifndef _COM_SUN_STAR_AWT_XSTRINGRESOURCESUPPLIER_HPP_
 #include <com/sun/star/resource/XStringResourceSupplier.hpp>
-#endif
 #include "com/sun/star/resource/XStringResourcePersistence.hpp"
 
 #include <cppuhelper/implbase1.hxx>

basic/source/inc/image.hxx

@@ -29,9 +29,7 @@
 #define _SBIMAGE_HXX
 
 #include "sbintern.hxx"
-#ifndef _RTL_USTRING_HXX
 #include <rtl/ustring.hxx>
-#endif
 #include <filefmt.hxx>
 
 // Diese Klasse liest das vom Compiler erzeugte Image ein und verwaltet

basic/source/inc/iosys.hxx

@@ -29,9 +29,7 @@
 #define _SBIOSYS_HXX
 
 #include <tools/stream.hxx>
-#ifndef _SBERRORS_HXX
 #include <basic/sberrors.hxx>
-#endif
 
 class SvStream;
 

basic/source/inc/object.hxx

@@ -29,9 +29,7 @@
 #define _SAMPLE_OBJECT_HXX
 
 #include <basic/sbxfac.hxx>
-#ifndef __SBX_SBXVARIABLE_HXX //autogen
 #include <basic/sbxvar.hxx>
-#endif
 #include <basic/sbxobj.hxx>
 
 // 1) Properties:

basic/source/inc/propacc.hxx

@@ -28,21 +28,11 @@
 #define _SFX_PROPBAG_HXX
 
 #include <svl/svarray.hxx>
-#ifndef _COM_SUN_STAR_BEANS_PROPERTYVALUE_HXX_
 #include <com/sun/star/beans/PropertyValue.hpp>
-#endif
-#ifndef _COM_SUN_STAR_BEANS_XPROPERTYSET_HXX_
 #include <com/sun/star/beans/XPropertySet.hpp>
-#endif
-#ifndef _COM_SUN_STAR_BEANS_XPROPERTYSETINFO_HXX_
 #include <com/sun/star/beans/XPropertySetInfo.hpp>
-#endif
-#ifndef _COM_SUN_STAR_BEANS_XPROPERTYACCESS_HXX_
 #include <com/sun/star/beans/XPropertyAccess.hpp>
-#endif
-#ifndef _COM_SUN_STAR_BEANS_XPROPERTYCONTAINER_HXX_
 #include <com/sun/star/beans/XPropertyContainer.hpp>
-#endif
 #include <cppuhelper/implbase1.hxx>
 #include <cppuhelper/implbase2.hxx>
 

basic/source/inc/runtime.hxx

@@ -28,9 +28,7 @@
 #ifndef _SBRUNTIME_HXX
 #define _SBRUNTIME_HXX
 
-#ifndef _SBX_HXX
 #include <basic/sbx.hxx>
-#endif
 
 #include "sb.hxx"
 

basic/source/inc/sbunoobj.hxx

@@ -31,9 +31,7 @@
 #include <basic/sbxmeth.hxx>
 #include <basic/sbxprop.hxx>
 #include <basic/sbxfac.hxx>
-#ifndef __SBX_SBX_HXX //autogen
 #include <basic/sbx.hxx>
-#endif
 #include <com/sun/star/beans/XMaterialHolder.hpp>
 #include <com/sun/star/beans/XExactName.hpp>
 #include <com/sun/star/beans/XIntrospectionAccess.hpp>

basic/source/inc/scanner.hxx

@@ -29,9 +29,7 @@
 #define _SCANNER_HXX
 
 #include <tools/string.hxx>
-#ifndef _SBERRORS_HXX
 #include <basic/sberrors.hxx>
-#endif
 
 // Der Scanner ist stand-alone, d.h. er kann von ueberallher verwendet
 // werden. Eine BASIC-Instanz ist fuer Fehlermeldungen notwendig. Ohne

basic/source/inc/token.hxx

@@ -29,9 +29,7 @@
 #define _TOKEN_HXX
 
 #include "scanner.hxx"
-#ifndef _SBDEF_HXX
 #include <basic/sbdef.hxx>
-#endif
 
 #if defined( SHARED )
 #define SbiTokenSHAREDTMPUNDEF

basic/source/runtime/ddectrl.hxx

@@ -29,9 +29,7 @@
 #define _DDECTRL_HXX
 
 #include <tools/link.hxx>
-#ifndef _SBERRORS_HXX
 #include <basic/sberrors.hxx>
-#endif
 #include <tools/string.hxx>
 
 class DdeConnection;

connectivity/source/drivers/evoab2/NDatabaseMetaData.hxx

@@ -28,9 +28,7 @@
 #ifndef _CONNECTIVITY_EVOAB_DATABASEMETADATA_HXX_
 #define _CONNECTIVITY_EVOAB_DATABASEMETADATA_HXX_
 
-#ifndef _CONNECTIVITY_EVOAB_DEBUG_HXX_
 #include "NDebug.hxx"
-#endif
 #include "NConnection.hxx"
 #include "TDatabaseMetaDataBase.hxx"
 #include "FDatabaseMetaDataResultSet.hxx"

connectivity/source/drivers/hsqldb/HTerminateListener.hxx

@@ -28,9 +28,7 @@
 #define CONNECTIVITY_HSQLDB_TERMINATELISTENER_HXX
 
 #include <cppuhelper/compbase1.hxx>
-#ifndef _COM_SUN_STAR_LANG_XSERVICEINFO_HPP_
 #include <com/sun/star/frame/XTerminateListener.hpp>
-#endif
 
 //........................................................................
 namespace connectivity

connectivity/source/drivers/kab/KStatement.hxx

@@ -31,9 +31,7 @@
 #include "KConnection.hxx"
 #include <list>
 #include "connectivity/sqliterator.hxx"
-#ifndef _CONNECTIVITY_PARSE_SQLPARSE_HXX_
 #include "connectivity/sqlparse.hxx"
-#endif
 #include <com/sun/star/sdbc/XStatement.hpp>
 #include <com/sun/star/util/XCancellable.hpp>
 #include <cppuhelper/compbase4.hxx>

connectivity/source/drivers/kab/kcondition.hxx

@@ -28,9 +28,7 @@
 #ifndef _CONNECTIVITY_KAB_CONDITION_HXX_
 #define _CONNECTIVITY_KAB_CONDITION_HXX_
 
-#ifndef _COMPHELPER_TYPES_H_
 #include <comphelper/types.hxx>
-#endif
 #include <shell/kde_headers.h>
 #include <connectivity/dbexception.hxx>
 

connectivity/source/drivers/macab/MacabStatement.hxx

@@ -32,9 +32,7 @@
 #include "MacabHeader.hxx"
 #include <list>
 #include "connectivity/sqliterator.hxx"
-#ifndef _CONNECTIVITY_PARSE_SQLPARSE_HXX_
 #include "connectivity/sqlparse.hxx"
-#endif
 #include <com/sun/star/sdbc/XStatement.hpp>
 #include <com/sun/star/util/XCancellable.hpp>
 #include <cppuhelper/compbase4.hxx>

connectivity/source/drivers/macab/macabcondition.hxx

@@ -31,9 +31,7 @@
 #include "MacabHeader.hxx"
 #include "MacabRecord.hxx"
 
-#ifndef _COMPHELPER_TYPES_H_
 #include <comphelper/types.hxx>
-#endif
 #include <connectivity/dbexception.hxx>
 
 namespace connectivity

connectivity/source/drivers/mozab/MPreparedStatement.hxx

@@ -27,9 +27,7 @@
 #ifndef CONNECTIVITY_SPREPAREDSTATEMENT_HXX
 #define CONNECTIVITY_SPREPAREDSTATEMENT_HXX
 
-#ifndef CONNECTIVITY_SRESULTSET_HXX
 #include "MResultSet.hxx"
-#endif
 #include "MStatement.hxx"
 #include <com/sun/star/sdbc/XPreparedStatement.hpp>
 #include <com/sun/star/sdbc/XParameters.hpp>

connectivity/source/drivers/mozab/MStatement.hxx

@@ -43,9 +43,7 @@
 #include <com/sun/star/lang/XServiceInfo.hpp>
 #include <comphelper/broadcasthelper.hxx>
 #include "connectivity/sqliterator.hxx"
-#ifndef _CONNECTIVITY_PARSE_SQLPARSE_HXX_
 #include "connectivity/sqlparse.hxx"
-#endif
 #include <connectivity/FValue.hxx>
 #include "TSortIndex.hxx"
 #include "MConnection.hxx"

connectivity/source/drivers/mozab/MTable.hxx

@@ -30,9 +30,7 @@
 
 #include "connectivity/TTableHelper.hxx"
 #include <com/sun/star/sdbc/XDatabaseMetaData.hpp>
-#ifndef _CONNECTIVITY_MOZAB_BCONNECTION_HXX_
 #include "MConnection.hxx"
-#endif
 
 namespace connectivity
 {

connectivity/source/drivers/mozab/bootstrap/MNSFolders.hxx

@@ -31,9 +31,7 @@
 #include <sal/types.h>
 #include <osl/diagnose.h>
 #include <osl/conditn.hxx>
-#ifndef _COM_SUN_STAR_MOZILLA_MOZILLPRODUCTTYPE_HPP_
 #include <com/sun/star/mozilla/MozillaProductType.hpp>
-#endif
 
 #include <rtl/ustring.hxx>
 

connectivity/source/drivers/mozab/bootstrap/MNSProfileDiscover.hxx

@@ -35,9 +35,7 @@
 #include <sal/types.h>
 #include <osl/diagnose.h>
 #include <osl/conditn.hxx>
-#ifndef _COM_SUN_STAR_MOZILLA_MOZILLPRODUCTTYPE_HPP_
 #include <com/sun/star/mozilla/MozillaProductType.hpp>
-#endif
 #include <com/sun/star/uno/RuntimeException.hpp>
 #include <com/sun/star/uno/Sequence.hxx>
 #include <rtl/ustring.hxx>

connectivity/source/drivers/mozab/bootstrap/MNSProfileManager.hxx

@@ -33,9 +33,7 @@
 #include <sal/types.h>
 #include <osl/diagnose.h>
 #include <osl/conditn.hxx>
-#ifndef _COM_SUN_STAR_MOZILLA_MOZILLPRODUCTTYPE_HPP_
 #include <com/sun/star/mozilla/MozillaProductType.hpp>
-#endif
 #include <com/sun/star/uno/RuntimeException.hpp>
 #include <com/sun/star/uno/Sequence.hxx>
 

connectivity/source/drivers/mozab/bootstrap/MNSRunnable.hxx

@@ -32,9 +32,7 @@
 
 #include <MNSInclude.hxx>
 #include <com/sun/star/uno/Reference.hxx>
-#ifndef _COM_SUN_STAR_MOZILLA_XCODEPROXY_HDL_
 #include <com/sun/star/mozilla/XCodeProxy.hpp>
-#endif
 
 
 using namespace com::sun::star::uno;

connectivity/source/drivers/mozab/mozillasrc/MDatabaseMetaDataHelper.hxx

@@ -33,13 +33,9 @@
 #include <comphelper/propertycontainer.hxx>
 #include "FDatabaseMetaDataResultSet.hxx"
 
-#ifndef _CONNECTIVITY_MAB_CONNECTION_HXX_
 #include <MConnection.hxx>
-#endif
 #include <com/sun/star/uno/Sequence.hxx>
-#ifndef _COM_SUN_STAR_MOZILLA_MOZILLPRODUCTTYPE_HPP_
 #include <com/sun/star/mozilla/MozillaProductType.hpp>
-#endif
 
 namespace connectivity
 {

connectivity/source/drivers/mozab/mozillasrc/MNSMozabProxy.hxx

@@ -31,15 +31,9 @@
 #include <osl/thread.hxx>
 
 #include <MNSInclude.hxx>
-#ifndef _CPPUHELPER_COMPBASE2_HXX_
 #include <cppuhelper/compbase1.hxx>
-#endif
-#ifndef _COM_SUN_STAR_MOZILLA_XCODEPROXY_HDL_
 #include <com/sun/star/mozilla/XCodeProxy.hpp>
-#endif
-#ifndef _COM_SUN_STAR_MOZILLA_XPROXYRUNNER_HDL_
 #include "com/sun/star/mozilla/XProxyRunner.hdl"
-#endif
 
 namespace connectivity
 {

connectivity/source/drivers/mozab/mozillasrc/MQuery.hxx

@@ -34,9 +34,7 @@
 #include <connectivity/FValue.hxx>
 #include "MNSDeclares.hxx"
 #include <osl/thread.hxx>
-#ifndef _COM_SUN_STAR_MOZILLA_MOZILLPRODUCTTYPE_HPP_
 #include <com/sun/star/mozilla/MozillaProductType.hpp>
-#endif
 
 namespace connectivity
 {

connectivity/source/inc/RowFunctionParser.hxx

@@ -29,9 +29,7 @@
 #define CONNECTIVITY_ROWFUNCTIONPARSER_HXX_INCLUDED
 
 #include <sal/config.h>
-#ifndef BOOST_SHARED_PTR_HPP_INCLUDED
 #include <boost/shared_ptr.hpp>
-#endif
 #include "FDatabaseMetaDataResultSet.hxx"
 #include <vector>
 #include "connectivity/dbtoolsdllapi.hxx"

connectivity/source/inc/adabas/BStatement.hxx

@@ -29,9 +29,7 @@
 
 #include "odbc/OStatement.hxx"
 #include "adabas/BConnection.hxx"
-#ifndef _CONNECTIVITY_COMMONTOOLS_HXX_
 #include "connectivity/commontools.hxx"
-#endif
 #include <vos/ref.hxx>
 
 namespace connectivity

connectivity/source/inc/dbase/DDatabaseMetaDataResultSet.hxx

@@ -39,9 +39,7 @@
 #include <com/sun/star/sdbc/XRowUpdate.hpp>
 #include <cppuhelper/compbase7.hxx>
 #include <comphelper/proparrhlp.hxx>
-#ifndef _CONNECTIVITY_FILE_ASTATEMENT_HXX_
 #include "file/FStatement.hxx"
-#endif
 #include "connectivity/CommonTools.hxx"
 #include <comphelper/propertycontainer.hxx>
 

connectivity/source/inc/file/FResultSet.hxx

@@ -28,31 +28,15 @@
 #ifndef _CONNECTIVITY_FILE_FRESULTSET_HXX_
 #define _CONNECTIVITY_FILE_FRESULTSET_HXX_
 
-#ifndef _COM_SUN_STAR_SQLC_XRESULTSET_HPP_
 #include <com/sun/star/sdbc/XResultSet.hpp>
-#endif
-#ifndef _COM_SUN_STAR_SQLC_XROW_HPP_
 #include <com/sun/star/sdbc/XRow.hpp>
-#endif
-#ifndef _COM_SUN_STAR_SQLC_XRESULTSETMETADATASUPPLIER_HPP_
 #include <com/sun/star/sdbc/XResultSetMetaDataSupplier.hpp>
-#endif
-#ifndef _COM_SUN_STAR_SQLC_XCLOSEABLE_HPP_
 #include <com/sun/star/sdbc/XCloseable.hpp>
-#endif
-#ifndef _COM_SUN_STAR_SQLC_XCOLUMNLOCATE_HPP_
 #include <com/sun/star/sdbc/XColumnLocate.hpp>
-#endif
 #include <com/sun/star/util/XCancellable.hpp>
-#ifndef _COM_SUN_STAR_SQLC_XWARNINGSSUPPLIER_HPP_
 #include <com/sun/star/sdbc/XWarningsSupplier.hpp>
-#endif
-#ifndef _COM_SUN_STAR_SQLC_XRESULTSETUPDATE_HPP_
 #include <com/sun/star/sdbc/XResultSetUpdate.hpp>
-#endif
-#ifndef _COM_SUN_STAR_SQLC_XROWUPDATE_HPP_
 #include <com/sun/star/sdbc/XRowUpdate.hpp>
-#endif
 #include <cppuhelper/compbase12.hxx>
 #include <comphelper/proparrhlp.hxx>
 #include "file/FStatement.hxx"

connectivity/source/inc/file/FTable.hxx

@@ -31,9 +31,7 @@
 #include "connectivity/sdbcx/VTable.hxx"
 #include <com/sun/star/sdbc/XDatabaseMetaData.hpp>
 #include <com/sun/star/lang/XUnoTunnel.hpp>
-#ifndef _CONNECTIVITY_FILE_BCONNECTION_HXX_
 #include "file/FConnection.hxx"
-#endif
 #include "file/filedllapi.hxx"
 #include <tools/stream.hxx>
 #include "connectivity/FValue.hxx"

connectivity/source/inc/hsqldb/HStorageMap.hxx

@@ -33,9 +33,7 @@
 #include <com/sun/star/io/XOutputStream.hpp>
 #include <com/sun/star/io/XInputStream.hpp>
 #include <com/sun/star/io/XSeekable.hpp>
-#ifndef BOOST_SHARED_PTR_HPP_INCLUDED
 #include <boost/shared_ptr.hpp>
-#endif
 #include <comphelper/stl_types.hxx>
 #include <jni.h>
 //........................................................................

connectivity/source/inc/java/tools.hxx

@@ -31,9 +31,7 @@
 #include <com/sun/star/beans/PropertyValue.hpp>
 #include <com/sun/star/uno/Sequence.h>
 
-#ifndef JNI_H
 #include <jni.h>
-#endif
 #include "java/sql/SQLException.hxx"
 #include <comphelper/uno3.hxx>
 

desktop/inc/app.hxx

@@ -32,9 +32,7 @@
 #include <map>
 #include <com/sun/star/lang/XMultiServiceFactory.hpp>
 #include <vcl/svapp.hxx>
-#ifndef _VCL_TIMER_HXX_
 #include <vcl/timer.hxx>
-#endif
 #include <tools/resmgr.hxx>
 #include <unotools/bootstrap.hxx>
 #include <com/sun/star/lang/XInitialization.hpp>

desktop/source/app/cmdlinehelp.hxx

@@ -1,8 +1,6 @@
 #include <vcl/dialog.hxx>
 #include <vcl/fixed.hxx>
-#ifndef _SV_BUTTON_HXX
 #include <vcl/button.hxx>
-#endif
 
 namespace desktop
 {

desktop/source/app/officeipcthread.hxx

@@ -35,9 +35,7 @@
 #include <vos/thread.hxx>
 #include <vos/signal.hxx>
 #include <rtl/ustring.hxx>
-#ifndef _CPPUHELPER_WEAKBASE2_HXX_
 #include <cppuhelper/implbase2.hxx>
-#endif
 #include <osl/conditn.hxx>
 #include "boost/optional.hpp"
 

desktop/source/deployment/gui/dp_gui_dependencydialog.hxx

@@ -32,9 +32,7 @@
 
 #include <vector>
 #include "tools/gen.hxx"
-#ifndef _SV_BUTTON_HXX
 #include "vcl/button.hxx"
-#endif
 #include "vcl/dialog.hxx"
 #include "vcl/fixed.hxx"
 #include "vcl/lstbox.hxx"

desktop/source/deployment/gui/dp_gui_updatedialog.hxx

@@ -40,9 +40,7 @@
 #include "svx/checklbx.hxx"
 #include "tools/link.hxx"
 #include "tools/solar.h"
-#ifndef _SV_BUTTON_HXX
 #include "vcl/button.hxx"
-#endif
 #include "vcl/dialog.hxx"
 #include "vcl/fixed.hxx"
 #include <svtools/fixedhyper.hxx>

desktop/source/deployment/gui/dp_gui_updateinstalldialog.hxx

@@ -29,9 +29,7 @@
 #define INCLUDED_DESKTOP_SOURCE_DEPLOYMENT_GUI_DP_GUI_INSTALLDIALOG_HXX
 
 #include "sal/config.h"
-#ifndef _SV_BUTTON_HXX
 #include "vcl/button.hxx"
-#endif
 #include "vcl/fixed.hxx"
 #include "vcl/dialog.hxx"
 #include "svtools/prgsbar.hxx"

desktop/source/deployment/inc/dp_platform.hxx

@@ -29,9 +29,7 @@
 #define INCLUDED_DP_PLATFORM_HXX
 
 
-#ifndef INCLUDED_DESKTOP_SOURCE_DEPLOYMENT_INC_DP_MISC_API_HXX
 #include "dp_misc_api.hxx"
-#endif
 
 #include "com/sun/star/uno/Sequence.hxx"
 #include "rtl/ustring.hxx"

editeng/inc/editeng/AccessibleImageBullet.hxx

@@ -32,9 +32,7 @@
 #include <cppuhelper/weakref.hxx>
 #include <cppuhelper/implbase5.hxx>
 
-#ifndef _CPPUHELPER_INTERFACECONTAINER_H_
 #include <cppuhelper/interfacecontainer.hxx>
-#endif
 #include <com/sun/star/uno/Reference.hxx>
 #include <com/sun/star/lang/XServiceInfo.hpp>
 #include <com/sun/star/accessibility/XAccessible.hpp>

editeng/inc/editeng/editeng.hxx

@@ -87,9 +87,7 @@ typedef std::vector<SpellPortion> SpellPortions;
 
 namespace basegfx { class B2DPolyPolygon; }
 #include <rsc/rscsfx.hxx>
-#ifndef _EDITDATA_HXX
 #include <editeng/editdata.hxx>
-#endif
 #include <i18npool/lang.h>
 #include "editeng/editengdllapi.h"
 

editeng/inc/editeng/editview.hxx

@@ -58,9 +58,7 @@ class SfxStyleSheet;
 class Font;
 class FontList;
 
-#ifndef _EDITDATA_HXX
 #include <editeng/editdata.hxx>
-#endif
 #include <com/sun/star/uno/Reference.h>
 #include "editeng/editengdllapi.h"
 

editeng/inc/editeng/forbiddencharacterstable.hxx

@@ -28,9 +28,7 @@
 #ifndef _FORBIDDENCHARACTERSTABLE_HXX
 #define _FORBIDDENCHARACTERSTABLE_HXX
 
-#ifndef _TABLE_HXX //autogen
 #include <tools/table.hxx>
-#endif
 
 #include <vos/refernce.hxx>
 #include <com/sun/star/uno/Reference.hxx>

editeng/inc/editeng/measfld.hxx

@@ -32,9 +32,7 @@
 
 #ifndef _FLDITEM_HXX
 #ifndef ITEMID_FIELD
-#ifndef _EDITDATA_HXX
 #include <editeng/editdata.hxx>  /* das include wird wg. EE_FEATURE_FIELD benoetigt */
-#endif
 #define ITEMID_FIELD EE_FEATURE_FIELD  /* wird fuer #include <editeng/flditem.hxx> benoetigt */
 #endif
 #include <editeng/flditem.hxx>

editeng/inc/editeng/unoedsrc.hxx

@@ -36,9 +36,7 @@
 #include <tools/gen.hxx>
 #include <vcl/mapmod.hxx>
 #include <tools/string.hxx>
-#ifndef _SV_COLOR_HXX //autogen
 #include <tools/color.hxx>
-#endif
 #include <svl/poolitem.hxx>
 #include <svl/itempool.hxx>
 #include "editeng/editengdllapi.h"

editeng/source/editeng/editdoc.hxx

@@ -28,9 +28,7 @@
 #ifndef _EDITDOC_HXX
 #define _EDITDOC_HXX
 
-#ifndef _COM_SUN_STAR_I18N_XEXTENDEDINPUTSEQUENCECHECKER_HDL_
 #include <com/sun/star/i18n/XExtendedInputSequenceChecker.hpp>
-#endif
 
 #include <editattr.hxx>
 #include <edtspell.hxx>

editeng/source/misc/SvXMLAutoCorrectImport.hxx

@@ -27,9 +27,7 @@
 #ifndef _SV_XMLAUTOCORRECTIMPORT_HXX
 #define _SV_XMLAUTOCORRECTIMPORT_HXX
 
-#ifndef _SVSTOR_HXX
 #include <sot/storage.hxx>
-#endif
 #include <xmloff/xmlictxt.hxx>
 #include <xmloff/xmlimp.hxx>
 #include <xmloff/nmspmap.hxx>

editeng/source/outliner/outleeng.hxx

@@ -28,9 +28,7 @@
 #define _OUTLEENG_HXX
 
 #include <editeng/outliner.hxx>
-#ifndef _EDITENG_HXX
 #include <editeng/editeng.hxx>
-#endif
 
 typedef EENotify* EENotifyPtr;
 SV_DECL_PTRARR_DEL( NotifyList, EENotifyPtr, 1, 1 )