Remove include guards

Change-Id: Ib4ba76d0083e5bd75cc589a55318089c004f591f

8 files changed, 20 insertions, 125 deletions

diff --git a/sal/osl/unx/file_error_transl.cxx b/sal/osl/unx/file_error_transl.cxx
index c7167073c660..7e7bb9b2f435 100644
--- a/sal/osl/unx/file_error_transl.cxx
+++ b/sal/osl/unx/file_error_transl.cxx
@@ -17,19 +17,9 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-
- #ifndef _ERRNO_H
- #include <errno.h>
- #endif
-
- #ifndef _FILE_ERROR_TRANSL_H_
- #include "file_error_transl.h"
- #endif
-
- #ifndef _OSL_DIAGNOSE_H_
- #include <osl/diagnose.h>
- #endif
-
+#include <errno.h>
+#include "file_error_transl.h"
+#include <osl/diagnose.h>
 
 /********************************************
  * oslTranslateFileError
diff --git a/sal/osl/unx/file_path_helper.cxx b/sal/osl/unx/file_path_helper.cxx
index 1aaf0e48be67..39b9a5863123 100644
--- a/sal/osl/unx/file_path_helper.cxx
+++ b/sal/osl/unx/file_path_helper.cxx
@@ -31,25 +31,12 @@
      Includes
   ******************************************/
 
- #ifndef _OSL_FILE_PATH_HELPER_H_
  #include "file_path_helper.h"
- #endif
-
- #ifndef _OSL_FILE_PATH_HELPER_HXX_
  #include "file_path_helper.hxx"
- #endif
-
- #ifndef _OSL_UUNXAPI_HXX_
  #include "uunxapi.hxx"
- #endif
 
- #ifndef _OSL_DIAGNOSE_H_
  #include <osl/diagnose.h>
- #endif
-
- #ifndef _RTL_USTRING_HXX_
  #include <rtl/ustring.hxx>
- #endif
 
  /*******************************************
      Constants
diff --git a/sal/osl/unx/process.cxx b/sal/osl/unx/process.cxx
index ff68fded7658..cb9d6c8bf4c1 100644
--- a/sal/osl/unx/process.cxx
+++ b/sal/osl/unx/process.cxx
@@ -56,10 +56,7 @@
 #endif
 #include <osl/diagnose.h>
 #include <osl/mutex.h>
-
-#ifndef _OSL_CONDITN_H_
 #include <osl/conditn.h>
-#endif
 #include <osl/thread.h>
 #include <osl/file.h>
 #include <osl/signal.h>
diff --git a/sal/osl/unx/uunxapi.cxx b/sal/osl/unx/uunxapi.cxx
index 270f5c33513a..b2b2bc34bb10 100644
--- a/sal/osl/unx/uunxapi.cxx
+++ b/sal/osl/unx/uunxapi.cxx
@@ -26,26 +26,11 @@
  *
  ************************************************************************/
 
-
- #ifndef _OSL_UUNXAPI_H_
  #include "uunxapi.h"
- #endif
-
- #ifndef __OSL_SYSTEM_H__
  #include "system.h"
- #endif
-
- #ifndef _LIMITS_H
  #include <limits.h>
- #endif
-
- #ifndef _RTL_USTRING_HXX_
  #include <rtl/ustring.hxx>
- #endif
-
- #ifndef _OSL_THREAD_H_
  #include <osl/thread.h>
- #endif
 
  #ifdef ANDROID
  #include <osl/detail/android-bootstrap.h>
diff --git a/sal/qa/rtl_strings/rtl_OString.cxx b/sal/qa/rtl_strings/rtl_OString.cxx
index 5be8f3199f9d..8a5f31ea82c1 100644
--- a/sal/qa/rtl_strings/rtl_OString.cxx
+++ b/sal/qa/rtl_strings/rtl_OString.cxx
@@ -27,24 +27,11 @@
  ************************************************************************/
 
 #include <string.h>
-
-#ifndef _SAL_TYPES_H_
-    #include <sal/types.h>
-#endif
-
+#include <sal/types.h>
 #include <testshl/tresstatewrapper.hxx>
-
-#ifndef _RTL_STRING_HXX_
-    #include <rtl/string.hxx>
-#endif
-
-#ifndef _RTL_STRING_CONST_H_
-    #include <rtl_String_Const.h>
-#endif
-
-#ifndef _RTL_STRING_UTILS_HXX_
-    #include <rtl_String_Utils.hxx>
-#endif
+#include <rtl/string.hxx>
+#include <rtl_String_Const.h>
+#include <rtl_String_Utils.hxx>
 #include <rtl/ustring.h>
 
 using ::rtl::OString;
diff --git a/sal/qa/rtl_strings/rtl_OUStringBuffer.cxx b/sal/qa/rtl_strings/rtl_OUStringBuffer.cxx
index 7a9871c041e4..58cf2ca1b89e 100644
--- a/sal/qa/rtl_strings/rtl_OUStringBuffer.cxx
+++ b/sal/qa/rtl_strings/rtl_OUStringBuffer.cxx
@@ -26,45 +26,16 @@
  *
  ************************************************************************/
 
-
-#ifndef _SAL_TYPES_H_
-    #include <sal/types.h>
-#endif
-
+#include <sal/types.h>
 #include <testshl/tresstatewrapper.hxx>
-
-#ifndef _RTL_STRING_HXX_
-    #include <rtl/string.hxx>
-#endif
-
-#ifndef _RTL_USTRING_H_
-    #include <rtl/ustring.h>
-#endif
-
-#ifndef _RTL_USTRING_HXX_
-    #include <rtl/ustring.hxx>
-#endif
-
-#ifndef _RTL_USTRBUF_H_
-        #include <rtl/ustrbuf.h>
-#endif
-
-#ifndef _RTL_USTRBUF_HXX
-        #include <rtl/ustrbuf.hxx>
-#endif
-
-#ifndef _OSL_THREAD_H_
-    #include <osl/thread.h>
-#endif
-
-#ifndef _RTL_STRING_CONST_H_
-    #include <rtl_String_Const.h>
-#endif
-
-#ifndef _RTL_STRING_UTILS_HXX_
-    #include <rtl_String_Utils.hxx>
-#endif
-
+#include <rtl/string.hxx>
+#include <rtl/ustring.h>
+#include <rtl/ustring.hxx>
+#include <rtl/ustrbuf.h>
+#include <rtl/ustrbuf.hxx>
+#include <osl/thread.h>
+#include <rtl_String_Const.h>
+#include <rtl_String_Utils.hxx>
 #include "stdio.h"
 
 using ::rtl::OUString;
diff --git a/sal/qa/rtl_strings/rtl_String_Utils.cxx b/sal/qa/rtl_strings/rtl_String_Utils.cxx
index 972124f03e24..2c11679b89f6 100644
--- a/sal/qa/rtl_strings/rtl_String_Utils.cxx
+++ b/sal/qa/rtl_strings/rtl_String_Utils.cxx
@@ -26,25 +26,12 @@
  *
 #*************************************************************************/
 
-
 #include <math.h>
 #include <stdlib.h>
-
-#ifndef _SAL_TYPES_H_
-    #include <sal/types.h>
-#endif
-
-#ifndef _RTL_USTRING_H_
-    #include <rtl/ustring.h>
-#endif
-
-#ifndef _RTL_STRING_HXX_
-    #include <rtl/string.hxx>
-#endif
-
-#ifndef _RTL_STRING_UTILS_CONST_H_
-    #include <rtl_String_Utils_Const.h>
-#endif
+#include <sal/types.h>
+#include <rtl/ustring.h>
+#include <rtl/string.hxx>
+#include <rtl_String_Utils_Const.h>
 
 using ::rtl::OString;
 sal_uInt32 AStringLen( const sal_Char *pAStr )
diff --git a/sal/rtl/source/strbuf.cxx b/sal/rtl/source/strbuf.cxx
index c9a4f3140643..d4a5a75ba929 100644
--- a/sal/rtl/source/strbuf.cxx
+++ b/sal/rtl/source/strbuf.cxx
@@ -27,18 +27,9 @@
  ************************************************************************/
 
 #include <osl/interlck.h>
-
-#ifndef _RTL_STRING_HXX_
 #include <rtl/strbuf.hxx>
-#endif
 #include <rtl/memory.h>
 
-/*
-#include <rtl/alloc.h>
-*/
-
-
-
 /*************************************************************************
  *  rtl_stringbuffer_newFromStr_WithLength
  */