remove include guards using fixguard.py

46 files changed, 0 insertions, 144 deletions

diff --git a/bridges/source/cpp_uno/cc50_solaris_intel/hash.cxx b/bridges/source/cpp_uno/cc50_solaris_intel/hash.cxx
index 5899d1b1d..187492121 100644
--- a/bridges/source/cpp_uno/cc50_solaris_intel/hash.cxx
+++ b/bridges/source/cpp_uno/cc50_solaris_intel/hash.cxx
@@ -30,9 +30,7 @@
 
 
 #ifndef TEST
-#ifndef _SAL_TYPES_H_
 #include <sal/types.h>
-#endif
 #else
 typedef unsigned int sal_uInt32;
 #endif
diff --git a/bridges/source/cpp_uno/cc50_solaris_sparc/hash.cxx b/bridges/source/cpp_uno/cc50_solaris_sparc/hash.cxx
index 7e4afce9f..4ef3f6550 100644
--- a/bridges/source/cpp_uno/cc50_solaris_sparc/hash.cxx
+++ b/bridges/source/cpp_uno/cc50_solaris_sparc/hash.cxx
@@ -31,9 +31,7 @@
 
 
 #ifndef TEST
-#ifndef _SAL_TYPES_H_
 #include <sal/types.h>
-#endif
 #else
 typedef unsigned int sal_uInt32;
 #endif
diff --git a/cppu/source/LogBridge/LogBridge.cxx b/cppu/source/LogBridge/LogBridge.cxx
index 54deb2d4f..54deb2d4f 100755..100644
--- a/cppu/source/LogBridge/LogBridge.cxx
+++ b/cppu/source/LogBridge/LogBridge.cxx
diff --git a/cppuhelper/source/factory.cxx b/cppuhelper/source/factory.cxx
index df3069db7..6d1942efa 100644
--- a/cppuhelper/source/factory.cxx
+++ b/cppuhelper/source/factory.cxx
@@ -32,9 +32,7 @@
 #include <cppuhelper/weak.hxx>
 #include <cppuhelper/component.hxx>
 #include <cppuhelper/factory.hxx>
-#ifndef _CPPUHELPER_IMPLBASE3_HXX
 #include <cppuhelper/implbase3.hxx>
-#endif
 #include <cppuhelper/typeprovider.hxx>
 #include <rtl/unload.h>
 
diff --git a/cppuhelper/source/weak.cxx b/cppuhelper/source/weak.cxx
index 1b20ac6b8..1c24f48f7 100644
--- a/cppuhelper/source/weak.cxx
+++ b/cppuhelper/source/weak.cxx
@@ -28,12 +28,8 @@
 // MARKER(update_precomp.py): autogen include statement, do not remove
 #include "precompiled_cppuhelper.hxx"
 #include <osl/mutex.hxx>
-#ifndef _CPPU_WEAKAGG_HXX_
 #include <cppuhelper/weakagg.hxx>
-#endif
-#ifndef _CPPU_HELPER_INTERFACECONTAINER_HXX_
 #include <cppuhelper/interfacecontainer.hxx>
-#endif
 #include "cppuhelper/exc_hlp.hxx"
 
 using namespace osl;
diff --git a/cpputools/source/regcomplazy/regcomplazy.cxx b/cpputools/source/regcomplazy/regcomplazy.cxx
index 00907602f..00907602f 100755..100644
--- a/cpputools/source/regcomplazy/regcomplazy.cxx
+++ b/cpputools/source/regcomplazy/regcomplazy.cxx
diff --git a/idlc/source/astdump.cxx b/idlc/source/astdump.cxx
index 7e4e7ab75..153091c6f 100644
--- a/idlc/source/astdump.cxx
+++ b/idlc/source/astdump.cxx
@@ -33,9 +33,7 @@
 #include <idlc/astconstant.hxx>
 #include <idlc/astattribute.hxx>
 #include <idlc/astinterfacemember.hxx>
-#ifndef _IDLC_ASTSERVICEEMEMBER_HXX_
 #include <idlc/astservicemember.hxx>
-#endif
 #include <idlc/astobserves.hxx>
 #include <idlc/astneeds.hxx>
 #include <idlc/astsequence.hxx>
diff --git a/idlc/source/astscope.cxx b/idlc/source/astscope.cxx
index 127d509f3..798923e42 100644
--- a/idlc/source/astscope.cxx
+++ b/idlc/source/astscope.cxx
@@ -29,9 +29,7 @@
 #include "precompiled_idlc.hxx"
 #include <idlc/astscope.hxx>
 #include <idlc/astbasetype.hxx>
-#ifndef _IDLC_ASTINERFACE_HXX_
 #include <idlc/astinterface.hxx>
-#endif
 #include <idlc/errorhandler.hxx>
 
 
diff --git a/idlc/source/aststruct.cxx b/idlc/source/aststruct.cxx
index e6a22fd01..2de5be699 100644
--- a/idlc/source/aststruct.cxx
+++ b/idlc/source/aststruct.cxx
@@ -28,9 +28,7 @@
 // MARKER(update_precomp.py): autogen include statement, do not remove
 #include "precompiled_idlc.hxx"
 #include <idlc/aststruct.hxx>
-#ifndef _IDLC_ASTMember_HXX_
 #include <idlc/astmember.hxx>
-#endif
 
 #include "registry/version.h"
 #include "registry/writer.hxx"
diff --git a/jvmfwk/plugins/sunmajor/javaenvsetup/javaldx.cxx b/jvmfwk/plugins/sunmajor/javaenvsetup/javaldx.cxx
index 4392ee296..4392ee296 100755..100644
--- a/jvmfwk/plugins/sunmajor/javaenvsetup/javaldx.cxx
+++ b/jvmfwk/plugins/sunmajor/javaenvsetup/javaldx.cxx
diff --git a/rdbmaker/source/codemaker/global.cxx b/rdbmaker/source/codemaker/global.cxx
index 39d5fa291..93a51d293 100644
--- a/rdbmaker/source/codemaker/global.cxx
+++ b/rdbmaker/source/codemaker/global.cxx
@@ -25,9 +25,7 @@
  *
  ************************************************************************/
 #include <osl/process.h>
-#ifndef _RTL_OSTRINGBUFFER_HXX_
 #include <rtl/strbuf.hxx>
-#endif
 #include <rtl/ustring.hxx>
 #include 	<osl/thread.h>
 #include    <osl/file.hxx>
diff --git a/rdbmaker/source/rdbmaker/rdbmaker.cxx b/rdbmaker/source/rdbmaker/rdbmaker.cxx
index 6b588e7e0..3314236f2 100644
--- a/rdbmaker/source/rdbmaker/rdbmaker.cxx
+++ b/rdbmaker/source/rdbmaker/rdbmaker.cxx
@@ -31,9 +31,7 @@
 #include <codemaker/typemanager.hxx>
 #include <codemaker/dependency.hxx>
 
-#ifndef _RTL_OSTRINGBUFFER_HXX_
 #include <rtl/strbuf.hxx>
-#endif
 
 #if defined(SAL_W32) || defined(SAL_OS2)
 #include <io.h>
diff --git a/rdbmaker/source/rdbmaker/typeblop.cxx b/rdbmaker/source/rdbmaker/typeblop.cxx
index ef774da6c..c10676a24 100644
--- a/rdbmaker/source/rdbmaker/typeblop.cxx
+++ b/rdbmaker/source/rdbmaker/typeblop.cxx
@@ -26,9 +26,7 @@
  ************************************************************************/
 
 #include <rtl/alloc.h>
-#ifndef __REGISTRY_REFLWRIT_HXX__
 #include <registry/reflwrit.hxx>
-#endif
 #include <cppuhelper/servicefactory.hxx>
 #include <com/sun/star/container/XHierarchicalNameAccess.hpp>
 #include <com/sun/star/reflection/XInterfaceTypeDescription.hpp>
diff --git a/registry/source/regimpl.cxx b/registry/source/regimpl.cxx
index db6990bb8..fa436e5ce 100644
--- a/registry/source/regimpl.cxx
+++ b/registry/source/regimpl.cxx
@@ -41,13 +41,9 @@
 #include    <unistd.h>
 #endif
 
-#ifndef __REGISTRY_REFLREAD_HXX__
 #include    <registry/reflread.hxx>
-#endif
 
-#ifndef __REGISTRY_REFLWRIT_HXX__
 #include    <registry/reflwrit.hxx>
-#endif
 
 #include "registry/reader.hxx"
 #include "registry/refltype.hxx"
diff --git a/sal/osl/all/utility.cxx b/sal/osl/all/utility.cxx
index a7e1654a4..a7e1654a4 100755..100644
--- a/sal/osl/all/utility.cxx
+++ b/sal/osl/all/utility.cxx
diff --git a/sal/osl/os2/file.cxx b/sal/osl/os2/file.cxx
index 15c544e19..0cebeb2a5 100644
--- a/sal/osl/os2/file.cxx
+++ b/sal/osl/os2/file.cxx
@@ -54,24 +54,16 @@
 #include "file_error_transl.h"
 #include <osl/time.h>
 
-#ifndef _FILE_URL_H_
 #include "file_url.h"
-#endif
 
 #include "file_path_helper.hxx"
 #include "uunxapi.hxx"
 
-#ifndef	_STRING_H_
 #include <string.h>
-#endif
 
-#ifndef	_CTYPE_H_
 #include <ctype.h>
-#endif
 
-#ifndef	_WCHAR_H_
 #include <wchar.h>
-#endif
 
 #if OSL_DEBUG_LEVEL > 1
     extern void debug_ustring(rtl_uString*);
diff --git a/sal/osl/os2/file_url.cxx b/sal/osl/os2/file_url.cxx
index 984d45cc6..2d135397e 100644
--- a/sal/osl/os2/file_url.cxx
+++ b/sal/osl/os2/file_url.cxx
@@ -28,25 +28,15 @@
 #include <ctype.h>
 #include "system.h"
 
-#ifndef _LIMITS_H
 #include <limits.h>
-#endif
 
-#ifndef _ERRNO_H
 #include <errno.h>
-#endif
 
-#ifndef _STDLIB_H_
 #include <stdlib.h>
-#endif
 
-#ifndef _STRINGS_H
 #include <strings.h>
-#endif
 
-#ifndef _UNISTD_H
 #include <unistd.h>
-#endif
 #include <osl/file.h>
 #include <osl/security.h>
 #include <rtl/uri.h>
@@ -54,22 +44,16 @@
 #include <rtl/ustring.hxx>
 #include <rtl/ustrbuf.h>
 
-#ifndef _OSL_TREAD_H_
 #include <osl/thread.h>
-#endif
 #include <osl/file.hxx>
 #include <osl/mutex.h>
 #include <osl/process.h>
 #include "file_error_transl.h"
 
-#ifndef _FILE_URL_H_
 #include "file_url.h"
-#endif
 #include "file_path_helper.hxx"
  
-#ifndef _OSL_UUNXAPI_HXX_
 #include "uunxapi.hxx"
-#endif
 
 #include <wchar.h>
 #include <wctype.h>
diff --git a/sal/osl/os2/process_impl.cxx b/sal/osl/os2/process_impl.cxx
index c98df9fae..122e34214 100644
--- a/sal/osl/os2/process_impl.cxx
+++ b/sal/osl/os2/process_impl.cxx
@@ -57,13 +57,9 @@
 #include "osl/thread.h"
 #include "rtl/ustring.hxx"
 
-#ifndef _OSL_FILE_PATH_HELPER_H_
 #include "file_path_helper.h"
-#endif
 
-#ifndef _OSL_UUNXAPI_H_
 #include "uunxapi.h"
-#endif
 
 /***************************************
   osl_bootstrap_getExecutableFile_Impl().
diff --git a/sal/osl/unx/process_impl.cxx b/sal/osl/unx/process_impl.cxx
index 3754479d8..910966617 100644
--- a/sal/osl/unx/process_impl.cxx
+++ b/sal/osl/unx/process_impl.cxx
@@ -55,13 +55,9 @@
 #include "osl/thread.h"
 #include "rtl/ustring.hxx"
 
-#ifndef _OSL_FILE_PATH_HELPER_H_
 #include "file_path_helper.h"
-#endif
 
-#ifndef _OSL_UUNXAPI_H_
 #include "uunxapi.h"
-#endif
 
 /***************************************
   osl_bootstrap_getExecutableFile_Impl().
diff --git a/sal/qa/osl/file/test_cpy_wrt_file.cxx b/sal/qa/osl/file/test_cpy_wrt_file.cxx
index c90a3576d..c90a3576d 100755..100644
--- a/sal/qa/osl/file/test_cpy_wrt_file.cxx
+++ b/sal/qa/osl/file/test_cpy_wrt_file.cxx
diff --git a/sal/qa/osl/mutex/osl_Mutex.cxx b/sal/qa/osl/mutex/osl_Mutex.cxx
index b491d7436..b491d7436 100755..100644
--- a/sal/qa/osl/mutex/osl_Mutex.cxx
+++ b/sal/qa/osl/mutex/osl_Mutex.cxx
diff --git a/sal/qa/osl/pipe/osl_Pipe.cxx b/sal/qa/osl/pipe/osl_Pipe.cxx
index 5a6e9afc5..1ee1319ad 100644
--- a/sal/qa/osl/pipe/osl_Pipe.cxx
+++ b/sal/qa/osl/pipe/osl_Pipe.cxx
@@ -39,17 +39,11 @@
 #include <sal/types.h>
 #include <rtl/ustring.hxx>
 
-#ifndef	_OSL_THREAD_HXX
 #include <osl/thread.hxx>
-#endif
 
-#ifndef	_OSL_MUTEX_HXX
 #include <osl/mutex.hxx>
-#endif
 
-#ifndef	_OSL_MUTEX_HXX
 #include <osl/pipe.hxx>
-#endif
 #include <osl/time.h>
 
 #ifdef UNX
diff --git a/sal/qa/osl/process/osl_Thread.cxx b/sal/qa/osl/process/osl_Thread.cxx
index bf387bd93..e76f6fa87 100644
--- a/sal/qa/osl/process/osl_Thread.cxx
+++ b/sal/qa/osl/process/osl_Thread.cxx
@@ -32,21 +32,13 @@
 //------------------------------------------------------------------------
 #include <sal/types.h>
 
-#ifndef _RTL_USTRING_HXX_
 #include <rtl/string.hxx>
-#endif
 
-#ifndef _RTL_USTRING_HXX_
 #include <rtl/strbuf.hxx>
-#endif
 
-#ifndef _OSL_THREAD_HXX
 #include <osl/thread.hxx>
-#endif
 
-#ifndef _OSL_MUTEX_HXX
 #include <osl/mutex.hxx>
-#endif
 #include <osl/time.h>
 
 #include <testshl/simpleheader.hxx>
diff --git a/sal/qa/osl/security/osl_Security.cxx b/sal/qa/osl/security/osl_Security.cxx
index 038050671..038050671 100755..100644
--- a/sal/qa/osl/security/osl_Security.cxx
+++ b/sal/qa/osl/security/osl_Security.cxx
diff --git a/sal/qa/osl/socket/osl_Socket.cxx b/sal/qa/osl/socket/osl_Socket.cxx
index 414fd7432..9421e0135 100755..100644
--- a/sal/qa/osl/socket/osl_Socket.cxx
+++ b/sal/qa/osl/socket/osl_Socket.cxx
@@ -59,9 +59,7 @@
 // include files
 //------------------------------------------------------------------------
 
-#ifndef _OSL_SOCKET_CONST_H_
 #include <osl_Socket_Const_orig.h>
-#endif
 
 #include <testshl/simpleheader.hxx>
 
diff --git a/sal/qa/rtl/alloc/rtl_alloc.cxx b/sal/qa/rtl/alloc/rtl_alloc.cxx
index f585c0e79..f585c0e79 100755..100644
--- a/sal/qa/rtl/alloc/rtl_alloc.cxx
+++ b/sal/qa/rtl/alloc/rtl_alloc.cxx
diff --git a/sal/qa/rtl/crc32/rtl_crc32.cxx b/sal/qa/rtl/crc32/rtl_crc32.cxx
index e12ed99d3..e12ed99d3 100755..100644
--- a/sal/qa/rtl/crc32/rtl_crc32.cxx
+++ b/sal/qa/rtl/crc32/rtl_crc32.cxx
diff --git a/sal/qa/rtl/doublelock/rtl_doublelocking.cxx b/sal/qa/rtl/doublelock/rtl_doublelocking.cxx
index daac56af6..6d98ceec7 100644
--- a/sal/qa/rtl/doublelock/rtl_doublelocking.cxx
+++ b/sal/qa/rtl/doublelock/rtl_doublelocking.cxx
@@ -32,13 +32,9 @@
 //------------------------------------------------------------------------
 #include <sal/types.h>
 
-#ifndef _RTL_USTRING_HXX_
 #include <rtl/string.hxx>
-#endif
 
-#ifndef _OSL_THREAD_HXX
 #include <osl/thread.hxx>
-#endif
 #include <osl/time.h>
 
 #include <rtl/instance.hxx>
diff --git a/sal/qa/rtl_strings/rtl_old_testostring.cxx b/sal/qa/rtl_strings/rtl_old_testostring.cxx
index 730ed47fb..f8b3ce8fa 100644
--- a/sal/qa/rtl_strings/rtl_old_testostring.cxx
+++ b/sal/qa/rtl_strings/rtl_old_testostring.cxx
@@ -41,9 +41,7 @@
 // #include <osl/diagnose.h>
 // #endif
 
-#ifndef _RTL_STRING_HXX
 #include <rtl/string.hxx>
-#endif
 
 #include <testshl/simpleheader.hxx>
 
diff --git a/sal/qa/rtl_strings/rtl_old_testowstring.cxx b/sal/qa/rtl_strings/rtl_old_testowstring.cxx
index 696c22048..6469d9ec7 100644
--- a/sal/qa/rtl_strings/rtl_old_testowstring.cxx
+++ b/sal/qa/rtl_strings/rtl_old_testowstring.cxx
@@ -48,13 +48,9 @@
 // #include <osl/diagnose.h>
 // #endif
 
-#ifndef	_RTL_USTRING_HXX
 #include <rtl/ustring.hxx>
-#endif
 
-#ifndef	_RTL_STRING_HXX
 #include <rtl/string.hxx>
-#endif
 
 #include <rtl/locale.hxx>
 
diff --git a/sal/qa/rtl_strings/rtl_old_teststrbuf.cxx b/sal/qa/rtl_strings/rtl_old_teststrbuf.cxx
index 0bd96a275..974494f6e 100644
--- a/sal/qa/rtl_strings/rtl_old_teststrbuf.cxx
+++ b/sal/qa/rtl_strings/rtl_old_teststrbuf.cxx
@@ -42,13 +42,9 @@
 // #include <osl/diagnose.h>
 // #endif
 
-#ifndef _RTL_STRBUF_HXX
 #include <rtl/strbuf.hxx>
-#endif
 
-#ifndef _RTL_WSTRBUF_HXX
 #include <rtl/ustrbuf.hxx>
-#endif
 
 #include <testshl/simpleheader.hxx>
 
diff --git a/sal/rtl/source/logfile.cxx b/sal/rtl/source/logfile.cxx
index 0f9e143c2..3c66ed9d3 100644
--- a/sal/rtl/source/logfile.cxx
+++ b/sal/rtl/source/logfile.cxx
@@ -34,16 +34,12 @@
 
 #include <rtl/logfile.h>
 #include <osl/process.h>
-#ifndef _OSL_FILE_H_
 #include <osl/time.h>
-#endif
 #include <osl/time.h>
 #include <osl/mutex.hxx>
 #include <rtl/bootstrap.h>
 #include <rtl/ustring.hxx>
-#ifndef _RTL_STRBUF_HXX_
 #include <rtl/ustrbuf.hxx>
-#endif
 #include <rtl/alloc.h>
 #include "osl/thread.h"
 
diff --git a/sal/rtl/source/memory_fini.cxx b/sal/rtl/source/memory_fini.cxx
index e6d2e4c10..e6d2e4c10 100755..100644
--- a/sal/rtl/source/memory_fini.cxx
+++ b/sal/rtl/source/memory_fini.cxx
diff --git a/sal/workben/clipboardwben/testcopy/XTDataObject.cxx b/sal/workben/clipboardwben/testcopy/XTDataObject.cxx
index fedfac0b0..f64e97d52 100644
--- a/sal/workben/clipboardwben/testcopy/XTDataObject.cxx
+++ b/sal/workben/clipboardwben/testcopy/XTDataObject.cxx
@@ -33,9 +33,7 @@
 //------------------------------------------------------------------------
 #include <osl/diagnose.h>
 
-#ifndef _TWRAPPERDATAOBJECT_HXX_
 #include "XTDataObject.hxx"
-#endif
 
 #include <windows.h>
 #include <ole2.h>
diff --git a/salhelper/source/simplereferenceobject.cxx b/salhelper/source/simplereferenceobject.cxx
index b3991b0ed..b3991b0ed 100755..100644
--- a/salhelper/source/simplereferenceobject.cxx
+++ b/salhelper/source/simplereferenceobject.cxx
diff --git a/stoc/source/corereflection/crefl.cxx b/stoc/source/corereflection/crefl.cxx
index c706e233a..a8a262477 100644
--- a/stoc/source/corereflection/crefl.cxx
+++ b/stoc/source/corereflection/crefl.cxx
@@ -28,9 +28,7 @@
 // MARKER(update_precomp.py): autogen include statement, do not remove
 #include "precompiled_stoc.hxx"
 #include <cppuhelper/queryinterface.hxx>
-#ifndef _CPPUHELPER_IMPLEMENTATIONENTRY_HXX_
 #include <cppuhelper/implementationentry.hxx>
-#endif
 
 #include <com/sun/star/registry/XRegistryKey.hpp>
 #include <com/sun/star/lang/XComponent.hpp>
diff --git a/stoc/source/defaultregistry/defaultregistry.cxx b/stoc/source/defaultregistry/defaultregistry.cxx
index 12ab6d588..2bbbeabb7 100644
--- a/stoc/source/defaultregistry/defaultregistry.cxx
+++ b/stoc/source/defaultregistry/defaultregistry.cxx
@@ -28,18 +28,14 @@
 // MARKER(update_precomp.py): autogen include statement, do not remove
 #include "precompiled_stoc.hxx"
 #include <osl/mutex.hxx>
-#ifndef _OSL_DIAGNOSE_HXX_
 #include <osl/diagnose.h>
-#endif
 #include <cppuhelper/queryinterface.hxx>
 #include <cppuhelper/weak.hxx>
 #include <cppuhelper/factory.hxx>
 #include <cppuhelper/implbase1.hxx>
 #include <cppuhelper/implbase4.hxx>
 #include <cppuhelper/implbase3.hxx>
-#ifndef _CPPUHELPER_IMPLEMENTATIONENTRY_HXX_
 #include <cppuhelper/implementationentry.hxx>
-#endif
 #include <registry/registry.hxx>
 
 #include <com/sun/star/registry/XSimpleRegistry.hpp>
diff --git a/stoc/source/implementationregistration/implreg.cxx b/stoc/source/implementationregistration/implreg.cxx
index d803bd44c..15dd877fc 100644
--- a/stoc/source/implementationregistration/implreg.cxx
+++ b/stoc/source/implementationregistration/implreg.cxx
@@ -36,12 +36,8 @@
 #include <cppuhelper/factory.hxx>
 #include <cppuhelper/weak.hxx>
 #include <cppuhelper/servicefactory.hxx>
-#ifndef _CPPUHELPER_IMPLBASE3_HXX
 #include <cppuhelper/implbase3.hxx>
-#endif
-#ifndef _CPPUHELPER_IMPLEMENTATIONENTRY_HXX_
 #include <cppuhelper/implementationentry.hxx>
-#endif
 
 #include <uno/mapping.hxx>
 #include <osl/thread.h>
diff --git a/stoc/source/invocation/invocation.cxx b/stoc/source/invocation/invocation.cxx
index b321d97cd..69e8e5be2 100644
--- a/stoc/source/invocation/invocation.cxx
+++ b/stoc/source/invocation/invocation.cxx
@@ -29,13 +29,9 @@
 #include "precompiled_stoc.hxx"
 #include <osl/mutex.hxx>
 #include <cppuhelper/queryinterface.hxx>
-#ifndef _CPPUHELER_WEAK_HXX_
 #include <cppuhelper/weak.hxx>
-#endif
 #include <cppuhelper/factory.hxx>
-#ifndef _CPPUHELPER_IMPLEMENTATIONENTRY_HXX__
 #include <cppuhelper/implementationentry.hxx>
-#endif
 #include <cppuhelper/typeprovider.hxx>
 #include <cppuhelper/implbase2.hxx>
 
diff --git a/stoc/source/loader/dllcomponentloader.cxx b/stoc/source/loader/dllcomponentloader.cxx
index 92aca6aed..56f08dedb 100644
--- a/stoc/source/loader/dllcomponentloader.cxx
+++ b/stoc/source/loader/dllcomponentloader.cxx
@@ -42,9 +42,7 @@
 #include <cppuhelper/factory.hxx>
 #include <cppuhelper/shlib.hxx>
 #include <cppuhelper/implbase3.hxx>
-#ifndef _CPPUHELPER_IMPLEMENTATIONENTRY_HXX__
 #include <cppuhelper/implementationentry.hxx>
-#endif
 #include <cppuhelper/bootstrap.hxx>
 
 #include <com/sun/star/loader/XImplementationLoader.hpp>
diff --git a/stoc/source/namingservice/namingservice.cxx b/stoc/source/namingservice/namingservice.cxx
index 761fccf64..58b78ff04 100644
--- a/stoc/source/namingservice/namingservice.cxx
+++ b/stoc/source/namingservice/namingservice.cxx
@@ -38,9 +38,7 @@
 #include <cppuhelper/factory.hxx>
 #include <cppuhelper/component.hxx>
 #include <cppuhelper/implbase2.hxx>
-#ifndef _CPPUHELPER_IMPLEMENTATIONENTRY_HXX_
 #include <cppuhelper/implementationentry.hxx>
-#endif
 
 #include <com/sun/star/uno/XNamingService.hpp>
 #include <com/sun/star/lang/XServiceInfo.hpp>
diff --git a/stoc/source/servicemanager/servicemanager.cxx b/stoc/source/servicemanager/servicemanager.cxx
index 9ae1af91f..b5a42792c 100644
--- a/stoc/source/servicemanager/servicemanager.cxx
+++ b/stoc/source/servicemanager/servicemanager.cxx
@@ -40,13 +40,9 @@
 #include <cppuhelper/weakref.hxx>
 #include <cppuhelper/component.hxx>
 #include <cppuhelper/factory.hxx>
-#ifndef _CPPUHELPER_IMPLBASE1_HXX
 #include <cppuhelper/implbase1.hxx>
-#endif
 #include <cppuhelper/typeprovider.hxx>
-#ifndef _CPPUHELPER_IMPLEMENTATIONENTRY_HXX_
 #include <cppuhelper/implementationentry.hxx>
-#endif
 #include <rtl/unload.h>
 #include <cppuhelper/component_context.hxx>
 #include <cppuhelper/bootstrap.hxx>
diff --git a/stoc/source/simpleregistry/simpleregistry.cxx b/stoc/source/simpleregistry/simpleregistry.cxx
index 03faa9a2c..979ae19fc 100644
--- a/stoc/source/simpleregistry/simpleregistry.cxx
+++ b/stoc/source/simpleregistry/simpleregistry.cxx
@@ -30,17 +30,13 @@
 #include <osl/diagnose.h>
 #include <osl/mutex.hxx>
 #include <rtl/alloc.h>
-#ifndef _RTL_USTRBUF_H_
 #include <rtl/ustrbuf.hxx>
-#endif
 #include <cppuhelper/queryinterface.hxx>
 #include <cppuhelper/weak.hxx>
 #include <cppuhelper/factory.hxx>
 #include <cppuhelper/implbase1.hxx>
 #include <cppuhelper/implbase2.hxx>
-#ifndef _CPPUHELPER_IMPLEMENTATIONENTRY_HXX_
 #include <cppuhelper/implementationentry.hxx>
-#endif
 #include <registry/registry.hxx>
 
 #include <com/sun/star/registry/XSimpleRegistry.hpp>
diff --git a/stoc/source/tdmanager/tdmgr.cxx b/stoc/source/tdmanager/tdmgr.cxx
index 407e1995d..4b91b1371 100644
--- a/stoc/source/tdmanager/tdmgr.cxx
+++ b/stoc/source/tdmanager/tdmgr.cxx
@@ -31,13 +31,9 @@
 #include <osl/mutex.hxx>
 #include "rtl/ustrbuf.hxx"
 #include <cppuhelper/factory.hxx>
-#ifndef _CPPUHELPER_IMPLBASE5_HXX_
 #include <cppuhelper/compbase5.hxx>
-#endif
 #include <cppuhelper/implbase1.hxx>
-#ifndef _CPPUHELPER_IMPLEMENTATIONENTRY_HXX_
 #include <cppuhelper/implementationentry.hxx>
-#endif
 #include "tdmgr_common.hxx"
 #include "tdmgr_tdenumeration.hxx"
 #include "lrucache.hxx"
diff --git a/stoc/test/testloader.cxx b/stoc/test/testloader.cxx
index e333a3981..8afa6342b 100644
--- a/stoc/test/testloader.cxx
+++ b/stoc/test/testloader.cxx
@@ -31,9 +31,7 @@
 #include <stdio.h>
 
 #include <sal/main.h>
-#ifndef _OSL_MODULE_H_
 #include <osl/module.hxx>
-#endif
 #include <osl/diagnose.h>
 
 #include <com/sun/star/loader/XImplementationLoader.hpp>
diff --git a/store/source/stordir.cxx b/store/source/stordir.cxx
index db6de1245..81c514491 100644
--- a/store/source/stordir.cxx
+++ b/store/source/stordir.cxx
@@ -30,37 +30,19 @@
 
 #include "stordir.hxx"
 
-#ifndef _SAL_TYPES_H_
 #include <sal/types.h>
-#endif
 
-#ifndef _RTL_TEXTCVT_H_
 #include <rtl/textcvt.h>
-#endif
-#ifndef _RTL_REF_HXX_
 #include <rtl/ref.hxx>
-#endif
 
-#ifndef _OSL_MUTEX_HXX_
 #include <osl/mutex.hxx>
-#endif
 
-#ifndef _STORE_TYPES_H_
 #include "store/types.h"
-#endif
-#ifndef _STORE_OBJECT_HXX_
 #include "object.hxx"
-#endif
 
-#ifndef _STORE_STORBASE_HXX_
 #include "storbase.hxx"
-#endif
-#ifndef _STORE_STORDATA_HXX_
 #include "stordata.hxx"
-#endif
-#ifndef _STORE_STORPAGE_HXX_
 #include "storpage.hxx"
-#endif
 
 using namespace store;