From 3e81096b1f652956bb2d23572094917dab87e163 Mon Sep 17 00:00:00 2001
From: Thomas Arnhold <thomas@arnhold.org>
Date: Sat, 10 May 2014 18:12:32 +0200
Subject: fix-includes.pl: unotools

Change-Id: I1b2b8d58cec548961fb06f2595fd474010ae9979
---
 unotools/inc/pch/precompiled_utl.hxx               | 62 ++++++------------
 .../accessibility/accessiblerelationsethelper.cxx  |  2 +-
 .../accessibility/accessiblestatesethelper.cxx     |  2 +-
 unotools/source/config/bootstrap.cxx               |  4 +-
 unotools/source/config/cmdoptions.cxx              |  2 +-
 unotools/source/config/compatibility.cxx           |  2 +-
 unotools/source/config/configitem.cxx              |  6 +-
 unotools/source/config/configmgr.cxx               | 32 +++++-----
 unotools/source/config/configpaths.cxx             |  2 +-
 unotools/source/config/defaultoptions.cxx          |  2 +-
 unotools/source/config/dynamicmenuoptions.cxx      |  2 +-
 unotools/source/config/eventcfg.cxx                |  2 +-
 unotools/source/config/lingucfg.cxx                |  2 +-
 unotools/source/config/misccfg.cxx                 |  2 +-
 unotools/source/config/options.cxx                 |  2 +-
 unotools/source/config/pathoptions.cxx             |  2 +-
 unotools/source/config/printwarningoptions.cxx     |  2 +-
 unotools/source/config/saveopt.cxx                 |  2 +-
 unotools/source/config/viewoptions.cxx             |  2 +-
 unotools/source/i18n/caserotate.cxx                |  2 +-
 unotools/source/i18n/intlwrapper.cxx               |  2 +-
 unotools/source/i18n/readwritemutexguard.cxx       |  2 +-
 unotools/source/ucbhelper/tempfile.cxx             |  2 +-
 unotools/source/ucbhelper/ucbhelper.cxx            | 74 +++++++++++-----------
 unotools/source/ucbhelper/xtempfile.cxx            |  2 +-
 25 files changed, 97 insertions(+), 121 deletions(-)

(limited to 'unotools')

diff --git a/unotools/inc/pch/precompiled_utl.hxx b/unotools/inc/pch/precompiled_utl.hxx
index 7256ad08d21e..5cb204a2b2f2 100644
--- a/unotools/inc/pch/precompiled_utl.hxx
+++ b/unotools/inc/pch/precompiled_utl.hxx
@@ -14,53 +14,12 @@
  also fixes all possible problems, so it's usually better to use it).
 */
 
-#include "boost/noncopyable.hpp"
-#include "com/sun/star/beans/NamedValue.hpp"
-#include "com/sun/star/configuration/theDefaultProvider.hpp"
-#include "com/sun/star/container/XHierarchicalNameAccess.hpp"
-#include "com/sun/star/lang/XMultiServiceFactory.hpp"
-#include "com/sun/star/sdbc/XResultSet.hpp"
-#include "com/sun/star/task/XInteractionHandler.hpp"
-#include "com/sun/star/ucb/CommandAbortedException.hpp"
-#include "com/sun/star/ucb/ContentInfo.hpp"
-#include "com/sun/star/ucb/ContentInfoAttribute.hpp"
-#include "com/sun/star/ucb/IOErrorCode.hpp"
-#include "com/sun/star/ucb/InteractiveIOException.hpp"
-#include "com/sun/star/ucb/NameClashException.hpp"
-#include "com/sun/star/ucb/UniversalContentBroker.hpp"
-#include "com/sun/star/ucb/XCommandEnvironment.hpp"
-#include "com/sun/star/ucb/XContentAccess.hpp"
-#include "com/sun/star/ucb/XContentIdentifier.hpp"
-#include "com/sun/star/ucb/XProgressHandler.hpp"
-#include "com/sun/star/ucb/XUniversalContentBroker.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/util/DateTime.hpp"
-#include "comphelper/processfactory.hxx"
-#include "cppuhelper/exc_hlp.hxx"
-#include "osl/diagnose.h"
-#include "osl/file.hxx"
-#include "rtl/instance.hxx"
-#include "rtl/string.h"
-#include "rtl/ustring.h"
-#include "rtl/ustring.hxx"
-#include "sal/config.h"
-#include "sal/log.hxx"
-#include "sal/types.h"
-#include "tools/datetime.hxx"
-#include "tools/getprocessworkingdir.hxx"
-#include "tools/urlobj.hxx"
-#include "ucbhelper/commandenvironment.hxx"
-#include "ucbhelper/content.hxx"
 #include <algorithm>
 #include <boost/noncopyable.hpp>
 #include <boost/unordered_map.hpp>
 #include <cassert>
 #include <com/sun/star/awt/XRequestCallback.hpp>
+#include <com/sun/star/beans/NamedValue.hpp>
 #include <com/sun/star/beans/Property.hpp>
 #include <com/sun/star/beans/PropertyAttribute.hpp>
 #include <com/sun/star/beans/PropertyValue.hpp>
@@ -115,10 +74,14 @@
 #include <com/sun/star/task/XInteractionHandler.hpp>
 #include <com/sun/star/ucb/CommandAbortedException.hpp>
 #include <com/sun/star/ucb/CommandFailedException.hpp>
+#include <com/sun/star/ucb/ContentInfo.hpp>
+#include <com/sun/star/ucb/ContentInfoAttribute.hpp>
 #include <com/sun/star/ucb/DocumentHeaderField.hpp>
+#include <com/sun/star/ucb/IOErrorCode.hpp>
 #include <com/sun/star/ucb/InsertCommandArgument.hpp>
 #include <com/sun/star/ucb/InteractiveIOException.hpp>
 #include <com/sun/star/ucb/InteractiveNetworkConnectException.hpp>
+#include <com/sun/star/ucb/NameClashException.hpp>
 #include <com/sun/star/ucb/OpenCommandArgument2.hpp>
 #include <com/sun/star/ucb/OpenMode.hpp>
 #include <com/sun/star/ucb/PostCommandArgument2.hpp>
@@ -129,12 +92,20 @@
 #include <com/sun/star/ucb/XCommandProcessor.hpp>
 #include <com/sun/star/ucb/XContent.hpp>
 #include <com/sun/star/ucb/XContentAccess.hpp>
+#include <com/sun/star/ucb/XContentIdentifier.hpp>
+#include <com/sun/star/ucb/XProgressHandler.hpp>
+#include <com/sun/star/ucb/XUniversalContentBroker.hpp>
 #include <com/sun/star/uno/Any.h>
 #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/uri/UriReferenceFactory.hpp>
 #include <com/sun/star/uri/XUriReference.hpp>
 #include <com/sun/star/util/ChangesEvent.hpp>
+#include <com/sun/star/util/DateTime.hpp>
 #include <com/sun/star/util/PathSubstitution.hpp>
 #include <com/sun/star/util/SearchFlags.hpp>
 #include <com/sun/star/util/TextSearch.hpp>
@@ -160,6 +131,7 @@
 #include <comphelper/storagehelper.hxx>
 #include <config_features.h>
 #include <config_folders.h>
+#include <cppuhelper/exc_hlp.hxx>
 #include <cppuhelper/factory.hxx>
 #include <cppuhelper/implbase1.hxx>
 #include <cppuhelper/implbase2.hxx>
@@ -188,13 +160,17 @@
 #include <rtl/math.hxx>
 #include <rtl/ref.hxx>
 #include <rtl/strbuf.hxx>
+#include <rtl/string.h>
 #include <rtl/string.hxx>
 #include <rtl/tencinfo.h>
 #include <rtl/uri.hxx>
 #include <rtl/ustrbuf.hxx>
+#include <rtl/ustring.h>
 #include <rtl/ustring.hxx>
 #include <sal/config.h>
+#include <sal/log.hxx>
 #include <sal/macros.h>
+#include <sal/types.h>
 #include <salhelper/condition.hxx>
 #include <stdio.h>
 #include <string.h>
@@ -203,6 +179,7 @@
 #include <tools/datetime.hxx>
 #include <tools/debug.hxx>
 #include <tools/diagnose_ex.h>
+#include <tools/getprocessworkingdir.hxx>
 #include <tools/inetmsg.hxx>
 #include <tools/resmgr.hxx>
 #include <tools/solar.h>
@@ -218,5 +195,4 @@
 #include <ucbhelper/interceptedinteraction.hxx>
 #include <uno/data.h>
 #include <vector>
-
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/unotools/source/accessibility/accessiblerelationsethelper.cxx b/unotools/source/accessibility/accessiblerelationsethelper.cxx
index 00bf5a34d189..91753e43c7c6 100644
--- a/unotools/source/accessibility/accessiblerelationsethelper.cxx
+++ b/unotools/source/accessibility/accessiblerelationsethelper.cxx
@@ -17,7 +17,7 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#include "unotools/accessiblerelationsethelper.hxx"
+#include <unotools/accessiblerelationsethelper.hxx>
 #include <vector>
 #include <comphelper/sequence.hxx>
 #include <comphelper/servicehelper.hxx>
diff --git a/unotools/source/accessibility/accessiblestatesethelper.cxx b/unotools/source/accessibility/accessiblestatesethelper.cxx
index 55fd4459fe3c..d5aec78c0d8a 100644
--- a/unotools/source/accessibility/accessiblestatesethelper.cxx
+++ b/unotools/source/accessibility/accessiblestatesethelper.cxx
@@ -17,7 +17,7 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#include "unotools/accessiblestatesethelper.hxx"
+#include <unotools/accessiblestatesethelper.hxx>
 #include <tools/debug.hxx>
 #include <comphelper/servicehelper.hxx>
 
diff --git a/unotools/source/config/bootstrap.cxx b/unotools/source/config/bootstrap.cxx
index a0e306744a2b..174f64e5c0bc 100644
--- a/unotools/source/config/bootstrap.cxx
+++ b/unotools/source/config/bootstrap.cxx
@@ -21,7 +21,7 @@
 
 #include <stdio.h>
 
-#include "unotools/bootstrap.hxx"
+#include <unotools/bootstrap.hxx>
 
 #include <rtl/ustring.hxx>
 #include <rtl/ustrbuf.hxx>
@@ -32,7 +32,7 @@
 #include <rtl/bootstrap.hxx>
 #include <rtl/instance.hxx>
 #include <osl/process.h>
-#include "tools/getprocessworkingdir.hxx"
+#include <tools/getprocessworkingdir.hxx>
 
 // #define this to true, if remembering defaults is not supported properly
 #define RTL_BOOTSTRAP_DEFAULTS_BROKEN true
diff --git a/unotools/source/config/cmdoptions.cxx b/unotools/source/config/cmdoptions.cxx
index 5051c9d41cea..06cdff9d691a 100644
--- a/unotools/source/config/cmdoptions.cxx
+++ b/unotools/source/config/cmdoptions.cxx
@@ -27,7 +27,7 @@
 #include <rtl/ustrbuf.hxx>
 #include <rtl/instance.hxx>
 
-#include <itemholder1.hxx>
+#include "itemholder1.hxx"
 
 #include <algorithm>
 #include <boost/unordered_map.hpp>
diff --git a/unotools/source/config/compatibility.cxx b/unotools/source/config/compatibility.cxx
index a12b3955f57f..62a96bc59364 100644
--- a/unotools/source/config/compatibility.cxx
+++ b/unotools/source/config/compatibility.cxx
@@ -27,7 +27,7 @@
 
 #include <vector>
 
-#include <itemholder1.hxx>
+#include "itemholder1.hxx"
 
 #include <algorithm>
 
diff --git a/unotools/source/config/configitem.cxx b/unotools/source/config/configitem.cxx
index 9de3a1dd7003..59c1207b80e1 100644
--- a/unotools/source/config/configitem.cxx
+++ b/unotools/source/config/configitem.cxx
@@ -17,9 +17,9 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#include "unotools/configitem.hxx"
-#include "unotools/configmgr.hxx"
-#include "unotools/configpaths.hxx"
+#include <unotools/configitem.hxx>
+#include <unotools/configmgr.hxx>
+#include <unotools/configpaths.hxx>
 #include <comphelper/processfactory.hxx>
 #include <com/sun/star/beans/XMultiPropertySet.hpp>
 #include <com/sun/star/beans/XPropertySet.hpp>
diff --git a/unotools/source/config/configmgr.cxx b/unotools/source/config/configmgr.cxx
index 31ff1cdc263b..a84db5e70223 100644
--- a/unotools/source/config/configmgr.cxx
+++ b/unotools/source/config/configmgr.cxx
@@ -17,25 +17,25 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#include "sal/config.h"
+#include <sal/config.h>
 
 #include <list>
 
-#include "boost/noncopyable.hpp"
-#include "com/sun/star/beans/NamedValue.hpp"
-#include "com/sun/star/container/XHierarchicalNameAccess.hpp"
-#include "com/sun/star/configuration/theDefaultProvider.hpp"
-#include "com/sun/star/lang/XMultiServiceFactory.hpp"
-#include "com/sun/star/uno/Any.hxx"
-#include "com/sun/star/uno/Reference.hxx"
-#include "com/sun/star/uno/Sequence.hxx"
-#include "osl/diagnose.h"
-#include "rtl/instance.hxx"
-#include "rtl/ustring.h"
-#include "rtl/ustring.hxx"
-#include "unotools/configitem.hxx"
-#include "unotools/configmgr.hxx"
-#include "comphelper/processfactory.hxx"
+#include <boost/noncopyable.hpp>
+#include <com/sun/star/beans/NamedValue.hpp>
+#include <com/sun/star/container/XHierarchicalNameAccess.hpp>
+#include <com/sun/star/configuration/theDefaultProvider.hpp>
+#include <com/sun/star/lang/XMultiServiceFactory.hpp>
+#include <com/sun/star/uno/Any.hxx>
+#include <com/sun/star/uno/Reference.hxx>
+#include <com/sun/star/uno/Sequence.hxx>
+#include <osl/diagnose.h>
+#include <rtl/instance.hxx>
+#include <rtl/ustring.h>
+#include <rtl/ustring.hxx>
+#include <unotools/configitem.hxx>
+#include <unotools/configmgr.hxx>
+#include <comphelper/processfactory.hxx>
 
 namespace {
 
diff --git a/unotools/source/config/configpaths.cxx b/unotools/source/config/configpaths.cxx
index fbf7f1567ab6..ae4f77c049f2 100644
--- a/unotools/source/config/configpaths.cxx
+++ b/unotools/source/config/configpaths.cxx
@@ -17,7 +17,7 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#include "unotools/configpaths.hxx"
+#include <unotools/configpaths.hxx>
 #include <rtl/ustring.hxx>
 #include <rtl/ustrbuf.hxx>
 #include <osl/diagnose.h>
diff --git a/unotools/source/config/defaultoptions.cxx b/unotools/source/config/defaultoptions.cxx
index 6480c6ff6140..87145e07c81c 100644
--- a/unotools/source/config/defaultoptions.cxx
+++ b/unotools/source/config/defaultoptions.cxx
@@ -29,7 +29,7 @@
 #include <unotools/localfilehelper.hxx>
 #include <rtl/instance.hxx>
 
-#include <itemholder1.hxx>
+#include "itemholder1.hxx"
 
 using namespace osl;
 using namespace utl;
diff --git a/unotools/source/config/dynamicmenuoptions.cxx b/unotools/source/config/dynamicmenuoptions.cxx
index 9ada991bb141..ccf2d87dd62c 100644
--- a/unotools/source/config/dynamicmenuoptions.cxx
+++ b/unotools/source/config/dynamicmenuoptions.cxx
@@ -27,7 +27,7 @@
 
 #include <vector>
 
-#include <itemholder1.hxx>
+#include "itemholder1.hxx"
 
 #include <algorithm>
 
diff --git a/unotools/source/config/eventcfg.cxx b/unotools/source/config/eventcfg.cxx
index 0fc06a08f826..141fe8dd393f 100644
--- a/unotools/source/config/eventcfg.cxx
+++ b/unotools/source/config/eventcfg.cxx
@@ -28,7 +28,7 @@
 #include <boost/unordered_map.hpp>
 #include <rtl/ustrbuf.hxx>
 
-#include <itemholder1.hxx>
+#include "itemholder1.hxx"
 
 #include <algorithm>
 
diff --git a/unotools/source/config/lingucfg.cxx b/unotools/source/config/lingucfg.cxx
index 061232cdac4b..781f16463b87 100644
--- a/unotools/source/config/lingucfg.cxx
+++ b/unotools/source/config/lingucfg.cxx
@@ -40,7 +40,7 @@
 
 #include <comphelper/processfactory.hxx>
 
-#include <itemholder1.hxx>
+#include "itemholder1.hxx"
 
 using namespace com::sun::star;
 
diff --git a/unotools/source/config/misccfg.cxx b/unotools/source/config/misccfg.cxx
index bc38bf6c48a8..f24a0eb8451a 100644
--- a/unotools/source/config/misccfg.cxx
+++ b/unotools/source/config/misccfg.cxx
@@ -18,7 +18,7 @@
  */
 
 #include <unotools/misccfg.hxx>
-#include "rtl/instance.hxx"
+#include <rtl/instance.hxx>
 #include <unotools/configmgr.hxx>
 #include <unotools/configitem.hxx>
 #include <tools/debug.hxx>
diff --git a/unotools/source/config/options.cxx b/unotools/source/config/options.cxx
index 8891cf184c3f..6483d1d3e7ba 100644
--- a/unotools/source/config/options.cxx
+++ b/unotools/source/config/options.cxx
@@ -17,7 +17,7 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#include "sal/config.h"
+#include <sal/config.h>
 #include <unotools/options.hxx>
 
 using utl::detail::Options;
diff --git a/unotools/source/config/pathoptions.cxx b/unotools/source/config/pathoptions.cxx
index 190053126e2e..1b66eb5f39b3 100644
--- a/unotools/source/config/pathoptions.cxx
+++ b/unotools/source/config/pathoptions.cxx
@@ -42,7 +42,7 @@
 #include <com/sun/star/util/theMacroExpander.hpp>
 #include <rtl/instance.hxx>
 
-#include <itemholder1.hxx>
+#include "itemholder1.hxx"
 
 #include <vector>
 #include <boost/unordered_map.hpp>
diff --git a/unotools/source/config/printwarningoptions.cxx b/unotools/source/config/printwarningoptions.cxx
index 8f7bfc5fcc2a..61444a916ae8 100644
--- a/unotools/source/config/printwarningoptions.cxx
+++ b/unotools/source/config/printwarningoptions.cxx
@@ -24,7 +24,7 @@
 #include <com/sun/star/uno/Any.hxx>
 #include <com/sun/star/uno/Sequence.hxx>
 
-#include <itemholder1.hxx>
+#include "itemholder1.hxx"
 
 //  namespaces
 
diff --git a/unotools/source/config/saveopt.cxx b/unotools/source/config/saveopt.cxx
index b2715c10c7e9..9d5202c87098 100644
--- a/unotools/source/config/saveopt.cxx
+++ b/unotools/source/config/saveopt.cxx
@@ -18,7 +18,7 @@
  */
 
 #include <unotools/saveopt.hxx>
-#include "rtl/instance.hxx"
+#include <rtl/instance.hxx>
 #include <unotools/configmgr.hxx>
 #include <unotools/configitem.hxx>
 #include <tools/debug.hxx>
diff --git a/unotools/source/config/viewoptions.cxx b/unotools/source/config/viewoptions.cxx
index fbc5e37a49fc..22f2053d82a3 100644
--- a/unotools/source/config/viewoptions.cxx
+++ b/unotools/source/config/viewoptions.cxx
@@ -30,7 +30,7 @@
 #include <comphelper/configurationhelper.hxx>
 #include <comphelper/processfactory.hxx>
 
-#include <itemholder1.hxx>
+#include "itemholder1.hxx"
 
 #define PACKAGE_VIEWS                           "org.openoffice.Office.Views"
 
diff --git a/unotools/source/i18n/caserotate.cxx b/unotools/source/i18n/caserotate.cxx
index 14a2d7a0624f..d69fe0c63ad7 100644
--- a/unotools/source/i18n/caserotate.cxx
+++ b/unotools/source/i18n/caserotate.cxx
@@ -7,7 +7,7 @@
  * file, You can obtain one at http://mozilla.org/MPL/2.0/.
  */
 
-#include "unotools/caserotate.hxx"
+#include <unotools/caserotate.hxx>
 #include <com/sun/star/i18n/TransliterationModules.hpp>
 #include <com/sun/star/i18n/TransliterationModulesExtra.hpp>
 
diff --git a/unotools/source/i18n/intlwrapper.cxx b/unotools/source/i18n/intlwrapper.cxx
index e345f9794b5f..2e6b0611214e 100644
--- a/unotools/source/i18n/intlwrapper.cxx
+++ b/unotools/source/i18n/intlwrapper.cxx
@@ -17,7 +17,7 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#include "unotools/intlwrapper.hxx"
+#include <unotools/intlwrapper.hxx>
 #include <com/sun/star/i18n/CollatorOptions.hpp>
 #include <i18nlangtag/mslangid.hxx>
 #include <comphelper/processfactory.hxx>
diff --git a/unotools/source/i18n/readwritemutexguard.cxx b/unotools/source/i18n/readwritemutexguard.cxx
index 5c01cc07d0fc..904dba39c0c7 100644
--- a/unotools/source/i18n/readwritemutexguard.cxx
+++ b/unotools/source/i18n/readwritemutexguard.cxx
@@ -17,7 +17,7 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#include "unotools/readwritemutexguard.hxx"
+#include <unotools/readwritemutexguard.hxx>
 #include <tools/debug.hxx>
 
 namespace utl {
diff --git a/unotools/source/ucbhelper/tempfile.cxx b/unotools/source/ucbhelper/tempfile.cxx
index 2eb12fdcfc5b..67dbd4bc2a7e 100644
--- a/unotools/source/ucbhelper/tempfile.cxx
+++ b/unotools/source/ucbhelper/tempfile.cxx
@@ -17,7 +17,7 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#include "sal/config.h"
+#include <sal/config.h>
 
 #include <com/sun/star/ucb/UniversalContentBroker.hpp>
 #include <comphelper/processfactory.hxx>
diff --git a/unotools/source/ucbhelper/ucbhelper.cxx b/unotools/source/ucbhelper/ucbhelper.cxx
index 45c6fdbcdaa4..bc9dba17c114 100644
--- a/unotools/source/ucbhelper/ucbhelper.cxx
+++ b/unotools/source/ucbhelper/ucbhelper.cxx
@@ -17,47 +17,47 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#include "sal/config.h"
+#include <sal/config.h>
 
 #include <cassert>
 #include <vector>
 
-#include "com/sun/star/lang/XMultiServiceFactory.hpp"
-#include "com/sun/star/sdbc/XResultSet.hpp"
-#include "com/sun/star/task/XInteractionHandler.hpp"
-#include "com/sun/star/ucb/CommandAbortedException.hpp"
-#include "com/sun/star/ucb/ContentInfo.hpp"
-#include "com/sun/star/ucb/ContentInfoAttribute.hpp"
-#include "com/sun/star/ucb/IOErrorCode.hpp"
-#include "com/sun/star/ucb/InteractiveIOException.hpp"
-#include "com/sun/star/ucb/NameClashException.hpp"
-#include "com/sun/star/ucb/UniversalContentBroker.hpp"
-#include "com/sun/star/ucb/XCommandEnvironment.hpp"
-#include "com/sun/star/ucb/XContentAccess.hpp"
-#include "com/sun/star/ucb/XContentIdentifier.hpp"
-#include "com/sun/star/ucb/XProgressHandler.hpp"
-#include "com/sun/star/ucb/XUniversalContentBroker.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/util/DateTime.hpp"
-#include "comphelper/processfactory.hxx"
-#include "cppuhelper/exc_hlp.hxx"
-#include "osl/file.hxx"
-#include "rtl/string.h"
-#include "rtl/ustring.h"
-#include "rtl/ustring.hxx"
-#include "sal/log.hxx"
-#include "sal/types.h"
-#include "tools/datetime.hxx"
-#include "tools/urlobj.hxx"
-#include "ucbhelper/commandenvironment.hxx"
-#include "ucbhelper/content.hxx"
-#include "unotools/localfilehelper.hxx"
-#include "unotools/ucbhelper.hxx"
+#include <com/sun/star/lang/XMultiServiceFactory.hpp>
+#include <com/sun/star/sdbc/XResultSet.hpp>
+#include <com/sun/star/task/XInteractionHandler.hpp>
+#include <com/sun/star/ucb/CommandAbortedException.hpp>
+#include <com/sun/star/ucb/ContentInfo.hpp>
+#include <com/sun/star/ucb/ContentInfoAttribute.hpp>
+#include <com/sun/star/ucb/IOErrorCode.hpp>
+#include <com/sun/star/ucb/InteractiveIOException.hpp>
+#include <com/sun/star/ucb/NameClashException.hpp>
+#include <com/sun/star/ucb/UniversalContentBroker.hpp>
+#include <com/sun/star/ucb/XCommandEnvironment.hpp>
+#include <com/sun/star/ucb/XContentAccess.hpp>
+#include <com/sun/star/ucb/XContentIdentifier.hpp>
+#include <com/sun/star/ucb/XProgressHandler.hpp>
+#include <com/sun/star/ucb/XUniversalContentBroker.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/util/DateTime.hpp>
+#include <comphelper/processfactory.hxx>
+#include <cppuhelper/exc_hlp.hxx>
+#include <osl/file.hxx>
+#include <rtl/string.h>
+#include <rtl/ustring.h>
+#include <rtl/ustring.hxx>
+#include <sal/log.hxx>
+#include <sal/types.h>
+#include <tools/datetime.hxx>
+#include <tools/urlobj.hxx>
+#include <ucbhelper/commandenvironment.hxx>
+#include <ucbhelper/content.hxx>
+#include <unotools/localfilehelper.hxx>
+#include <unotools/ucbhelper.hxx>
 
 namespace {
 
diff --git a/unotools/source/ucbhelper/xtempfile.cxx b/unotools/source/ucbhelper/xtempfile.cxx
index f09b94e8c96f..d162e97e78aa 100644
--- a/unotools/source/ucbhelper/xtempfile.cxx
+++ b/unotools/source/ucbhelper/xtempfile.cxx
@@ -23,7 +23,7 @@
 #include <osl/file.hxx>
 #include <unotools/configmgr.hxx>
 #include <unotools/tempfile.hxx>
-#include <XTempFile.hxx>
+#include "XTempFile.hxx"
 
 OTempFileService::OTempFileService(css::uno::Reference< css::uno::XComponentContext > const & context)
 : ::cppu::PropertySetMixin< css::io::XTempFile >(
-- 
cgit