diff --git a/include/sfx2/mailmodelapi.hxx b/include/sfx2/mailmodelapi.hxx
index 3ffd522792c4..911ce8f606e6 100644
--- a/include/sfx2/mailmodelapi.hxx
+++ b/include/sfx2/mailmodelapi.hxx
@@ -21,6 +21,7 @@
 
 #include <com/sun/star/frame/XFrame.hpp>
 #include <com/sun/star/frame/XModel.hpp>
+#include <com/sun/star/lang/XMultiServiceFactory.hpp>
 #include <rtl/ustring.hxx>
 #include <sfx2/dllapi.h>
 #include <tools/link.hxx>
diff --git a/include/sot/formats.hxx b/include/sot/formats.hxx
index c85a10fb7c03..fa3c768c211f 100644
--- a/include/sot/formats.hxx
+++ b/include/sot/formats.hxx
@@ -20,21 +20,6 @@
 #ifndef INCLUDED_SOT_FORMATS_HXX
 #define INCLUDED_SOT_FORMATS_HXX
 
-#ifdef _SOT_FORMATS_INCLUDE_SYSTEMFORMATS
-
-#ifdef WNT
-#ifdef _MSC_VER
-#pragma warning(push, 1)
-#pragma warning(disable: 4917)
-#endif
-#include <shlobj.h>
-#ifdef _MSC_VER
-#pragma warning(pop)
-#endif
-#endif
-
-#endif
-
 #include <tools/solar.h>
 
 // - predefined formats -
diff --git a/include/vcl/ITiledRenderable.hxx b/include/vcl/ITiledRenderable.hxx
index 963f1fc7054a..05f4e329cf22 100644
--- a/include/vcl/ITiledRenderable.hxx
+++ b/include/vcl/ITiledRenderable.hxx
@@ -15,6 +15,7 @@
 #include <LibreOfficeKit/LibreOfficeKitTypes.h>
 #include <tools/gen.hxx>
 #include <vcl/virdev.hxx>
+#include <com/sun/star/datatransfer/clipboard/XClipboardEx.hpp>
 
 namespace vcl
 {
diff --git a/sc/source/filter/excel/tokstack.cxx b/sc/source/filter/excel/tokstack.cxx
index 9a6f13ff3a5b..4bc6ba0e24fe 100644
--- a/sc/source/filter/excel/tokstack.cxx
+++ b/sc/source/filter/excel/tokstack.cxx
@@ -24,6 +24,7 @@
 
 #include <svl/sharedstringpool.hxx>
 
+#include <algorithm>
 #include <string.h>
 
 const sal_uInt16    TokenPool::nScTokenOff = 8192;
diff --git a/sc/source/filter/excel/xlformula.cxx b/sc/source/filter/excel/xlformula.cxx
index b1cd82caf52d..5d060cf739ba 100644
--- a/sc/source/filter/excel/xlformula.cxx
+++ b/sc/source/filter/excel/xlformula.cxx
@@ -19,6 +19,7 @@
 
 #include "xlformula.hxx"
 
+#include <algorithm>
 #include "compiler.hxx"
 #include "rangenam.hxx"
 #include "token.hxx"
diff --git a/sd/inc/strmname.h b/sd/inc/strmname.h
index 149f1565a621..3706f010340b 100644
--- a/sd/inc/strmname.h
+++ b/sd/inc/strmname.h
@@ -20,6 +20,8 @@
 #ifndef INCLUDED_SD_INC_STRMNAME_H
 #define INCLUDED_SD_INC_STRMNAME_H
 
+#include <rtl/ustring.hxx>
+
 // PowerPoint-Filter
 static const OUString pFilterPowerPoint97( "MS PowerPoint 97" );
 static const OUString pFilterPowerPoint97Template( "MS PowerPoint 97 Vorlage" );
diff --git a/sot/Library_sot.mk b/sot/Library_sot.mk
index 97381d0a88f5..a17ce3868b64 100644
--- a/sot/Library_sot.mk
+++ b/sot/Library_sot.mk
@@ -31,6 +31,11 @@ $(eval $(call gb_Library_add_defs,sot,\
 
 $(eval $(call gb_Library_set_precompiled_header,sot,$(SRCDIR)/sot/inc/pch/precompiled_sot))
 
+$(eval $(call gb_Library_set_include,sot,\
+    -I$(SRCDIR)/sot/inc \
+    $$(INCLUDE) \
+))
+
 $(eval $(call gb_Library_use_libraries,sot,\
     comphelper \
     cppu \
diff --git a/sot/inc/sysformats.hxx b/sot/inc/sysformats.hxx
new file mode 100644
index 000000000000..ccad25210050
--- /dev/null
+++ b/sot/inc/sysformats.hxx
@@ -0,0 +1,36 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
+/*
+ * This file is part of the LibreOffice project.
+ *
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/.
+ *
+ * This file incorporates work covered by the following license notice:
+ *
+ *   Licensed to the Apache Software Foundation (ASF) under one or more
+ *   contributor license agreements. See the NOTICE file distributed
+ *   with this work for additional information regarding copyright
+ *   ownership. The ASF licenses this file to you under the Apache
+ *   License, Version 2.0 (the "License"); you may not use this file
+ *   except in compliance with the License. You may obtain a copy of
+ *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
+ */
+
+#ifndef INCLUDED_SOT_SYSFORMATS_HXX
+#define INCLUDED_SOT_SYSFORMATS_HXX
+
+#ifdef WNT
+#ifdef _MSC_VER
+#pragma warning(push, 1)
+#pragma warning(disable: 4917)
+#endif
+#include <shlobj.h>
+#ifdef _MSC_VER
+#pragma warning(pop)
+#endif
+#endif
+
+#endif // INCLUDED_SOT_SYSFORMATS_HXX
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sot/source/base/exchange.cxx b/sot/source/base/exchange.cxx
index ce7574d6b9be..13ca02f52cc2 100644
--- a/sot/source/base/exchange.cxx
+++ b/sot/source/base/exchange.cxx
@@ -17,13 +17,13 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#define _SOT_FORMATS_INCLUDE_SYSTEMFORMATS
 #include <tools/debug.hxx>
 #include <tools/solar.h>
 #include <tools/globname.hxx>
 #include <sot/sotdata.hxx>
 #include <sot/exchange.hxx>
 #include <sot/formats.hxx>
+#include <sysformats.hxx>
 #include <comphelper/classids.hxx>
 #include <rtl/instance.hxx>
 #include <com/sun/star/uno/Sequence.hxx>
diff --git a/sot/source/base/formats.cxx b/sot/source/base/formats.cxx
index 948ee4ea8c40..a22d3c70258f 100644
--- a/sot/source/base/formats.cxx
+++ b/sot/source/base/formats.cxx
@@ -17,13 +17,12 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-
-#define _SOT_FORMATS_INCLUDE_SYSTEMFORMATS
 #include <tools/solar.h>
 
 #include <sot/exchange.hxx>
 #include <sot/formats.hxx>
-#include "sot/filelist.hxx"
+#include <sot/filelist.hxx>
+#include <sysformats.hxx>
 #include <comphelper/classids.hxx>
 
 #include <tools/globname.hxx>
diff --git a/svtools/source/toolpanel/paneltabbar.cxx b/svtools/source/toolpanel/paneltabbar.cxx
index fde226dfe2e2..93a8f04fd233 100644
--- a/svtools/source/toolpanel/paneltabbar.cxx
+++ b/svtools/source/toolpanel/paneltabbar.cxx
@@ -31,6 +31,7 @@
 #include <vcl/help.hxx>
 #include <vcl/virdev.hxx>
 #include <vcl/settings.hxx>
+#include <vcl/tabctrl.hxx>
 #include <tools/diagnose_ex.h>
 
 #include <memory>
diff --git a/vcl/opengl/win/gdiimpl.cxx b/vcl/opengl/win/gdiimpl.cxx
index dba32a8676de..f57c82d307e1 100644
--- a/vcl/opengl/win/gdiimpl.cxx
+++ b/vcl/opengl/win/gdiimpl.cxx
@@ -7,11 +7,8 @@
  * file, You can obtain one at http://mozilla.org/MPL/2.0/.
  */
 
-#include <o3tl/lru_map.hxx>
-
-
 #include "opengl/win/gdiimpl.hxx"
-
+#include <o3tl/lru_map.hxx>
 #include <win/wincomp.hxx>
 #include <win/saldata.hxx>
 #include <win/salframe.h>