remove external include guards

Change-Id: If5758e02baa8e019923355b6c97043b306223fdd

17 files changed, 16 insertions, 133 deletions

diff --git a/sal/inc/rtl/textenc.h b/sal/inc/rtl/textenc.h
index 436ffbec2516..676f8c23186a 100644
--- a/sal/inc/rtl/textenc.h
+++ b/sal/inc/rtl/textenc.h
@@ -26,9 +26,7 @@
 
 #else /* !_SOLAR_RSC_INVOKED */
 
-#ifndef _SAL_TYPES_H
 #include <sal/types.h>
-#endif
 
 /** The various supported text encodings.
 
diff --git a/sal/inc/sal/config.h b/sal/inc/sal/config.h
index e990e35ca770..ee230fe49d69 100644
--- a/sal/inc/sal/config.h
+++ b/sal/inc/sal/config.h
@@ -24,10 +24,7 @@
 #include "config_global.h"
 #endif
 
-#ifndef INCLUDED_STDLIB_H
 #include <stdlib.h>
-#define INCLUDED_STDLIB_H
-#endif
 
 #ifdef WIN32
 #define SAL_W32
diff --git a/sal/inc/sal/main.h b/sal/inc/sal/main.h
index 8648e38752ab..634b57cac534 100644
--- a/sal/inc/sal/main.h
+++ b/sal/inc/sal/main.h
@@ -69,10 +69,7 @@ int SAL_CALL main(int argc, char ** argv) \
 
 #ifdef SAL_W32
 
-#ifndef INCLUDED_STDLIB_H
 #include <stdlib.h>
-#define INCLUDED_STDLIB_H
-#endif
 
 /* Sorry but this is neccessary cause HINSTANCE is a typedef that differs (C++ causes an error) */
 
diff --git a/sal/osl/unx/file_path_helper.h b/sal/osl/unx/file_path_helper.h
index 61f64e7733e6..28a96c173533 100644
--- a/sal/osl/unx/file_path_helper.h
+++ b/sal/osl/unx/file_path_helper.h
@@ -20,15 +20,8 @@
  #ifndef _OSL_FILE_PATH_HELPER_H_
  #define _OSL_FILE_PATH_HELPER_H_
 
-
- #ifndef _SAL_TYPES_H_
  #include <sal/types.h>
- #endif
-
- #ifndef _RTL_USTRING_H_
  #include <rtl/ustring.h>
- #endif
-
 
  #ifdef __cplusplus
  extern "C"
diff --git a/sal/osl/unx/tempfile.c b/sal/osl/unx/tempfile.c
index 0f57e04b229a..3d60477c7752 100644
--- a/sal/osl/unx/tempfile.c
+++ b/sal/osl/unx/tempfile.c
@@ -17,10 +17,6 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-/*****************************************************************/
-/* Includes                                                      */
-/*****************************************************************/
-
 #include <stdio.h>
 #include <stdlib.h>
 #include <sys/types.h>
@@ -33,9 +29,7 @@
 #include <osl/diagnose.h>
 #include <sal/macros.h>
 
-#ifndef _FILE_URL_H_
 #include "file_url.h"
-#endif
 
 oslFileError SAL_CALL osl_getTempDirURL( rtl_uString** pustrTempDir )
 {
diff --git a/sal/osl/unx/uunxapi.h b/sal/osl/unx/uunxapi.h
index d13e20e5b061..f6bc1f2c2d6e 100644
--- a/sal/osl/unx/uunxapi.h
+++ b/sal/osl/unx/uunxapi.h
@@ -20,26 +20,11 @@
  #ifndef _OSL_UUNXAPI_H_
  #define _OSL_UUNXAPI_H_
 
- #ifndef _UNISTD_H
  #include <unistd.h>
- #endif
-
- #ifndef _STDLIB_H
  #include <stdlib.h>
- #endif
-
- #ifndef _TYPES_H
  #include <sys/types.h>
- #endif
-
- #ifndef _STAT_H
  #include <sys/stat.h>
- #endif
-
- #ifndef _RTL_USTRING_H_
  #include <rtl/ustring.h>
- #endif
-
 
  #ifdef __cplusplus
  extern "C"
diff --git a/sal/osl/unx/uunxapi.hxx b/sal/osl/unx/uunxapi.hxx
index 066e45eae150..0419ebe31b71 100644
--- a/sal/osl/unx/uunxapi.hxx
+++ b/sal/osl/unx/uunxapi.hxx
@@ -20,13 +20,9 @@
 #ifndef _OSL_UUNXAPI_HXX_
 #define _OSL_UUNXAPI_HXX_
 
-#ifndef _OSL_UUNXAPI_H_
 #include "uunxapi.h"
-#endif
 
-#ifndef _RTL_USTRING_HXX_
 #include <rtl/ustring.hxx>
-#endif
 
 namespace osl
 {
diff --git a/sal/qa/OStringBuffer/rtl_String_Const.h b/sal/qa/OStringBuffer/rtl_String_Const.h
index 62248d58e219..d07d7e92f3ee 100644
--- a/sal/qa/OStringBuffer/rtl_String_Const.h
+++ b/sal/qa/OStringBuffer/rtl_String_Const.h
@@ -20,23 +20,12 @@
 #ifndef _RTL_STRING_CONST_H_
 #define _RTL_STRING_CONST_H_
 
-#ifndef _RTL_STRING_UTILS_HXX_
-    #include <rtl_String_Utils.hxx>
-#endif
+#include <rtl_String_Utils.hxx>
 
 #include <limits.h>
-
-#ifndef _SAL_TYPES_H_
-    #include <sal/types.h>
-#endif
-
-#ifndef _RTL_TEXTENC_H
-    #include <rtl/textenc.h>
-#endif
-
-#ifndef _RTL_USTRING_H_
-    #include <rtl/ustring.h>
-#endif
+#include <sal/types.h>
+#include <rtl/textenc.h>
+#include <rtl/ustring.h>
 
 #ifdef __cplusplus
 extern "C"
diff --git a/sal/qa/OStringBuffer/rtl_String_Utils.hxx b/sal/qa/OStringBuffer/rtl_String_Utils.hxx
index f0501cbc1f49..a824ef9f5270 100644
--- a/sal/qa/OStringBuffer/rtl_String_Utils.hxx
+++ b/sal/qa/OStringBuffer/rtl_String_Utils.hxx
@@ -25,17 +25,9 @@
 #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
+#include <sal/types.h>
+#include <rtl/ustring.h>
+#include <rtl/string.hxx>
 
 sal_Char* cpystr( sal_Char* dst, const sal_Char* src );
 sal_Char* cpynstr( sal_Char* dst, const sal_Char* src, sal_uInt32 cnt );
diff --git a/sal/qa/OStringBuffer/rtl_String_Utils_Const.h b/sal/qa/OStringBuffer/rtl_String_Utils_Const.h
index 8e8d9453cafd..e855199455b9 100644
--- a/sal/qa/OStringBuffer/rtl_String_Utils_Const.h
+++ b/sal/qa/OStringBuffer/rtl_String_Utils_Const.h
@@ -20,9 +20,7 @@
 #ifndef _RTL_STRING_UTILS_CONST_H_
 #define _RTL_STRING_UTILS_CONST_H_
 
-#ifndef _SAL_TYPES_H_
-    #include <sal/types.h>
-#endif
+#include <sal/types.h>
 
 #ifdef __cplusplus
 extern "C"
diff --git a/sal/qa/osl/condition/osl_Condition_Const.h b/sal/qa/osl/condition/osl_Condition_Const.h
index 6101914fa9a6..04b6d1390091 100644
--- a/sal/qa/osl/condition/osl_Condition_Const.h
+++ b/sal/qa/osl/condition/osl_Condition_Const.h
@@ -22,16 +22,10 @@
 
 #include <sal/types.h>
 #include <rtl/ustring.hxx>
-
-#ifndef _OSL_THREAD_HXX_
 #include <osl/thread.hxx>
-#endif
 #include <osl/mutex.hxx>
 #include <osl/pipe.hxx>
-
-#ifndef _OSL_CONDITION_HXX_
 #include <osl/conditn.hxx>
-#endif
 #include <osl/time.h>
 
 #ifdef UNX
diff --git a/sal/qa/osl/mutex/osl_Mutex_Const.h b/sal/qa/osl/mutex/osl_Mutex_Const.h
index 717431fc4fd1..133f1f02e231 100644
--- a/sal/qa/osl/mutex/osl_Mutex_Const.h
+++ b/sal/qa/osl/mutex/osl_Mutex_Const.h
@@ -22,14 +22,8 @@
 
 #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
 #include <osl/time.h>
 
 #ifdef UNX
diff --git a/sal/qa/osl/socket/osl_Socket_Const.h b/sal/qa/osl/socket/osl_Socket_Const.h
index 88ac501d4e3e..c992fe7fc1a6 100644
--- a/sal/qa/osl/socket/osl_Socket_Const.h
+++ b/sal/qa/osl/socket/osl_Socket_Const.h
@@ -24,23 +24,11 @@
 #include <rtl/textenc.h>
 #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>
 
 const char * pTestString1 = "test socket";
diff --git a/sal/qa/osl/socket/osl_Socket_Const_orig.h b/sal/qa/osl/socket/osl_Socket_Const_orig.h
index c3d87c142b4b..ce63ed8fd603 100644
--- a/sal/qa/osl/socket/osl_Socket_Const_orig.h
+++ b/sal/qa/osl/socket/osl_Socket_Const_orig.h
@@ -24,23 +24,11 @@
 #include <rtl/textenc.h>
 #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>
 
 const char * pTestString1 = "test socket";
diff --git a/sal/qa/rtl_strings/rtl_String_Const.h b/sal/qa/rtl_strings/rtl_String_Const.h
index e66a063a371f..bc1fbe8c7545 100644
--- a/sal/qa/rtl_strings/rtl_String_Const.h
+++ b/sal/qa/rtl_strings/rtl_String_Const.h
@@ -20,23 +20,13 @@
 #ifndef _RTL_STRING_CONST_H_
 #define _RTL_STRING_CONST_H_
 
-#ifndef _RTL_STRING_UTILS_HXX_
-    #include <rtl_String_Utils.hxx>
-#endif
+#include <rtl_String_Utils.hxx>
 
 #include <limits.h>
 
-#ifndef _SAL_TYPES_H_
-    #include <sal/types.h>
-#endif
-
-#ifndef _RTL_TEXTENC_H
-    #include <rtl/textenc.h>
-#endif
-
-#ifndef _RTL_USTRING_H_
-    #include <rtl/ustring.h>
-#endif
+#include <sal/types.h>
+#include <rtl/textenc.h>
+#include <rtl/ustring.h>
 
 #ifdef __cplusplus
 extern "C"
diff --git a/sal/qa/rtl_strings/rtl_String_Utils.hxx b/sal/qa/rtl_strings/rtl_String_Utils.hxx
index ca498af8b608..811386f3966c 100644
--- a/sal/qa/rtl_strings/rtl_String_Utils.hxx
+++ b/sal/qa/rtl_strings/rtl_String_Utils.hxx
@@ -25,17 +25,9 @@
 #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
+#include <sal/types.h>
+#include <rtl/ustring.h>
+#include <rtl/string.hxx>
 
 sal_Char* cpystr( sal_Char* dst, const sal_Char* src );
 sal_Char* cpynstr( sal_Char* dst, const sal_Char* src, sal_uInt32 cnt );
diff --git a/sal/qa/rtl_strings/rtl_String_Utils_Const.h b/sal/qa/rtl_strings/rtl_String_Utils_Const.h
index 8e8d9453cafd..e855199455b9 100644
--- a/sal/qa/rtl_strings/rtl_String_Utils_Const.h
+++ b/sal/qa/rtl_strings/rtl_String_Utils_Const.h
@@ -20,9 +20,7 @@
 #ifndef _RTL_STRING_UTILS_CONST_H_
 #define _RTL_STRING_UTILS_CONST_H_
 
-#ifndef _SAL_TYPES_H_
-    #include <sal/types.h>
-#endif
+#include <sal/types.h>
 
 #ifdef __cplusplus
 extern "C"