more removed include guards using fixguard.py

26 files changed, 0 insertions, 88 deletions

diff --git a/bridges/inc/bridges/cpp_uno/bridge.hxx b/bridges/inc/bridges/cpp_uno/bridge.hxx
index 9175adfb7858..cb332673b150 100644
--- a/bridges/inc/bridges/cpp_uno/bridge.hxx
+++ b/bridges/inc/bridges/cpp_uno/bridge.hxx
@@ -27,9 +27,7 @@
 #ifndef _BRIDGES_CPP_UNO_BRIDGE_HXX_
 #define _BRIDGES_CPP_UNO_BRIDGE_HXX_
 
-#ifndef _BRIDGES_CPP_UNO_BRIDGE_H_
 #include <bridges/cpp_uno/bridge.h>
-#endif
 #include <osl/mutex.hxx>
 #include <rtl/process.h>
 #include <rtl/ustrbuf.hxx>
diff --git a/bridges/source/remote/urp/urp_bridgeimpl.hxx b/bridges/source/remote/urp/urp_bridgeimpl.hxx
index 53d583bed48d..fc5374bfc069 100644
--- a/bridges/source/remote/urp/urp_bridgeimpl.hxx
+++ b/bridges/source/remote/urp/urp_bridgeimpl.hxx
@@ -33,19 +33,13 @@
 #include <rtl/ustring.hxx>
 #include <rtl/byteseq.hxx>
 
-#ifndef _UNO_THREADPOOL_H_
 #include <uno/threadpool.h>
-#endif
 #include <bridges/remote/bridgeimpl.hxx>
 
-#ifndef _URP_CACHE_HXX_
 #include "urp_cache.hxx"
-#endif
 #include "urp_marshal_decl.hxx"
 
-#ifndef _URP_REPLYCONTAINER_HXX_
 #include "urp_replycontainer.hxx"
-#endif
 #include "urp_property.hxx"
 
 
diff --git a/bridges/source/remote/urp/urp_property.hxx b/bridges/source/remote/urp/urp_property.hxx
index 59dbe3f22f93..b97e14190ea5 100644
--- a/bridges/source/remote/urp/urp_property.hxx
+++ b/bridges/source/remote/urp/urp_property.hxx
@@ -26,9 +26,7 @@
  ************************************************************************/
 #ifndef _URP_PROPERTY_HXX_
 #define _URP_PROPERTY_HXX_
-#ifndef _BRIDGES_REMOTE_REMOTE_H_
 #include <bridges/remote/remote.h>
-#endif
 #include <rtl/ustring.hxx>
 #include <rtl/byteseq.hxx>
 
diff --git a/bridges/source/remote/urp/urp_propertyobject.hxx b/bridges/source/remote/urp/urp_propertyobject.hxx
index 3b6bd1824e27..2812587748b1 100644
--- a/bridges/source/remote/urp/urp_propertyobject.hxx
+++ b/bridges/source/remote/urp/urp_propertyobject.hxx
@@ -28,15 +28,11 @@
 #include <osl/interlck.h>
 #include <osl/mutex.hxx>
 
-#ifndef _OSL_CONDITN_H_
 #include <osl/conditn.h>
-#endif
 #include <rtl/string.hxx>
 #include <uno/sequence2.h>
 
-#ifndef _BRIDGES_REMOTE_REMOTE_H_
 #include <bridges/remote/remote.h>
-#endif
 #include "urp_property.hxx"
 
 namespace bridges_urp {
diff --git a/bridges/source/remote/urp/urp_unmarshal.hxx b/bridges/source/remote/urp/urp_unmarshal.hxx
index 60da3f2d8b95..2d25bbe783f3 100644
--- a/bridges/source/remote/urp/urp_unmarshal.hxx
+++ b/bridges/source/remote/urp/urp_unmarshal.hxx
@@ -33,9 +33,7 @@
 #include <rtl/ustrbuf.hxx>
 #include <bridges/remote/context.h>
 
-#ifndef _BRIDGES_REMOTE_HELPER_HXX_
 #include <bridges/remote/helper.hxx>
-#endif
 #include <com/sun/star/uno/Type.hxx>
 #include "urp_bridgeimpl.hxx"
 
diff --git a/cppu/inc/com/sun/star/uno/Reference.hxx b/cppu/inc/com/sun/star/uno/Reference.hxx
index 4223cc277c37..1222e5569bd6 100644
--- a/cppu/inc/com/sun/star/uno/Reference.hxx
+++ b/cppu/inc/com/sun/star/uno/Reference.hxx
@@ -29,9 +29,7 @@
 
 #include <com/sun/star/uno/Reference.h>
 #include <com/sun/star/uno/RuntimeException.hpp>
-#ifndef _COM_SUN_STAR_UNO_XINTERFACE_HDL_
 #include <com/sun/star/uno/XInterface.hdl>
-#endif
 #include <com/sun/star/uno/genfunc.hxx>
 
 namespace com
diff --git a/cppu/inc/typelib/typedescription.hxx b/cppu/inc/typelib/typedescription.hxx
index 61a6531d3529..fdadac8aeeae 100644
--- a/cppu/inc/typelib/typedescription.hxx
+++ b/cppu/inc/typelib/typedescription.hxx
@@ -30,9 +30,7 @@
 #include <rtl/alloc.h>
 #include <rtl/ustring.hxx>
 #include <com/sun/star/uno/Type.h>
-#ifndef _TYPELIB_TYPEDESCRIPTION_H
 #include <typelib/typedescription.h>
-#endif
 
 
 namespace com
diff --git a/cppu/source/uno/prim.hxx b/cppu/source/uno/prim.hxx
index 4acafd125d55..c157a8bf9fb0 100644
--- a/cppu/source/uno/prim.hxx
+++ b/cppu/source/uno/prim.hxx
@@ -28,22 +28,16 @@
 #define PRIM_HXX
 
 #include "typelib/typedescription.h"
-#ifndef _typelib_TypeClass_H_
 #include "typelib/typeclass.h"
-#endif
 #include "uno/sequence2.h"
 #include "uno/any2.h"
 #include "uno/data.h"
 #include "uno/mapping.h"
 #include "uno/dispatcher.h"
 
-#ifndef _OSL_INTERLCK_H
 #include "osl/interlck.h"
-#endif
 #include "osl/diagnose.h"
-#ifndef _RTL_USTRING_HXX
 #include "rtl/ustring.hxx"
-#endif
 #include "rtl/alloc.h"
 
 #if OSL_DEBUG_LEVEL > 1
diff --git a/cppuhelper/inc/cppuhelper/access_control.hxx b/cppuhelper/inc/cppuhelper/access_control.hxx
index 92de0499e964..92de0499e964 100755..100644
--- a/cppuhelper/inc/cppuhelper/access_control.hxx
+++ b/cppuhelper/inc/cppuhelper/access_control.hxx
diff --git a/cppuhelper/inc/cppuhelper/component.hxx b/cppuhelper/inc/cppuhelper/component.hxx
index 244e111510c5..4518361cfcff 100644
--- a/cppuhelper/inc/cppuhelper/component.hxx
+++ b/cppuhelper/inc/cppuhelper/component.hxx
@@ -31,9 +31,7 @@
 #include <cppuhelper/weakagg.hxx>
 #include <cppuhelper/interfacecontainer.hxx>
 
-#ifndef _CPPUHELPER_IMPLBASE1_HXX
 #include <cppuhelper/implbase1.hxx>
-#endif
 
 #include <com/sun/star/lang/XComponent.hpp>
 #include <com/sun/star/lang/XEventListener.hpp>
diff --git a/cppuhelper/inc/cppuhelper/factory.hxx b/cppuhelper/inc/cppuhelper/factory.hxx
index 1b733d7a9170..511025c9d053 100644
--- a/cppuhelper/inc/cppuhelper/factory.hxx
+++ b/cppuhelper/inc/cppuhelper/factory.hxx
@@ -27,9 +27,7 @@
 #ifndef _CPPUHELPER_FACTORY_HXX_
 #define _CPPUHELPER_FACTORY_HXX_
 
-#ifndef _RTL_STRING_HXX_
 #include <rtl/ustring.hxx>
-#endif
 #include <uno/dispatcher.h>
 #include <rtl/unload.h>
 
diff --git a/cppuhelper/inc/cppuhelper/weak.hxx b/cppuhelper/inc/cppuhelper/weak.hxx
index 701b8f102f91..954bf1ce8709 100644
--- a/cppuhelper/inc/cppuhelper/weak.hxx
+++ b/cppuhelper/inc/cppuhelper/weak.hxx
@@ -31,9 +31,7 @@
 #include <rtl/alloc.h>
 #include <cppuhelper/weakref.hxx>
 #include <cppuhelper/queryinterface.hxx>
-#ifndef _COM_SUN_STAR_UNO_WEAK_HPP_
 #include <com/sun/star/uno/XWeak.hpp>
-#endif
 
 
 namespace cppu
diff --git a/idlc/inc/idlc/options.hxx b/idlc/inc/idlc/options.hxx
index 7eba788a4ea9..66a3676a52b3 100644
--- a/idlc/inc/idlc/options.hxx
+++ b/idlc/inc/idlc/options.hxx
@@ -28,9 +28,7 @@
 #ifndef _IDLC_OPTIONS_HXX_
 #define _IDLC_OPTIONS_HXX_
 
-#ifndef _IDLC_IDLCTYPEs_HXX_
 #include <idlc/idlctypes.hxx>
-#endif
 
 typedef ::std::hash_map< ::rtl::OString,
                          ::rtl::OString,
diff --git a/rdbmaker/inc/codemaker/dependency.hxx b/rdbmaker/inc/codemaker/dependency.hxx
index 138aad46999b..79ee0cebf7a1 100644
--- a/rdbmaker/inc/codemaker/dependency.hxx
+++ b/rdbmaker/inc/codemaker/dependency.hxx
@@ -30,9 +30,7 @@
 
 #include    <hash_map>
 #include    <registry/registry.hxx>
-#ifndef __REGISTRY_REFLREAD_HXX__
 #include    <registry/reflread.hxx>
-#endif
 #include    <codemaker/typemanager.hxx>
 #include    <codemaker/global.hxx>
 #include <osl/diagnose.h>
diff --git a/sal/inc/rtl/string.hxx b/sal/inc/rtl/string.hxx
index c85da92c177b..615dbef1b4a5 100644
--- a/sal/inc/rtl/string.hxx
+++ b/sal/inc/rtl/string.hxx
@@ -30,9 +30,7 @@
 
 #ifdef __cplusplus
 
-#ifndef _RTL_DIAGNOSE_H_
 #include <osl/diagnose.h>
-#endif
 #include <rtl/memory.h>
 #include <rtl/textenc.h>
 #include <rtl/string.h>
diff --git a/sal/inc/rtl/ustrbuf.hxx b/sal/inc/rtl/ustrbuf.hxx
index 3f8421b1f3c7..a50e173379f7 100644
--- a/sal/inc/rtl/ustrbuf.hxx
+++ b/sal/inc/rtl/ustrbuf.hxx
@@ -30,9 +30,7 @@
 
 #include <osl/diagnose.h>
 #include <rtl/ustrbuf.h>
-#ifndef _RTL_USTRING_HXX
 #include <rtl/ustring.hxx>
-#endif
 
 #ifdef __cplusplus
 
diff --git a/sal/inc/rtl/ustring.hxx b/sal/inc/rtl/ustring.hxx
index 9a2ef8b9edc9..e0df78cbbf34 100644
--- a/sal/inc/rtl/ustring.hxx
+++ b/sal/inc/rtl/ustring.hxx
@@ -30,9 +30,7 @@
 
 #ifdef __cplusplus
 
-#ifndef _RTL_DIAGNOSE_H_
 #include "osl/diagnose.h"
-#endif
 #include <rtl/ustring.h>
 #include <rtl/string.hxx>
 #include <rtl/memory.h>
diff --git a/sal/osl/os2/file_path_helper.hxx b/sal/osl/os2/file_path_helper.hxx
index 5310f462efc0..b694a466dfa6 100644
--- a/sal/osl/os2/file_path_helper.hxx
+++ b/sal/osl/os2/file_path_helper.hxx
@@ -29,9 +29,7 @@
 #define _OSL_FILE_PATH_HELPER_HXX_
 
 
-#ifndef _OSL_FILE_PATH_HELPER_H_
 #include "file_path_helper.h"
-#endif
 
 #include <rtl/ustring.hxx>
 
diff --git a/sal/osl/unx/file_path_helper.hxx b/sal/osl/unx/file_path_helper.hxx
index 4b429b111799..80c99d2c85fb 100644
--- a/sal/osl/unx/file_path_helper.hxx
+++ b/sal/osl/unx/file_path_helper.hxx
@@ -29,9 +29,7 @@
 #define _OSL_FILE_PATH_HELPER_HXX_
 
 
-#ifndef _OSL_FILE_PATH_HELPER_H_
 #include "file_path_helper.h"
-#endif
 
 #include <rtl/ustring.hxx>
 
diff --git a/sal/qa/osl/socket/sockethelper.hxx b/sal/qa/osl/socket/sockethelper.hxx
index 414447cca003..e664f13c4880 100644
--- a/sal/qa/osl/socket/sockethelper.hxx
+++ b/sal/qa/osl/socket/sockethelper.hxx
@@ -37,22 +37,14 @@
 #include <rtl/ustring.hxx>
 #include <rtl/ustring.h>
 
-#ifndef _OSL_SOCLET_HXX_
 #include <osl/socket.hxx>
-#endif
 #include <osl/socket.h>
 
-#ifndef _OSL_THREAD_HXX
 #include <osl/thread.hxx>
-#endif
 
-#ifndef _OSL_FILE_HXX
 #include <osl/file.hxx>
-#endif
 
-#ifndef _OSL_MUTEX_HXX
 #include <osl/mutex.hxx>
-#endif
 #include <osl/time.h>
 
 #ifdef __cplusplus
diff --git a/salhelper/inc/salhelper/queue.hxx b/salhelper/inc/salhelper/queue.hxx
index 445cc5f32da1..5dabe7a5ffcb 100644
--- a/salhelper/inc/salhelper/queue.hxx
+++ b/salhelper/inc/salhelper/queue.hxx
@@ -31,9 +31,7 @@
 #include <sal/types.h>
 #include <osl/diagnose.h>
 #include <osl/mutex.hxx>
-#ifndef _OSL_SEMAPHOR_HXX_
 #include <osl/semaphor.hxx>
-#endif
 
 #ifndef __LIST__
 #include <list>
diff --git a/salhelper/inc/salhelper/simplereferenceobject.hxx b/salhelper/inc/salhelper/simplereferenceobject.hxx
index 4d2c60b733aa..4d2c60b733aa 100755..100644
--- a/salhelper/inc/salhelper/simplereferenceobject.hxx
+++ b/salhelper/inc/salhelper/simplereferenceobject.hxx
diff --git a/stoc/source/registry_tdprovider/base.hxx b/stoc/source/registry_tdprovider/base.hxx
index 0e2deed76919..9a5e39978160 100644
--- a/stoc/source/registry_tdprovider/base.hxx
+++ b/stoc/source/registry_tdprovider/base.hxx
@@ -33,9 +33,7 @@
 #include <cppuhelper/weak.hxx>
 #include <cppuhelper/implbase1.hxx>
 #include <cppuhelper/implbase2.hxx>
-#ifndef _CPPUHELPER_IMPLEMENTATIONENTRY_HXX_
 #include <cppuhelper/implementationentry.hxx>
-#endif
 
 #include "registry/refltype.hxx"
 
diff --git a/store/source/lockbyte.hxx b/store/source/lockbyte.hxx
index ef34b8708f26..8d2c4a490786 100644
--- a/store/source/lockbyte.hxx
+++ b/store/source/lockbyte.hxx
@@ -28,23 +28,13 @@
 #ifndef _STORE_LOCKBYTE_HXX_
 #define _STORE_LOCKBYTE_HXX_ "$Revision: 1.1.2.1 $"
 
-#ifndef _SAL_TYPES_H_
 #include "sal/types.h"
-#endif
 
-#ifndef _RTL_REF_HXX_
 #include "rtl/ref.hxx"
-#endif
-#ifndef _RTL_USTRING_H_
 #include "rtl/ustring.h"
-#endif
 
-#ifndef _STORE_TYPES_H_
 #include "store/types.h"
-#endif
-#ifndef _STORE_STORBASE_HXX_
 #include "storbase.hxx"
-#endif
 
 namespace store
 {
diff --git a/store/source/object.hxx b/store/source/object.hxx
index 1061b9c568a9..17fdc7f4c0e1 100644
--- a/store/source/object.hxx
+++ b/store/source/object.hxx
@@ -28,17 +28,11 @@
 #ifndef _STORE_OBJECT_HXX_
 #define _STORE_OBJECT_HXX_ "$Revision: 1.1.2.1 $"
 
-#ifndef _SAL_TYPES_H_
 #include "sal/types.h"
-#endif
 
-#ifndef _RTL_REF_HXX_
 #include "rtl/ref.hxx"
-#endif
 
-#ifndef _OSL_INTERLCK_H_
 #include "osl/interlck.h"
-#endif
 
 namespace store
 {
diff --git a/store/source/stordir.hxx b/store/source/stordir.hxx
index 66dd14bd81a6..3446c4a19080 100644
--- a/store/source/stordir.hxx
+++ b/store/source/stordir.hxx
@@ -28,29 +28,15 @@
 #ifndef _STORE_STORDIR_HXX_
 #define _STORE_STORDIR_HXX_ "$Revision: 1.1.2.2 $"
 
-#ifndef _SAL_TYPES_H_
 #include <sal/types.h>
-#endif
 
-#ifndef _RTL_TEXTCVT_H_
 #include <rtl/textcvt.h>
-#endif
-#ifndef _RTL_STRING_H_
 #include <rtl/string.h>
-#endif
-#ifndef _RTL_REF_HXX_
 #include <rtl/ref.hxx>
-#endif
 
-#ifndef _STORE_OBJECT_HXX_
 #include "object.hxx"
-#endif
-#ifndef _STORE_STORBASE_HXX_
 #include "storbase.hxx"
-#endif
-#ifndef _STORE_STORPAGE_HXX_
 #include "storpage.hxx"
-#endif
 
 namespace store
 {