tdf#42949 Fix IWYU warnings in configmgr/*

Found with bin/find-unneeded-includes
Only removal proposals are dealt with here.

Change-Id: Iee703bad69bc3c47dc5960e560187ab1d1d9ff29
Reviewed-on: https://gerrit.libreoffice.org/72023
Tested-by: Jenkins
Reviewed-by: Stephan Bergmann <sbergman@redhat.com>

50 files changed, 29 insertions, 133 deletions

diff --git a/configmgr/IwyuFilter_configmgr.yaml b/configmgr/IwyuFilter_configmgr.yaml
new file mode 100644
index 000000000000..7ad9698c022f
--- /dev/null
+++ b/configmgr/IwyuFilter_configmgr.yaml
@@ -0,0 +1,15 @@
+---
+assumeFilename: configmgr/source/access.cxx
+blacklist:
+    configmgr/source/nodemap.hxx:
+    # Needed for direct member access
+    - node.hxx
+    configmgr/source/type.hxx:
+    # Needed for css shortcut
+    - sal/types.h
+    configmgr/source/access.cxx:
+    # Safer to keep for use in cppu:UnoType template
+    - com/sun/star/uno/XWeak.hpp
+    configmgr/source/dconf.cxx:
+    # Generic wrapper for dconf
+    - dconf/dconf.h
diff --git a/configmgr/qa/unit/test.cxx b/configmgr/qa/unit/test.cxx
index e403718916e9..6d98f36154ef 100644
--- a/configmgr/qa/unit/test.cxx
+++ b/configmgr/qa/unit/test.cxx
@@ -19,9 +19,6 @@
 
 #include <sal/config.h>
 
-#include <cstddef>
-#include <string_view>
-
 #include <com/sun/star/beans/NamedValue.hpp>
 #include <com/sun/star/beans/PropertyChangeEvent.hpp>
 #include <com/sun/star/beans/XPropertyChangeListener.hpp>
@@ -38,27 +35,21 @@
 #include <com/sun/star/lang/XSingleServiceFactory.hpp>
 #include <com/sun/star/uno/Any.hxx>
 #include <com/sun/star/uno/Reference.hxx>
-#include <com/sun/star/uno/RuntimeException.hpp>
 #include <com/sun/star/uno/Sequence.hxx>
-#include <com/sun/star/uno/XComponentContext.hpp>
 #include <com/sun/star/uno/XInterface.hpp>
 #include <com/sun/star/util/XChangesBatch.hpp>
 #include <cppuhelper/implbase.hxx>
-#include <osl/conditn.hxx>
-#include <osl/thread.h>
-#include <osl/thread.hxx>
 #include <osl/time.h>
 #include <rtl/ref.hxx>
-#include <rtl/string.h>
-#include <rtl/textcvt.h>
-#include <rtl/ustrbuf.hxx>
-#include <rtl/ustring.h>
 #include <rtl/ustring.hxx>
 #include <sal/types.h>
 #include <comphelper/processfactory.hxx>
 #include <comphelper/configuration.hxx>
 #include <comphelper/configurationlistener.hxx>
-#include <unotest/bootstrapfixturebase.hxx>
+#include <cppunit/TestAssert.h>
+#include <cppunit/TestFixture.h>
+#include <cppunit/extensions/HelperMacros.h>
+#include <cppunit/plugin/TestPlugIn.h>
 #include <officecfg/Office/Math.hxx>
 
 namespace {
diff --git a/configmgr/source/access.cxx b/configmgr/source/access.cxx
index 6e8fc5227590..f4d8521dffc7 100644
--- a/configmgr/source/access.cxx
+++ b/configmgr/source/access.cxx
@@ -26,7 +26,6 @@
 #include <com/sun/star/beans/Property.hpp>
 #include <com/sun/star/beans/PropertyAttribute.hpp>
 #include <com/sun/star/beans/PropertyChangeEvent.hpp>
-#include <com/sun/star/beans/PropertyVetoException.hpp>
 #include <com/sun/star/beans/UnknownPropertyException.hpp>
 #include <com/sun/star/beans/XExactName.hpp>
 #include <com/sun/star/beans/XHierarchicalPropertySet.hpp>
@@ -53,8 +52,6 @@
 #include <com/sun/star/lang/DisposedException.hpp>
 #include <com/sun/star/lang/EventObject.hpp>
 #include <com/sun/star/lang/IllegalArgumentException.hpp>
-#include <com/sun/star/lang/NoSupportException.hpp>
-#include <com/sun/star/lang/WrappedTargetException.hpp>
 #include <com/sun/star/lang/XComponent.hpp>
 #include <com/sun/star/lang/XEventListener.hpp>
 #include <com/sun/star/lang/XServiceInfo.hpp>
@@ -66,7 +63,6 @@
 #include <com/sun/star/uno/RuntimeException.hpp>
 #include <com/sun/star/uno/Sequence.hxx>
 #include <com/sun/star/uno/Type.hxx>
-#include <com/sun/star/uno/TypeClass.hpp>
 #include <com/sun/star/uno/XInterface.hpp>
 #include <com/sun/star/uno/XWeak.hpp>
 #include <com/sun/star/util/ElementChange.hpp>
@@ -82,7 +78,6 @@
 #include <rtl/character.hxx>
 #include <rtl/ref.hxx>
 #include <rtl/ustrbuf.hxx>
-#include <rtl/ustring.h>
 #include <rtl/ustring.hxx>
 #include <sal/log.hxx>
 #include <sal/types.h>
diff --git a/configmgr/source/access.hxx b/configmgr/source/access.hxx
index 5fc8d183f5be..d3cf9011a0ca 100644
--- a/configmgr/source/access.hxx
+++ b/configmgr/source/access.hxx
@@ -22,14 +22,11 @@
 
 #include <sal/config.h>
 
-#include <map>
 #include <memory>
 #include <set>
 #include <vector>
 #include "config_map.hxx"
 
-#include <com/sun/star/beans/PropertyVetoException.hpp>
-#include <com/sun/star/beans/UnknownPropertyException.hpp>
 #include <com/sun/star/beans/XExactName.hpp>
 #include <com/sun/star/beans/XHierarchicalPropertySet.hpp>
 #include <com/sun/star/beans/XHierarchicalPropertySetInfo.hpp>
@@ -38,23 +35,16 @@
 #include <com/sun/star/beans/XProperty.hpp>
 #include <com/sun/star/beans/XPropertySet.hpp>
 #include <com/sun/star/beans/XPropertySetInfo.hpp>
-#include <com/sun/star/container/ElementExistException.hpp>
-#include <com/sun/star/container/NoSuchElementException.hpp>
 #include <com/sun/star/container/XContainer.hpp>
 #include <com/sun/star/container/XHierarchicalName.hpp>
 #include <com/sun/star/container/XHierarchicalNameReplace.hpp>
 #include <com/sun/star/container/XNameContainer.hpp>
 #include <com/sun/star/container/XNamed.hpp>
-#include <com/sun/star/lang/IllegalArgumentException.hpp>
-#include <com/sun/star/lang/NoSupportException.hpp>
-#include <com/sun/star/lang/WrappedTargetException.hpp>
 #include <com/sun/star/lang/XComponent.hpp>
 #include <com/sun/star/lang/XServiceInfo.hpp>
 #include <com/sun/star/lang/XTypeProvider.hpp>
 #include <com/sun/star/lang/XSingleServiceFactory.hpp>
-#include <com/sun/star/uno/Exception.hpp>
 #include <com/sun/star/uno/Reference.hxx>
-#include <com/sun/star/uno/RuntimeException.hpp>
 #include <com/sun/star/uno/Sequence.hxx>
 #include <cppuhelper/weak.hxx>
 #include <osl/interlck.h>
diff --git a/configmgr/source/additions.hxx b/configmgr/source/additions.hxx
index d7394411b1e0..9a82252b9ffc 100644
--- a/configmgr/source/additions.hxx
+++ b/configmgr/source/additions.hxx
@@ -22,6 +22,8 @@
 
 #include <sal/config.h>
 
+#include <rtl/ustring.hxx>
+
 #include <vector>
 
 namespace configmgr {
diff --git a/configmgr/source/broadcaster.cxx b/configmgr/source/broadcaster.cxx
index 206b6366f3f3..24b047e9d5a4 100644
--- a/configmgr/source/broadcaster.cxx
+++ b/configmgr/source/broadcaster.cxx
@@ -33,9 +33,7 @@
 #include <com/sun/star/uno/XInterface.hpp>
 #include <com/sun/star/util/XChangesListener.hpp>
 #include <cppuhelper/exc_hlp.hxx>
-#include <rtl/string.h>
 #include <rtl/ustrbuf.hxx>
-#include <rtl/ustring.h>
 #include <rtl/ustring.hxx>
 
 #include "broadcaster.hxx"
diff --git a/configmgr/source/childaccess.cxx b/configmgr/source/childaccess.cxx
index 9433548e8e55..82ca003c1703 100644
--- a/configmgr/source/childaccess.cxx
+++ b/configmgr/source/childaccess.cxx
@@ -27,7 +27,6 @@
 #include <com/sun/star/lang/XUnoTunnel.hpp>
 #include <com/sun/star/uno/Any.hxx>
 #include <com/sun/star/uno/Reference.hxx>
-#include <com/sun/star/uno/RuntimeException.hpp>
 #include <com/sun/star/uno/Sequence.hxx>
 #include <com/sun/star/uno/Type.hxx>
 #include <com/sun/star/uno/XInterface.hpp>
@@ -37,9 +36,7 @@
 #include <comphelper/servicehelper.hxx>
 #include <osl/mutex.hxx>
 #include <rtl/ref.hxx>
-#include <rtl/string.h>
 #include <rtl/ustrbuf.hxx>
-#include <rtl/ustring.h>
 #include <rtl/ustring.hxx>
 #include <sal/types.h>
 
@@ -47,7 +44,6 @@
 #include "childaccess.hxx"
 #include "components.hxx"
 #include "data.hxx"
-#include "groupnode.hxx"
 #include "localizedpropertynode.hxx"
 #include "localizedvaluenode.hxx"
 #include "lock.hxx"
@@ -55,7 +51,6 @@
 #include "node.hxx"
 #include "propertynode.hxx"
 #include "rootaccess.hxx"
-#include "setnode.hxx"
 #include "type.hxx"
 
 namespace configmgr {
diff --git a/configmgr/source/childaccess.hxx b/configmgr/source/childaccess.hxx
index eeb7eddeab62..7a5a692d56a9 100644
--- a/configmgr/source/childaccess.hxx
+++ b/configmgr/source/childaccess.hxx
@@ -26,10 +26,8 @@
 #include <vector>
 
 #include <com/sun/star/container/XChild.hpp>
-#include <com/sun/star/lang/NoSupportException.hpp>
 #include <com/sun/star/lang/XUnoTunnel.hpp>
 #include <com/sun/star/uno/Reference.hxx>
-#include <com/sun/star/uno/RuntimeException.hpp>
 #include <com/sun/star/uno/Sequence.hxx>
 #include <rtl/ref.hxx>
 #include <sal/types.h>
diff --git a/configmgr/source/components.cxx b/configmgr/source/components.cxx
index 7f2eb3afcfc0..939d226e964d 100644
--- a/configmgr/source/components.cxx
+++ b/configmgr/source/components.cxx
@@ -19,10 +19,8 @@
 
 #include <sal/config.h>
 
-#include <algorithm>
 #include <cassert>
 #include <chrono>
-#include <cstddef>
 #include <vector>
 #include <set>
 
diff --git a/configmgr/source/components.hxx b/configmgr/source/components.hxx
index 5006c864acdc..dc64d3c995a3 100644
--- a/configmgr/source/components.hxx
+++ b/configmgr/source/components.hxx
@@ -22,7 +22,6 @@
 
 #include <sal/config.h>
 
-#include <map>
 #include <memory>
 #include <set>
 
diff --git a/configmgr/source/configurationprovider.cxx b/configmgr/source/configurationprovider.cxx
index a4da5152cd48..5c50aa8b1ec0 100644
--- a/configmgr/source/configurationprovider.cxx
+++ b/configmgr/source/configurationprovider.cxx
@@ -21,7 +21,6 @@
 
 #include <cassert>
 #include <memory>
-#include <vector>
 
 #include <com/sun/star/beans/NamedValue.hpp>
 #include <com/sun/star/beans/PropertyValue.hpp>
@@ -35,9 +34,7 @@
 #include <com/sun/star/uno/Any.hxx>
 #include <com/sun/star/uno/Exception.hpp>
 #include <com/sun/star/uno/Reference.hxx>
-#include <com/sun/star/uno/RuntimeException.hpp>
 #include <com/sun/star/uno/Sequence.hxx>
-#include <com/sun/star/uno/XComponentContext.hpp>
 #include <com/sun/star/uno/XInterface.hpp>
 #include <com/sun/star/util/XFlushListener.hpp>
 #include <com/sun/star/util/XFlushable.hpp>
@@ -48,7 +45,6 @@
 #include <cppuhelper/compbase.hxx>
 #include <cppuhelper/factory.hxx>
 #include <cppuhelper/implbase.hxx>
-#include <cppuhelper/interfacecontainer.hxx>
 #include <cppuhelper/supportsservice.hxx>
 #include <cppuhelper/weak.hxx>
 #include <osl/mutex.hxx>
diff --git a/configmgr/source/configurationprovider.hxx b/configmgr/source/configurationprovider.hxx
index 143ce9548fcd..c8e28e11f823 100644
--- a/configmgr/source/configurationprovider.hxx
+++ b/configmgr/source/configurationprovider.hxx
@@ -25,7 +25,6 @@
 #include <com/sun/star/uno/Reference.hxx>
 #include <com/sun/star/uno/Sequence.hxx>
 #include <cppuhelper/factory.hxx>
-#include <sal/types.h>
 
 namespace com { namespace sun { namespace star {
     namespace lang { class XSingleComponentFactory; }
diff --git a/configmgr/source/configurationregistry.cxx b/configmgr/source/configurationregistry.cxx
index b049299c1fea..abca258b3b28 100644
--- a/configmgr/source/configurationregistry.cxx
+++ b/configmgr/source/configurationregistry.cxx
@@ -22,8 +22,6 @@
 #include <cassert>
 
 #include <com/sun/star/beans/NamedValue.hpp>
-#include <com/sun/star/beans/Property.hpp>
-#include <com/sun/star/beans/XProperty.hpp>
 #include <com/sun/star/container/NoSuchElementException.hpp>
 #include <com/sun/star/container/XHierarchicalNameAccess.hpp>
 #include <com/sun/star/container/XNamed.hpp>
@@ -32,7 +30,6 @@
 #include <com/sun/star/lang/WrappedTargetRuntimeException.hpp>
 #include <com/sun/star/registry/InvalidRegistryException.hpp>
 #include <com/sun/star/registry/InvalidValueException.hpp>
-#include <com/sun/star/registry/MergeConflictException.hpp>
 #include <com/sun/star/registry/RegistryKeyType.hpp>
 #include <com/sun/star/registry/RegistryValueType.hpp>
 #include <com/sun/star/registry/XRegistryKey.hpp>
@@ -54,7 +51,6 @@
 #include <cppuhelper/supportsservice.hxx>
 #include <cppuhelper/weak.hxx>
 #include <osl/mutex.hxx>
-#include <rtl/ustring.h>
 #include <rtl/ustring.hxx>
 #include <sal/types.h>
 
diff --git a/configmgr/source/configurationregistry.hxx b/configmgr/source/configurationregistry.hxx
index 75c35884e044..0477facb3d65 100644
--- a/configmgr/source/configurationregistry.hxx
+++ b/configmgr/source/configurationregistry.hxx
@@ -24,7 +24,6 @@
 
 #include <com/sun/star/uno/Reference.hxx>
 #include <com/sun/star/uno/Sequence.hxx>
-#include <sal/types.h>
 
 namespace com { namespace sun { namespace star {
     namespace uno {
diff --git a/configmgr/source/data.cxx b/configmgr/source/data.cxx
index 6eb2d5902db3..cf6b500cc567 100644
--- a/configmgr/source/data.cxx
+++ b/configmgr/source/data.cxx
@@ -22,9 +22,7 @@
 #include <algorithm>
 #include <cassert>
 
-#include <com/sun/star/uno/Reference.hxx>
 #include <com/sun/star/uno/RuntimeException.hpp>
-#include <com/sun/star/uno/XInterface.hpp>
 #include <rtl/ref.hxx>
 #include <rtl/string.h>
 #include <rtl/ustrbuf.hxx>
@@ -35,7 +33,6 @@
 
 #include "additions.hxx"
 #include "data.hxx"
-#include "groupnode.hxx"
 #include "node.hxx"
 #include "nodemap.hxx"
 #include "rootnode.hxx"
diff --git a/configmgr/source/defaultprovider.cxx b/configmgr/source/defaultprovider.cxx
index 0032bf3835ff..7459ca016396 100644
--- a/configmgr/source/defaultprovider.cxx
+++ b/configmgr/source/defaultprovider.cxx
@@ -21,10 +21,8 @@
 
 #include <com/sun/star/uno/Reference.hxx>
 #include <com/sun/star/uno/Sequence.hxx>
-#include <com/sun/star/uno/XComponentContext.hpp>
 #include <com/sun/star/uno/XInterface.hpp>
 #include <osl/mutex.hxx>
-#include <rtl/ustring.h>
 #include <rtl/ustring.hxx>
 
 #include "configurationprovider.hxx"
diff --git a/configmgr/source/defaultprovider.hxx b/configmgr/source/defaultprovider.hxx
index d054137bf1d1..59e4222461d0 100644
--- a/configmgr/source/defaultprovider.hxx
+++ b/configmgr/source/defaultprovider.hxx
@@ -24,7 +24,6 @@
 
 #include <com/sun/star/uno/Reference.hxx>
 #include <com/sun/star/uno/Sequence.hxx>
-#include <sal/types.h>
 
 namespace com { namespace sun { namespace star {
     namespace uno {
diff --git a/configmgr/source/localizedpropertynode.cxx b/configmgr/source/localizedpropertynode.cxx
index 5c846141c0c5..6e47264f22bd 100644
--- a/configmgr/source/localizedpropertynode.cxx
+++ b/configmgr/source/localizedpropertynode.cxx
@@ -20,8 +20,6 @@
 #include <sal/config.h>
 
 #include <rtl/ref.hxx>
-#include <rtl/ustring.h>
-#include <rtl/ustring.hxx>
 
 #include "localizedpropertynode.hxx"
 #include "node.hxx"
diff --git a/configmgr/source/localizedvaluenode.cxx b/configmgr/source/localizedvaluenode.cxx
index a0772979e19d..91587bfa13c9 100644
--- a/configmgr/source/localizedvaluenode.cxx
+++ b/configmgr/source/localizedvaluenode.cxx
@@ -21,7 +21,6 @@
 
 #include <com/sun/star/uno/Any.hxx>
 #include <rtl/ref.hxx>
-#include <rtl/ustring.h>
 #include <rtl/ustring.hxx>
 
 #include "localizedvaluenode.hxx"
diff --git a/configmgr/source/modifications.hxx b/configmgr/source/modifications.hxx
index 2b4dfba0d923..ac33049ae6e1 100644
--- a/configmgr/source/modifications.hxx
+++ b/configmgr/source/modifications.hxx
@@ -24,6 +24,8 @@
 
 #include <vector>
 
+#include <rtl/ustring.hxx>
+
 #include <boost/unordered_map.hpp>
 #include <config_dconf.h>
 
diff --git a/configmgr/source/node.cxx b/configmgr/source/node.cxx
index e476c9e65603..8f00d3887da3 100644
--- a/configmgr/source/node.cxx
+++ b/configmgr/source/node.cxx
@@ -21,11 +21,8 @@
 
 #include <cassert>
 
-#include <com/sun/star/uno/Reference.hxx>
 #include <com/sun/star/uno/RuntimeException.hpp>
-#include <com/sun/star/uno/XInterface.hpp>
 #include <rtl/ref.hxx>
-#include <rtl/ustring.h>
 #include <rtl/ustring.hxx>
 
 #include "data.hxx"
diff --git a/configmgr/source/node.hxx b/configmgr/source/node.hxx
index 022c42a110f1..afb922500458 100644
--- a/configmgr/source/node.hxx
+++ b/configmgr/source/node.hxx
@@ -23,6 +23,7 @@
 #include <sal/config.h>
 
 #include <rtl/ref.hxx>
+#include <rtl/ustring.hxx>
 #include <salhelper/simplereferenceobject.hxx>
 
 namespace configmgr {
diff --git a/configmgr/source/nodemap.cxx b/configmgr/source/nodemap.cxx
index 71c814138706..defbc6868b32 100644
--- a/configmgr/source/nodemap.cxx
+++ b/configmgr/source/nodemap.cxx
@@ -19,7 +19,6 @@
 
 #include <sal/config.h>
 
-#include <algorithm>
 #include <cassert>
 
 #include <rtl/ustring.hxx>
diff --git a/configmgr/source/parsemanager.cxx b/configmgr/source/parsemanager.cxx
index 192b34aecf1e..36dea373dca1 100644
--- a/configmgr/source/parsemanager.cxx
+++ b/configmgr/source/parsemanager.cxx
@@ -22,8 +22,6 @@
 #include <cassert>
 #include <set>
 
-#include <com/sun/star/container/NoSuchElementException.hpp>
-#include <com/sun/star/uno/RuntimeException.hpp>
 #include <sal/log.hxx>
 #include <sal/types.h>
 #include <xmlreader/span.hxx>
diff --git a/configmgr/source/parsemanager.hxx b/configmgr/source/parsemanager.hxx
index 478211ff4221..86eb2db5ac9f 100644
--- a/configmgr/source/parsemanager.hxx
+++ b/configmgr/source/parsemanager.hxx
@@ -24,10 +24,7 @@
 
 #include <set>
 
-#include <com/sun/star/container/NoSuchElementException.hpp>
-#include <com/sun/star/uno/RuntimeException.hpp>
 #include <rtl/ref.hxx>
-#include <sal/types.h>
 #include <salhelper/simplereferenceobject.hxx>
 #include <xmlreader/span.hxx>
 #include <xmlreader/xmlreader.hxx>
diff --git a/configmgr/source/partial.cxx b/configmgr/source/partial.cxx
index 911a2ae62d59..f31e98549684 100644
--- a/configmgr/source/partial.cxx
+++ b/configmgr/source/partial.cxx
@@ -20,12 +20,9 @@
 #include <sal/config.h>
 
 #include <cassert>
-#include <map>
 #include <set>
 
 #include <com/sun/star/uno/RuntimeException.hpp>
-#include <com/sun/star/uno/XInterface.hpp>
-#include <rtl/ustring.h>
 #include <rtl/ustring.hxx>
 #include <sal/types.h>
 
diff --git a/configmgr/source/propertynode.cxx b/configmgr/source/propertynode.cxx
index 39ddccfa11ff..119bce5c9be3 100644
--- a/configmgr/source/propertynode.cxx
+++ b/configmgr/source/propertynode.cxx
@@ -24,7 +24,6 @@
 #include <com/sun/star/beans/Optional.hpp>
 #include <com/sun/star/uno/Any.hxx>
 #include <rtl/ref.hxx>
-#include <rtl/ustring.h>
 #include <rtl/ustring.hxx>
 #include <sal/log.hxx>
 
diff --git a/configmgr/source/readonlyaccess.cxx b/configmgr/source/readonlyaccess.cxx
index b14ad3dc59b8..ec8adab39848 100644
--- a/configmgr/source/readonlyaccess.cxx
+++ b/configmgr/source/readonlyaccess.cxx
@@ -9,25 +9,21 @@
 
 #include <sal/config.h>
 
-#include <com/sun/star/container/NoSuchElementException.hpp>
 #include <com/sun/star/container/XHierarchicalNameAccess.hpp>
 #include <com/sun/star/lang/IllegalArgumentException.hpp>
 #include <com/sun/star/lang/NotInitializedException.hpp>
 #include <com/sun/star/lang/XInitialization.hpp>
 #include <com/sun/star/lang/XServiceInfo.hpp>
 #include <com/sun/star/uno/Any.hxx>
-#include <com/sun/star/uno/Exception.hpp>
 #include <com/sun/star/uno/Reference.hxx>
 #include <com/sun/star/uno/RuntimeException.hpp>
 #include <com/sun/star/uno/Sequence.hxx>
-#include <com/sun/star/uno/XComponentContext.hpp>
 #include <com/sun/star/uno/XInterface.hpp>
 #include <cppuhelper/implbase.hxx>
 #include <cppuhelper/supportsservice.hxx>
 #include <cppuhelper/weak.hxx>
 #include <osl/mutex.hxx>
 #include <rtl/ref.hxx>
-#include <rtl/ustring.h>
 #include <rtl/ustring.hxx>
 #include <sal/types.h>
 
diff --git a/configmgr/source/readonlyaccess.hxx b/configmgr/source/readonlyaccess.hxx
index c8d1a336c321..48c14946d6f7 100644
--- a/configmgr/source/readonlyaccess.hxx
+++ b/configmgr/source/readonlyaccess.hxx
@@ -12,7 +12,6 @@
 
 #include <com/sun/star/uno/Reference.hxx>
 #include <com/sun/star/uno/Sequence.hxx>
-#include <sal/types.h>
 
 namespace com { namespace sun { namespace star {
     namespace uno {
diff --git a/configmgr/source/readwriteaccess.cxx b/configmgr/source/readwriteaccess.cxx
index c7721c16ac57..4506b10ce3c0 100644
--- a/configmgr/source/readwriteaccess.cxx
+++ b/configmgr/source/readwriteaccess.cxx
@@ -10,26 +10,20 @@
 #include <sal/config.h>
 
 #include <com/sun/star/configuration/XReadWriteAccess.hpp>
-#include <com/sun/star/container/NoSuchElementException.hpp>
 #include <com/sun/star/lang/IllegalArgumentException.hpp>
 #include <com/sun/star/lang/NotInitializedException.hpp>
-#include <com/sun/star/lang/WrappedTargetException.hpp>
 #include <com/sun/star/lang/XInitialization.hpp>
 #include <com/sun/star/lang/XServiceInfo.hpp>
 #include <com/sun/star/uno/Any.hxx>
-#include <com/sun/star/uno/Exception.hpp>
 #include <com/sun/star/uno/Reference.hxx>
 #include <com/sun/star/uno/RuntimeException.hpp>
 #include <com/sun/star/uno/Sequence.hxx>
-#include <com/sun/star/uno/XComponentContext.hpp>
 #include <com/sun/star/uno/XInterface.hpp>
-#include <com/sun/star/util/ChangesSet.hpp>
 #include <cppuhelper/implbase.hxx>
 #include <cppuhelper/supportsservice.hxx>
 #include <cppuhelper/weak.hxx>
 #include <osl/mutex.hxx>
 #include <rtl/ref.hxx>
-#include <rtl/ustring.h>
 #include <rtl/ustring.hxx>
 #include <sal/types.h>
 
diff --git a/configmgr/source/readwriteaccess.hxx b/configmgr/source/readwriteaccess.hxx
index d891662d15aa..0413af35e60d 100644
--- a/configmgr/source/readwriteaccess.hxx
+++ b/configmgr/source/readwriteaccess.hxx
@@ -12,7 +12,6 @@
 
 #include <com/sun/star/uno/Reference.hxx>
 #include <com/sun/star/uno/Sequence.hxx>
-#include <sal/types.h>
 
 namespace com { namespace sun { namespace star {
     namespace uno {
diff --git a/configmgr/source/rootaccess.cxx b/configmgr/source/rootaccess.cxx
index 25673975a9e6..0db8b7ed5480 100644
--- a/configmgr/source/rootaccess.cxx
+++ b/configmgr/source/rootaccess.cxx
@@ -24,7 +24,6 @@
 
 #include <com/sun/star/lang/DisposedException.hpp>
 #include <com/sun/star/lang/EventObject.hpp>
-#include <com/sun/star/lang/WrappedTargetException.hpp>
 #include <com/sun/star/uno/Any.hxx>
 #include <com/sun/star/uno/Reference.hxx>
 #include <com/sun/star/uno/RuntimeException.hpp>
@@ -42,11 +41,9 @@
 #include <cppuhelper/weak.hxx>
 #include <osl/mutex.hxx>
 #include <rtl/ref.hxx>
-#include <rtl/ustring.h>
 #include <rtl/ustring.hxx>
 
 #include "broadcaster.hxx"
-#include "childaccess.hxx"
 #include "components.hxx"
 #include "data.hxx"
 #include "lock.hxx"
diff --git a/configmgr/source/rootaccess.hxx b/configmgr/source/rootaccess.hxx
index 389cc9ad62b1..042c2afeaaf4 100644
--- a/configmgr/source/rootaccess.hxx
+++ b/configmgr/source/rootaccess.hxx
@@ -26,9 +26,6 @@
 #include <set>
 #include <vector>
 
-#include <com/sun/star/lang/WrappedTargetException.hpp>
-#include <com/sun/star/uno/RuntimeException.hpp>
-#include <com/sun/star/util/ChangesSet.hpp>
 #include <com/sun/star/util/XChangesBatch.hpp>
 #include <com/sun/star/util/XChangesNotifier.hpp>
 #include <rtl/ref.hxx>
diff --git a/configmgr/source/rootnode.cxx b/configmgr/source/rootnode.cxx
index aebc3cb82b00..ce70d688c62c 100644
--- a/configmgr/source/rootnode.cxx
+++ b/configmgr/source/rootnode.cxx
@@ -13,7 +13,6 @@
 
 #include "data.hxx"
 #include "node.hxx"
-#include "nodemap.hxx"
 #include "rootnode.hxx"
 
 namespace configmgr {
diff --git a/configmgr/source/services.cxx b/configmgr/source/services.cxx
index 27675f93d766..48ccd8a33c56 100644
--- a/configmgr/source/services.cxx
+++ b/configmgr/source/services.cxx
@@ -21,9 +21,7 @@
 
 #include <cassert>
 
-#include <com/sun/star/uno/Exception.hpp>
 #include <com/sun/star/uno/Reference.hxx>
-#include <com/sun/star/uno/XComponentContext.hpp>
 #include <com/sun/star/uno/XInterface.hpp>
 #include <cppuhelper/factory.hxx>
 #include <cppuhelper/implementationentry.hxx>
diff --git a/configmgr/source/setnode.cxx b/configmgr/source/setnode.cxx
index eac56f70f476..cd3a437e0357 100644
--- a/configmgr/source/setnode.cxx
+++ b/configmgr/source/setnode.cxx
@@ -20,7 +20,6 @@
 #include <sal/config.h>
 
 #include <algorithm>
-#include <functional>
 #include <vector>
 
 #include <rtl/ref.hxx>
diff --git a/configmgr/source/type.cxx b/configmgr/source/type.cxx
index ab84fcb9c3bb..b8fab28ac2c8 100644
--- a/configmgr/source/type.cxx
+++ b/configmgr/source/type.cxx
@@ -23,13 +23,9 @@
 
 #include <com/sun/star/uno/Any.hxx>
 #include <com/sun/star/uno/RuntimeException.hpp>
-#include <com/sun/star/uno/Sequence.hxx>
 #include <com/sun/star/uno/Type.hxx>
 #include <com/sun/star/uno/TypeClass.hpp>
-#include <com/sun/star/uno/XInterface.hpp>
 #include <cppu/unotype.hxx>
-#include <rtl/string.h>
-#include <rtl/ustring.h>
 #include <rtl/ustring.hxx>
 #include <sal/types.h>
 
diff --git a/configmgr/source/type.hxx b/configmgr/source/type.hxx
index 8550796b22d3..eaac26ec1c2e 100644
--- a/configmgr/source/type.hxx
+++ b/configmgr/source/type.hxx
@@ -21,6 +21,7 @@
 #define INCLUDED_CONFIGMGR_SOURCE_TYPE_HXX
 
 #include <sal/config.h>
+#include <sal/types.h>
 
 namespace com { namespace sun { namespace star { namespace uno {
     class Any;
diff --git a/configmgr/source/update.cxx b/configmgr/source/update.cxx
index e084a920e614..f6d899764e47 100644
--- a/configmgr/source/update.cxx
+++ b/configmgr/source/update.cxx
@@ -25,15 +25,12 @@
 
 #include <com/sun/star/configuration/XUpdate.hpp>
 #include <com/sun/star/uno/Reference.hxx>
-#include <com/sun/star/uno/RuntimeException.hpp>
 #include <com/sun/star/uno/Sequence.hxx>
-#include <com/sun/star/uno/XComponentContext.hpp>
 #include <com/sun/star/uno/XInterface.hpp>
 #include <cppuhelper/implbase.hxx>
 #include <cppuhelper/weak.hxx>
 #include <osl/mutex.hxx>
 #include <rtl/ref.hxx>
-#include <rtl/ustring.h>
 #include <rtl/ustring.hxx>
 #include <sal/types.h>
 
diff --git a/configmgr/source/update.hxx b/configmgr/source/update.hxx
index 6ea08645fd6b..85d8c895a5b3 100644
--- a/configmgr/source/update.hxx
+++ b/configmgr/source/update.hxx
@@ -24,7 +24,6 @@
 
 #include <com/sun/star/uno/Reference.hxx>
 #include <com/sun/star/uno/Sequence.hxx>
-#include <sal/types.h>
 
 namespace com { namespace sun { namespace star {
     namespace uno {
diff --git a/configmgr/source/valueparser.cxx b/configmgr/source/valueparser.cxx
index 4dda54c410e4..ceadf689f5b1 100644
--- a/configmgr/source/valueparser.cxx
+++ b/configmgr/source/valueparser.cxx
@@ -20,13 +20,10 @@
 #include <sal/config.h>
 
 #include <cassert>
-#include <set>
 
 #include <com/sun/star/uno/Any.hxx>
-#include <com/sun/star/uno/Reference.hxx>
 #include <com/sun/star/uno/RuntimeException.hpp>
 #include <com/sun/star/uno/Sequence.hxx>
-#include <com/sun/star/uno/XInterface.hpp>
 #include <comphelper/sequence.hxx>
 #include <rtl/string.h>
 #include <rtl/string.hxx>
@@ -42,7 +39,6 @@
 #include "propertynode.hxx"
 #include "type.hxx"
 #include "valueparser.hxx"
-#include "xmldata.hxx"
 
 namespace configmgr {
 
diff --git a/configmgr/source/valueparser.hxx b/configmgr/source/valueparser.hxx
index a1d585e89587..ccf2422b78a1 100644
--- a/configmgr/source/valueparser.hxx
+++ b/configmgr/source/valueparser.hxx
@@ -22,7 +22,6 @@
 
 #include <sal/config.h>
 
-#include <set>
 #include <vector>
 
 #include <rtl/ref.hxx>
diff --git a/configmgr/source/writemodfile.cxx b/configmgr/source/writemodfile.cxx
index 2122c3fdf947..017e925dee48 100644
--- a/configmgr/source/writemodfile.cxx
+++ b/configmgr/source/writemodfile.cxx
@@ -25,18 +25,14 @@
 #include <string_view>
 
 #include <com/sun/star/uno/Any.hxx>
-#include <com/sun/star/uno/Reference.hxx>
 #include <com/sun/star/uno/RuntimeException.hpp>
 #include <com/sun/star/uno/Sequence.hxx>
-#include <com/sun/star/uno/XInterface.hpp>
 #include <osl/file.h>
 #include <osl/file.hxx>
 #include <rtl/string.h>
 #include <rtl/string.hxx>
 #include <rtl/textcvt.h>
 #include <rtl/textenc.h>
-#include <rtl/ustrbuf.hxx>
-#include <rtl/ustring.h>
 #include <rtl/ustring.hxx>
 #include <rtl/strbuf.hxx>
 #include <sal/log.hxx>
diff --git a/configmgr/source/writemodfile.hxx b/configmgr/source/writemodfile.hxx
index 435a24caf63f..113c9c18127a 100644
--- a/configmgr/source/writemodfile.hxx
+++ b/configmgr/source/writemodfile.hxx
@@ -25,6 +25,8 @@
 #include <string_view>
 
 #include <rtl/strbuf.hxx>
+#include <rtl/ustring.hxx>
+#include <osl/file.h>
 
 namespace configmgr {
 
diff --git a/configmgr/source/xcdparser.cxx b/configmgr/source/xcdparser.cxx
index bc00b7b0b01d..a849e210b3b6 100644
--- a/configmgr/source/xcdparser.cxx
+++ b/configmgr/source/xcdparser.cxx
@@ -24,7 +24,6 @@
 #include <set>
 
 #include <com/sun/star/uno/RuntimeException.hpp>
-#include <com/sun/star/uno/XInterface.hpp>
 #include <rtl/ustring.hxx>
 #include <xmlreader/span.hxx>
 #include <xmlreader/xmlreader.hxx>
diff --git a/configmgr/source/xcsparser.cxx b/configmgr/source/xcsparser.cxx
index e7bed9cc02e4..2087aec55226 100644
--- a/configmgr/source/xcsparser.cxx
+++ b/configmgr/source/xcsparser.cxx
@@ -20,13 +20,10 @@
 #include <sal/config.h>
 
 #include <cassert>
-#include <cstddef>
 #include <set>
 
 #include <com/sun/star/uno/Any.hxx>
-#include <com/sun/star/uno/Reference.hxx>
 #include <com/sun/star/uno/RuntimeException.hpp>
-#include <com/sun/star/uno/XInterface.hpp>
 #include <rtl/ref.hxx>
 #include <rtl/strbuf.hxx>
 #include <rtl/string.hxx>
diff --git a/configmgr/source/xcuparser.cxx b/configmgr/source/xcuparser.cxx
index 8a165cb1be02..12eb1c2ea1a4 100644
--- a/configmgr/source/xcuparser.cxx
+++ b/configmgr/source/xcuparser.cxx
@@ -24,14 +24,10 @@
 #include <set>
 
 #include <com/sun/star/uno/Any.hxx>
-#include <com/sun/star/uno/Reference.hxx>
 #include <com/sun/star/uno/RuntimeException.hpp>
-#include <com/sun/star/uno/XInterface.hpp>
 #include <rtl/ref.hxx>
 #include <rtl/strbuf.hxx>
-#include <rtl/string.h>
 #include <rtl/string.hxx>
-#include <rtl/ustring.h>
 #include <rtl/ustring.hxx>
 #include <sal/log.hxx>
 #include <xmlreader/span.hxx>
diff --git a/configmgr/source/xcuparser.hxx b/configmgr/source/xcuparser.hxx
index bd74d434c612..3e3544385634 100644
--- a/configmgr/source/xcuparser.hxx
+++ b/configmgr/source/xcuparser.hxx
@@ -35,7 +35,6 @@
 #include "parser.hxx"
 #include "type.hxx"
 #include "valueparser.hxx"
-#include "xmldata.hxx"
 
 namespace xmlreader { struct Span; }
 
diff --git a/configmgr/source/xmldata.cxx b/configmgr/source/xmldata.cxx
index 4e01e50675d5..6323f5d65b86 100644
--- a/configmgr/source/xmldata.cxx
+++ b/configmgr/source/xmldata.cxx
@@ -20,13 +20,8 @@
 #include <sal/config.h>
 
 #include <cassert>
-#include <climits>
-#include <stack>
 
 #include <com/sun/star/uno/RuntimeException.hpp>
-#include <com/sun/star/uno/XInterface.hpp>
-#include <osl/file.hxx>
-#include <rtl/ref.hxx>
 #include <rtl/string.h>
 #include <rtl/ustring.hxx>
 #include <sal/types.h>
@@ -34,15 +29,7 @@
 #include <xmlreader/xmlreader.hxx>
 
 #include "data.hxx"
-#include "groupnode.hxx"
-#include "localizedpropertynode.hxx"
-#include "localizedvaluenode.hxx"
-#include "node.hxx"
-#include "nodemap.hxx"
 #include "parsemanager.hxx"
-#include "parser.hxx"
-#include "propertynode.hxx"
-#include "setnode.hxx"
 #include "type.hxx"
 #include "xmldata.hxx"
 
diff --git a/configmgr/source/xmldata.hxx b/configmgr/source/xmldata.hxx
index 97a6dc49a25d..8f287df48afe 100644
--- a/configmgr/source/xmldata.hxx
+++ b/configmgr/source/xmldata.hxx
@@ -22,6 +22,8 @@
 
 #include <sal/config.h>
 
+#include <rtl/ustring.hxx>
+
 #include "type.hxx"
 
 namespace xmlreader {