15 files changed, 15 insertions, 0 deletions
diff --git a/cui/source/customize/cfgutil.cxx b/cui/source/customize/cfgutil.cxx
index 50ee47fdaba9..828205e31f93 100644
--- a/cui/source/customize/cfgutil.cxx
+++ b/cui/source/customize/cfgutil.cxx
@@ -56,6 +56,7 @@
 #include <vcl/treelistentry.hxx>
 #include <rtl/ustrbuf.hxx>
 #include <sal/log.hxx>
+#include <osl/diagnose.h>
 #include <unotools/configmgr.hxx>
 #include <dialmgr.hxx>
 #include <svl/stritem.hxx>
diff --git a/cui/source/dialogs/about.cxx b/cui/source/dialogs/about.cxx
index 648073c75f4c..a99a814d28e1 100644
--- a/cui/source/dialogs/about.cxx
+++ b/cui/source/dialogs/about.cxx
@@ -20,6 +20,7 @@
 #include <config_features.h>
 #include <osl/process.h>
 #include <sal/log.hxx>
+#include <osl/diagnose.h>
 #include <rtl/character.hxx>
 #include <vcl/layout.hxx>
 #include <vcl/weld.hxx>
diff --git a/cui/source/dialogs/cuihyperdlg.cxx b/cui/source/dialogs/cuihyperdlg.cxx
index 4b98847c9539..e106826bdeba 100644
--- a/cui/source/dialogs/cuihyperdlg.cxx
+++ b/cui/source/dialogs/cuihyperdlg.cxx
@@ -19,6 +19,7 @@
 
 #include <sal/config.h>
 
+#include <osl/diagnose.h>
 #include <comphelper/lok.hxx>
 #include <o3tl/make_unique.hxx>
 #include <vcl/settings.hxx>
diff --git a/cui/source/dialogs/hangulhanjadlg.cxx b/cui/source/dialogs/hangulhanjadlg.cxx
index 7b61df5813ec..cf2297ab6c81 100644
--- a/cui/source/dialogs/hangulhanjadlg.cxx
+++ b/cui/source/dialogs/hangulhanjadlg.cxx
@@ -25,6 +25,7 @@
 
 #include <algorithm>
 #include <sal/log.hxx>
+#include <osl/diagnose.h>
 #include <vcl/controllayout.hxx>
 #include <vcl/builderfactory.hxx>
 #include <vcl/decoview.hxx>
diff --git a/cui/source/dialogs/screenshotannotationdlg.cxx b/cui/source/dialogs/screenshotannotationdlg.cxx
index 5805c1f1537e..8c3f6cfc528f 100644
--- a/cui/source/dialogs/screenshotannotationdlg.cxx
+++ b/cui/source/dialogs/screenshotannotationdlg.cxx
@@ -41,6 +41,7 @@
 #include <vcl/button.hxx>
 #include <svtools/optionsdrawinglayer.hxx>
 #include <basegfx/matrix/b2dhommatrix.hxx>
+#include <set>
 
 using namespace com::sun::star;
 
diff --git a/cui/source/dialogs/showcols.cxx b/cui/source/dialogs/showcols.cxx
index 66ee00b34b9c..e1a454038638 100644
--- a/cui/source/dialogs/showcols.cxx
+++ b/cui/source/dialogs/showcols.cxx
@@ -19,6 +19,7 @@
 
 #include <showcols.hxx>
 
+#include <osl/diagnose.h>
 #include <vcl/msgbox.hxx>
 #include <com/sun/star/beans/XPropertySet.hpp>
 #include <comphelper/types.hxx>
diff --git a/cui/source/dialogs/zoom.cxx b/cui/source/dialogs/zoom.cxx
index 8423823cf113..7304c5cc1545 100644
--- a/cui/source/dialogs/zoom.cxx
+++ b/cui/source/dialogs/zoom.cxx
@@ -17,6 +17,7 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
+#include <osl/diagnose.h>
 #include <svl/itemset.hxx>
 #include <svl/itempool.hxx>
 #include <sfx2/objsh.hxx>
diff --git a/cui/source/inc/thesdlg.hxx b/cui/source/inc/thesdlg.hxx
index 5e32d0c5630f..97a78c6fe34e 100644
--- a/cui/source/inc/thesdlg.hxx
+++ b/cui/source/inc/thesdlg.hxx
@@ -29,6 +29,7 @@
 #include <svx/stddlg.hxx>
 
 #include <memory>
+#include <stack>
 
 class SvxThesaurusDialog;
 
diff --git a/cui/source/options/connpooloptions.cxx b/cui/source/options/connpooloptions.cxx
index 89a052ef95c4..0603423c63ad 100644
--- a/cui/source/options/connpooloptions.cxx
+++ b/cui/source/options/connpooloptions.cxx
@@ -17,6 +17,7 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
+#include <osl/diagnose.h>
 #include "connpooloptions.hxx"
 #include <svtools/editbrowsebox.hxx>
 #include <vcl/field.hxx>
diff --git a/cui/source/options/optasian.cxx b/cui/source/options/optasian.cxx
index 935d6576c913..db08f0a86493 100644
--- a/cui/source/options/optasian.cxx
+++ b/cui/source/options/optasian.cxx
@@ -20,6 +20,7 @@
 #include <memory>
 #include <map>
 #include <optasian.hxx>
+#include <osl/diagnose.h>
 #include <editeng/langitem.hxx>
 #include <editeng/unolingu.hxx>
 #include <o3tl/any.hxx>
diff --git a/cui/source/options/optchart.cxx b/cui/source/options/optchart.cxx
index 420b94f3f573..8846661ddbb7 100644
--- a/cui/source/options/optchart.cxx
+++ b/cui/source/options/optchart.cxx
@@ -23,6 +23,7 @@
 #include <vcl/weld.hxx>
 #include <vcl/svapp.hxx>
 #include <svx/svxids.hrc>
+#include <osl/diagnose.h>
 
 Color SvxDefaultColorOptPage::GetSelectEntryColor() const
 {
diff --git a/cui/source/options/optlingu.cxx b/cui/source/options/optlingu.cxx
index 37124377cbe1..abf4a4b3b5a4 100644
--- a/cui/source/options/optlingu.cxx
+++ b/cui/source/options/optlingu.cxx
@@ -52,6 +52,7 @@
 #include <sfx2/viewfrm.hxx>
 #include <vcl/svapp.hxx>
 #include <sal/log.hxx>
+#include <osl/diagnose.h>
 
 #include <svx/svxdlg.hxx>
 #include <editeng/optitems.hxx>
diff --git a/cui/source/options/optsave.cxx b/cui/source/options/optsave.cxx
index 49ea86844901..e44eb7dbf216 100644
--- a/cui/source/options/optsave.cxx
+++ b/cui/source/options/optsave.cxx
@@ -36,6 +36,7 @@
 #include <unotools/configitem.hxx>
 #include <unotools/optionsdlg.hxx>
 #include <sal/log.hxx>
+#include <osl/diagnose.h>
 
 #include <sfx2/fcontnr.hxx>
 
diff --git a/cui/source/tabpages/macroass.cxx b/cui/source/tabpages/macroass.cxx
index 186852f41a76..343783b8ccef 100644
--- a/cui/source/tabpages/macroass.cxx
+++ b/cui/source/tabpages/macroass.cxx
@@ -19,6 +19,7 @@
 
 #include <macroass.hxx>
 
+#include <osl/diagnose.h>
 #include <basic/basmgr.hxx>
 #include <comphelper/string.hxx>
 #include <svl/macitem.hxx>
diff --git a/cui/source/tabpages/paragrph.cxx b/cui/source/tabpages/paragrph.cxx
index c6f989d9f211..fde0bffd9804 100644
--- a/cui/source/tabpages/paragrph.cxx
+++ b/cui/source/tabpages/paragrph.cxx
@@ -18,6 +18,7 @@
  */
 
 #include <memory>
+#include <osl/diagnose.h>
 #include <svl/style.hxx>
 #include <sfx2/app.hxx>
 #include <sfx2/dialoghelper.hxx>