5 files changed, 12 insertions, 4 deletions
diff --git a/include/o3tl/strong_int.hxx b/include/o3tl/strong_int.hxx
index 2c9177b405e0..c0378e344c69 100644
--- a/include/o3tl/strong_int.hxx
+++ b/include/o3tl/strong_int.hxx
@@ -25,6 +25,8 @@
 #include <cassert>
 #include <type_traits>
 
+#include <config_global.h>
+
 namespace o3tl
 {
 
diff --git a/include/osl/interlck.h b/include/osl/interlck.h
index a98c08cb511c..c0e06fd6f659 100644
--- a/include/osl/interlck.h
+++ b/include/osl/interlck.h
@@ -29,6 +29,10 @@
 #include <intrin.h>
 #endif
 
+#if defined LIBO_INTERNAL_ONLY
+#include "config_global.h"
+#endif
+
 #ifdef __cplusplus
 extern "C" {
 #endif
diff --git a/include/sal/config.h b/include/sal/config.h
index 7fcdbfab45ad..03a2f5b9fa21 100644
--- a/include/sal/config.h
+++ b/include/sal/config.h
@@ -20,12 +20,9 @@
 #ifndef INCLUDED_SAL_CONFIG_H
 #define INCLUDED_SAL_CONFIG_H
 
-#if defined LIBO_INTERNAL_ONLY
-#include "config_global.h"
-#if defined ANDROID && defined __cplusplus
+#if defined LIBO_INTERNAL_ONLY && defined ANDROID && defined __cplusplus
 #include <android/compatibility.hxx>
 #endif
-#endif
 
 #include <stdlib.h>
 
diff --git a/include/sal/types.h b/include/sal/types.h
index 5f6331709af3..8678562ccc76 100644
--- a/include/sal/types.h
+++ b/include/sal/types.h
@@ -27,6 +27,10 @@
 #include "sal/macros.h"
 #include "sal/typesizes.h"
 
+#if defined LIBO_INTERNAL_ONLY
+#include "config_global.h"
+#endif
+
 #ifdef __cplusplus
 extern "C" {
 #endif
diff --git a/include/svl/itemset.hxx b/include/svl/itemset.hxx
index d5a2b5eb5ad7..c8e32863ba84 100644
--- a/include/svl/itemset.hxx
+++ b/include/svl/itemset.hxx
@@ -27,6 +27,7 @@
 #include <type_traits>
 #include <memory>
 
+#include <config_global.h>
 #include <svl/svldllapi.h>
 #include <svl/poolitem.hxx>
 #include <svl/typedwhich.hxx>