Include saldllapi.h explicitly where needed

Change-Id: I7ba421479cd332e059ed9da1c6090e2df420347e

21 files changed, 95 insertions, 36 deletions

diff --git a/sal/inc/rtl/alloc.h b/sal/inc/rtl/alloc.h
index 35c7e5b308b4..9c2d7efb7f42 100644
--- a/sal/inc/rtl/alloc.h
+++ b/sal/inc/rtl/alloc.h
@@ -29,7 +29,10 @@
 #ifndef _RTL_ALLOC_H_
 #define _RTL_ALLOC_H_
 
-#   include <sal/types.h>
+#include "sal/config.h"
+
+#include "sal/saldllapi.h"
+#include "sal/types.h"
 
 #ifdef __cplusplus
 extern "C" {
diff --git a/sal/inc/rtl/bootstrap.h b/sal/inc/rtl/bootstrap.h
index 90705699be94..6e3fc4aee708 100644
--- a/sal/inc/rtl/bootstrap.h
+++ b/sal/inc/rtl/bootstrap.h
@@ -28,7 +28,10 @@
 #ifndef _RTL_BOOTSTRAP_H_
 #define _RTL_BOOTSTRAP_H_
 
-#include <rtl/ustring.h>
+#include "sal/config.h"
+
+#include "rtl/ustring.h"
+#include "sal/saldllapi.h"
 
 #ifdef __cplusplus
 extern "C" {
diff --git a/sal/inc/rtl/byteseq.h b/sal/inc/rtl/byteseq.h
index 8d52c7e49adc..e863dffa7abd 100644
--- a/sal/inc/rtl/byteseq.h
+++ b/sal/inc/rtl/byteseq.h
@@ -28,8 +28,12 @@
 #ifndef _RTL_BYTESEQ_H_
 #define _RTL_BYTESEQ_H_
 
-#include <sal/types.h>
-#include <rtl/alloc.h>
+#include "sal/config.h"
+
+#include "rtl/alloc.h"
+#include "rtl/ustring.h"
+#include "sal/saldllapi.h"
+#include "sal/types.h"
 
 #ifdef __cplusplus
 extern "C"
diff --git a/sal/inc/rtl/cipher.h b/sal/inc/rtl/cipher.h
index 8a67d56cbbec..c7d2dec175fb 100644
--- a/sal/inc/rtl/cipher.h
+++ b/sal/inc/rtl/cipher.h
@@ -29,7 +29,10 @@
 #ifndef _RTL_CIPHER_H_
 #define _RTL_CIPHER_H_
 
-#include <sal/types.h>
+#include "sal/config.h"
+
+#include "sal/saldllapi.h"
+#include "sal/types.h"
 
 #ifdef __cplusplus
 extern "C" {
diff --git a/sal/inc/rtl/crc.h b/sal/inc/rtl/crc.h
index be3b03b93683..2c975e6ba220 100644
--- a/sal/inc/rtl/crc.h
+++ b/sal/inc/rtl/crc.h
@@ -29,7 +29,10 @@
 #ifndef _RTL_CRC_H_
 #define _RTL_CRC_H_
 
-#include <sal/types.h>
+#include "sal/config.h"
+
+#include "sal/saldllapi.h"
+#include "sal/types.h"
 
 #ifdef __cplusplus
 extern "C" {
diff --git a/sal/inc/rtl/digest.h b/sal/inc/rtl/digest.h
index c8640dfdfc7f..990a4a8a22d4 100644
--- a/sal/inc/rtl/digest.h
+++ b/sal/inc/rtl/digest.h
@@ -29,7 +29,10 @@
 #ifndef _RTL_DIGEST_H_
 #define _RTL_DIGEST_H_
 
-#include <sal/types.h>
+#include "sal/config.h"
+
+#include "sal/saldllapi.h"
+#include "sal/types.h"
 
 #ifdef __cplusplus
 extern "C" {
diff --git a/sal/inc/rtl/locale.h b/sal/inc/rtl/locale.h
index 3e67fafeb9c8..e3b6bb4f1241 100644
--- a/sal/inc/rtl/locale.h
+++ b/sal/inc/rtl/locale.h
@@ -29,7 +29,10 @@
 #ifndef _RTL_LOCALE_H_
 #define _RTL_LOCALE_H_
 
-#include <rtl/ustring.h>
+#include "sal/config.h"
+
+#include "rtl/ustring.h"
+#include "sal/saldllapi.h"
 
 #ifdef __cplusplus
 extern "C" {
diff --git a/sal/inc/rtl/logfile.h b/sal/inc/rtl/logfile.h
index 54027ac83f7f..4ffc0a1a3e5a 100644
--- a/sal/inc/rtl/logfile.h
+++ b/sal/inc/rtl/logfile.h
@@ -28,7 +28,10 @@
 #ifndef _RTL_LOGFILE_H_
 #define _RTL_LOGFILE_H_
 
-#include <sal/types.h>
+#include "sal/config.h"
+
+#include "sal/saldllapi.h"
+#include "sal/types.h"
 
 #ifdef __cplusplus
 extern "C" {
diff --git a/sal/inc/rtl/math.h b/sal/inc/rtl/math.h
index 35a0442d7f46..d1817720a55e 100644
--- a/sal/inc/rtl/math.h
+++ b/sal/inc/rtl/math.h
@@ -29,7 +29,10 @@
 #ifndef INCLUDED_RTL_MATH_H
 #define INCLUDED_RTL_MATH_H
 
+#include "sal/config.h"
+
 #include "rtl/ustring.h"
+#include "sal/saldllapi.h"
 #include "sal/types.h"
 
 #if defined __cplusplus
diff --git a/sal/inc/rtl/memory.h b/sal/inc/rtl/memory.h
index 516040f1880d..0104b78c5792 100644
--- a/sal/inc/rtl/memory.h
+++ b/sal/inc/rtl/memory.h
@@ -30,7 +30,10 @@
 #ifndef _RTL_MEMORY_H_
 #define _RTL_MEMORY_H_
 
-#   include <sal/types.h>
+#include "sal/config.h"
+
+#include "sal/saldllapi.h"
+#include "sal/types.h"
 
 #ifdef __cplusplus
 extern "C" {
diff --git a/sal/inc/rtl/process.h b/sal/inc/rtl/process.h
index ae18e66b969a..c1e055924ac2 100644
--- a/sal/inc/rtl/process.h
+++ b/sal/inc/rtl/process.h
@@ -28,8 +28,11 @@
 #ifndef _RTL_PROCESS_H_
 #define _RTL_PROCESS_H_
 
-#include <sal/types.h>
-#include <osl/process.h>
+#include "sal/config.h"
+
+#include "osl/process.h"
+#include "sal/saldllapi.h"
+#include "sal/types.h"
 
 #ifdef __cplusplus
 extern "C" {
diff --git a/sal/inc/rtl/random.h b/sal/inc/rtl/random.h
index 1a54a4a3d033..4e371b695881 100644
--- a/sal/inc/rtl/random.h
+++ b/sal/inc/rtl/random.h
@@ -29,7 +29,10 @@
 #ifndef _RTL_RANDOM_H_
 #define _RTL_RANDOM_H_
 
-#include <sal/types.h>
+#include "sal/config.h"
+
+#include "sal/saldllapi.h"
+#include "sal/types.h"
 
 #ifdef __cplusplus
 extern "C" {
diff --git a/sal/inc/rtl/strbuf.h b/sal/inc/rtl/strbuf.h
index 64300ecde531..1323b76fc0ee 100644
--- a/sal/inc/rtl/strbuf.h
+++ b/sal/inc/rtl/strbuf.h
@@ -29,7 +29,10 @@
 #ifndef _RTL_STRBUF_H_
 #define _RTL_STRBUF_H_
 
-#include <rtl/string.h>
+#include "sal/config.h"
+
+#include "rtl/string.h"
+#include "sal/saldllapi.h"
 
 #ifdef __cplusplus
 extern "C" {
diff --git a/sal/inc/rtl/string.h b/sal/inc/rtl/string.h
index f326abe3d7f9..c38e106e6fdb 100644
--- a/sal/inc/rtl/string.h
+++ b/sal/inc/rtl/string.h
@@ -29,9 +29,12 @@
 #ifndef _RTL_STRING_H_
 #define _RTL_STRING_H_
 
-#include <sal/types.h>
-#include <osl/interlck.h>
-#include <rtl/textcvt.h>
+#include "sal/config.h"
+
+#include "osl/interlck.h"
+#include "rtl/textcvt.h"
+#include "sal/saldllapi.h"
+#include "sal/types.h"
 
 #ifdef __cplusplus
 extern "C" {
diff --git a/sal/inc/rtl/tencinfo.h b/sal/inc/rtl/tencinfo.h
index 086b5abea5dc..50e55b389007 100644
--- a/sal/inc/rtl/tencinfo.h
+++ b/sal/inc/rtl/tencinfo.h
@@ -29,10 +29,11 @@
 #ifndef _RTL_TENCINFO_H
 #define _RTL_TENCINFO_H
 
-#ifndef _SAL_TYPES_H
-#include <sal/types.h>
-#endif
-#include <rtl/textenc.h>
+#include "sal/config.h"
+
+#include "rtl/textenc.h"
+#include "sal/saldllapi.h"
+#include "sal/types.h"
 
 #ifdef __cplusplus
 extern "C" {
diff --git a/sal/inc/rtl/textcvt.h b/sal/inc/rtl/textcvt.h
index 9ca08db12eea..dc8e5c7c72f4 100644
--- a/sal/inc/rtl/textcvt.h
+++ b/sal/inc/rtl/textcvt.h
@@ -29,10 +29,11 @@
 #ifndef _RTL_TEXTCVT_H
 #define _RTL_TEXTCVT_H
 
-#ifndef _SAL_TYPES_H
-#include <sal/types.h>
-#endif
-#include <rtl/textenc.h>
+#include "sal/config.h"
+
+#include "rtl/textenc.h"
+#include "sal/saldllapi.h"
+#include "sal/types.h"
 
 #ifdef __cplusplus
 extern "C" {
diff --git a/sal/inc/rtl/unload.h b/sal/inc/rtl/unload.h
index 6a196b8fbce1..cdd5536e6bc9 100644
--- a/sal/inc/rtl/unload.h
+++ b/sal/inc/rtl/unload.h
@@ -28,10 +28,13 @@
 #ifndef _RTL_UNLOAD_H_
 #define _RTL_UNLOAD_H_
 
-#include <sal/types.h>
-#include <osl/time.h>
-#include <osl/interlck.h>
-#include <osl/module.h>
+#include "sal/config.h"
+
+#include "osl/interlck.h"
+#include "osl/module.h"
+#include "osl/time.h"
+#include "sal/saldllapi.h"
+#include "sal/types.h"
 
 /** @file
 The API enables an effective way of unloading libraries in a centralized way.
diff --git a/sal/inc/rtl/uri.h b/sal/inc/rtl/uri.h
index 3651db002bfa..3464d24e00ec 100644
--- a/sal/inc/rtl/uri.h
+++ b/sal/inc/rtl/uri.h
@@ -29,8 +29,11 @@
 #ifndef _RTL_URI_H_
 #define _RTL_URI_H_
 
+#include "sal/config.h"
+
 #include "rtl/textenc.h"
 #include "rtl/ustring.h"
+#include "sal/saldllapi.h"
 #include "sal/types.h"
 
 #if defined __cplusplus
diff --git a/sal/inc/rtl/ustrbuf.h b/sal/inc/rtl/ustrbuf.h
index 1051d0db7fdc..95205664e116 100644
--- a/sal/inc/rtl/ustrbuf.h
+++ b/sal/inc/rtl/ustrbuf.h
@@ -29,7 +29,10 @@
 #ifndef _RTL_USTRBUF_H_
 #define _RTL_USTRBUF_H_
 
-#include <rtl/ustring.h>
+#include "sal/config.h"
+
+#include "rtl/ustring.h"
+#include "sal/saldllapi.h"
 
 #ifdef __cplusplus
 extern "C" {
diff --git a/sal/inc/rtl/ustring.h b/sal/inc/rtl/ustring.h
index 0e95c51a21d8..5b4982ec1461 100644
--- a/sal/inc/rtl/ustring.h
+++ b/sal/inc/rtl/ustring.h
@@ -29,10 +29,13 @@
 #ifndef _RTL_USTRING_H_
 #define _RTL_USTRING_H_
 
-#include <sal/types.h>
-#include <osl/interlck.h>
-#include <rtl/string.h>
-#include <rtl/textenc.h>
+#include "sal/config.h"
+
+#include "osl/interlck.h"
+#include "rtl/string.h"
+#include "rtl/textenc.h"
+#include "sal/saldllapi.h"
+#include "sal/types.h"
 
 #ifdef __cplusplus
 extern "C" {
diff --git a/sal/inc/rtl/uuid.h b/sal/inc/rtl/uuid.h
index 9d831e0f9146..477a6b3d47dc 100644
--- a/sal/inc/rtl/uuid.h
+++ b/sal/inc/rtl/uuid.h
@@ -28,9 +28,11 @@
 #ifndef _RTL_UUID_H_
 #define _RTL_UUID_H_
 
+#include "sal/config.h"
 
-#include <sal/types.h>
-#include <rtl/string.h>
+#include "rtl/string.h"
+#include "sal/saldllapi.h"
+#include "sal/types.h"
 
 /**
    @file